From nobody Tue Nov 14 21:23:42 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SVK6Q5yTgz50td5; Tue, 14 Nov 2023 21:23:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SVK6Q2Mftz3GRk; Tue, 14 Nov 2023 21:23:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699997022; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WVloQZVEyF7nlpD6Y5UooFh8NLPePpW6P8EouW/7pRc=; b=kcOF9MXnccdJ5HOnP9nDUfv+3ccU+mPFUTsJ6fMwwP/ciId7XfIDZ1nvN/NFwR+EDgth/B yETkJhxZRKowRFS9DVt36SSctxnmRClCjDlNgXHfR6STwiSSUyM//B5YO9EoSmptdYF/pY /0RXQY+v7e3DBi4p6TZOxkCcWTQV4vaR7gZ2jvzAFy3A5S8DkXeXGqCYrBYq5WleG6BXWC hTQc1wXMRcxYPS61ESrdPn5XVPj4VSWdFdmHt9Chx7iUM8wO/v707Y8+911WlHJ5afk4Ah mIzKyIN8BGsLUO4JI6VU6E8qqyY427MLPkVNXb/UGreJU2VE/yQQ/T35N3vSug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699997022; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WVloQZVEyF7nlpD6Y5UooFh8NLPePpW6P8EouW/7pRc=; b=y3b4Jy1XxCo7Qy4XB43EKw3jTtsmQUQY6EpXWF2y5N2FSKVAcPGKdq3LYxnpvQxgS7plP3 IBTkdgthcmqEa+EOChNGdkKUtOnsgbCGgs0Wy1vPdfj1EYJDejEqYxy/RQVzoXMvsICGfo OrG6RPcL3m+dx4uRqM7nZFx3lMHk0HC9Kt3S0/qDQYoBuHEnb75HjYfX6/opDG0LMb73Rc CwzhnTgNh6gQQjLxnToKNjgceRFahgo47yFwWUquzXiu3eAZw46JCrPctO+AU9+LuHGtJk Jg2ZSj7ZGfPrPrIOAw0N9uDQ9E+i+Hk8WS9SJfmTiekXcAM1pI46WoryHeS7LA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699997022; a=rsa-sha256; cv=none; b=bbuw4urjnl7QAVl3WxZKyB8qk7wnCQal8A/OlqtEKSMGXneLkdruyJOyNqjqbhAotD9iNP 9AOvcSm2kV4twOjg1Dln/tzcji4VPusfz975BPKSyxbbrJ3c2NBHGnFCanS6P9arDGSUiW jZsaM0Kc9xwmP/Ofv8w89limRoqdQ/lR8y1aMzG8F8F4EYIlVc4vi5MhwLrKQT8HldOhzw oRWuatL6u0rfbQgf5tEwwieqUEqqjbSqKAZrzGXH+O/WNCIFxuZrfYfAXvK/ci88I9pWLs dD8N0JObvQt8BQ0R5nBDzuuCy0ksCcK2uePvdtxKzAHsZtt6QWTgUBXTgT7nBw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SVK6Q1B6Lz14tD; Tue, 14 Nov 2023 21:23:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3AELNgS6090676; Tue, 14 Nov 2023 21:23:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AELNgYa090673; Tue, 14 Nov 2023 21:23:42 GMT (envelope-from git) Date: Tue, 14 Nov 2023 21:23:42 GMT Message-Id: <202311142123.3AELNgYa090673@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: aa1d40c553a9 - main - devel/py-ddtrace: Update to 2.1.6 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: aa1d40c553a9647d4dae1fe3eb7f44507e95d056 Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=aa1d40c553a9647d4dae1fe3eb7f44507e95d056 commit aa1d40c553a9647d4dae1fe3eb7f44507e95d056 Author: Po-Chuan Hsieh AuthorDate: 2023-11-14 21:02:57 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-11-14 21:19:29 +0000 devel/py-ddtrace: Update to 2.1.6 Changes: https://github.com/DataDog/dd-trace-py/releases https://ddtrace.readthedocs.io/en/stable/release_notes.html --- devel/py-ddtrace/Makefile | 13 +++++++++---- devel/py-ddtrace/distinfo | 6 +++--- ...ch-ddtrace-appsec-_iast-_taint_tracking-CMakeLists.txt | 15 +++++++++++++++ ...tch-ddtrace-appsec-iast-_taint_tracking-CMakeLists.txt | 15 --------------- devel/py-ddtrace/files/patch-pyproject.toml | 6 +++--- devel/py-ddtrace/files/patch-setup.py | 10 +++++----- 6 files changed, 35 insertions(+), 30 deletions(-) diff --git a/devel/py-ddtrace/Makefile b/devel/py-ddtrace/Makefile index 3de9095c8f0c..87ed868befa0 100644 --- a/devel/py-ddtrace/Makefile +++ b/devel/py-ddtrace/Makefile @@ -1,5 +1,5 @@ PORTNAME= ddtrace -PORTVERSION= 1.20.10 +PORTVERSION= 2.1.6 CATEGORIES= devel python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -20,13 +20,12 @@ BUILD_DEPENDS= cmake:devel/cmake-core \ ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=4<8:devel/py-setuptools_scm@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}attrs>=20:devel/py-attrs@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}bytecode>=0:devel/py-bytecode@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}cattrs>=0:devel/py-cattrs@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}ddsketch>=2.0.1:devel/py-ddsketch@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}envier>=0:devel/py-envier@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}opentelemetry-api>=1:devel/py-opentelemetry-api@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}protobuf>=3,1:devel/py-protobuf@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.12.0:devel/py-six@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}typing-extensions>=0:devel/py-typing-extensions@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}xmltodict>=0.12:devel/py-xmltodict@${PY_FLAVOR} @@ -44,10 +43,16 @@ OPENTRACING_DESC= OpenTracing support OPENTRACING_RUN_DEPENDS=${PYTHON_PKGNAMEPREFIX}opentracing>=2.0.0:devel/py-opentracing@${PY_FLAVOR} +.include + +.if ${PYTHON_REL} >= 31200 +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} +.endif + post-patch: @${MV} ${WRKSRC}/ddtrace/appsec/iast/_taint_tracking/abseil-cpp-20230802.1/ ${WRKSRC}/ddtrace/appsec/iast/_taint_tracking/_deps/ post-install: ${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -name '*.so' -exec ${STRIP_CMD} {} + -.include +.include diff --git a/devel/py-ddtrace/distinfo b/devel/py-ddtrace/distinfo index fc228e0c19d8..cf4fab709128 100644 --- a/devel/py-ddtrace/distinfo +++ b/devel/py-ddtrace/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1699774616 -SHA256 (ddtrace-1.20.10.tar.gz) = 80ca4d4b84df34a29c493122e1963c26d69dbfbaaefc439835f1fa5c1f50d058 -SIZE (ddtrace-1.20.10.tar.gz) = 6094514 +TIMESTAMP = 1699985579 +SHA256 (ddtrace-2.1.6.tar.gz) = db2fb526306b84b0f6e0782a4bd54ac4aa78f9001adff85fbe6320e8b1186a5c +SIZE (ddtrace-2.1.6.tar.gz) = 6326223 SHA256 (abseil-abseil-cpp-20230802.1_GH0.tar.gz) = 987ce98f02eefbaf930d6e38ab16aa05737234d7afbab2d5c4ea7adbe50c28ed SIZE (abseil-abseil-cpp-20230802.1_GH0.tar.gz) = 2157158 diff --git a/devel/py-ddtrace/files/patch-ddtrace-appsec-_iast-_taint_tracking-CMakeLists.txt b/devel/py-ddtrace/files/patch-ddtrace-appsec-_iast-_taint_tracking-CMakeLists.txt new file mode 100644 index 000000000000..b1531c42bd40 --- /dev/null +++ b/devel/py-ddtrace/files/patch-ddtrace-appsec-_iast-_taint_tracking-CMakeLists.txt @@ -0,0 +1,15 @@ +--- ddtrace/appsec/_iast/_taint_tracking/CMakeLists.txt.orig 2023-11-13 15:24:48 UTC ++++ ddtrace/appsec/_iast/_taint_tracking/CMakeLists.txt +@@ -24,11 +24,7 @@ unset(BUILD_MACOS CACHE) + + if(CMAKE_BUILD_TYPE STREQUAL "Release") + message("Release mode: using abseil") +- FetchContent_Declare( +- absl +- URL "https://github.com/abseil/abseil-cpp/archive/refs/tags/20211102.0.zip" +- ) +- FetchContent_MakeAvailable(absl) ++ add_subdirectory(_deps) + else() + message("Debug mode: not using abseil") + endif() diff --git a/devel/py-ddtrace/files/patch-ddtrace-appsec-iast-_taint_tracking-CMakeLists.txt b/devel/py-ddtrace/files/patch-ddtrace-appsec-iast-_taint_tracking-CMakeLists.txt deleted file mode 100644 index d99beffce1da..000000000000 --- a/devel/py-ddtrace/files/patch-ddtrace-appsec-iast-_taint_tracking-CMakeLists.txt +++ /dev/null @@ -1,15 +0,0 @@ ---- ddtrace/appsec/iast/_taint_tracking/CMakeLists.txt.orig 2023-09-26 19:15:41 UTC -+++ ddtrace/appsec/iast/_taint_tracking/CMakeLists.txt -@@ -22,11 +22,7 @@ else() - endif(BUILD_MACOS) - unset(BUILD_MACOS CACHE) - --FetchContent_Declare( -- absl -- URL "https://github.com/abseil/abseil-cpp/archive/refs/tags/20211102.0.zip" --) --FetchContent_MakeAvailable(absl) -+add_subdirectory(_deps) - - include_directories(".") - diff --git a/devel/py-ddtrace/files/patch-pyproject.toml b/devel/py-ddtrace/files/patch-pyproject.toml index 830244f40129..08cd53accb43 100644 --- a/devel/py-ddtrace/files/patch-pyproject.toml +++ b/devel/py-ddtrace/files/patch-pyproject.toml @@ -1,9 +1,9 @@ ---- pyproject.toml.orig 2023-09-26 19:15:41 UTC +--- pyproject.toml.orig 2023-11-13 15:24:48 UTC +++ pyproject.toml @@ -1,5 +1,5 @@ [build-system] --requires = ["setuptools_scm[toml]>=4,<8", "cython<3", "cmake>=3.24.2; python_version>='3.6'"] -+requires = ["setuptools_scm[toml]>=4,<8", "cython<3"] +-requires = ["setuptools_scm[toml]>=4", "cython", "cmake>=3.24.2; python_version>='3.7'"] ++requires = ["setuptools_scm[toml]>=4", "cython"] build-backend = "setuptools.build_meta" [project] diff --git a/devel/py-ddtrace/files/patch-setup.py b/devel/py-ddtrace/files/patch-setup.py index d10a6fc9c395..87482d31c689 100644 --- a/devel/py-ddtrace/files/patch-setup.py +++ b/devel/py-ddtrace/files/patch-setup.py @@ -1,6 +1,6 @@ ---- setup.py.orig 2023-09-26 19:15:41 UTC +--- setup.py.orig 2023-11-13 15:24:48 UTC +++ setup.py -@@ -567,7 +567,6 @@ setup( +@@ -566,7 +566,6 @@ setup( tests_require=["flake8"], cmdclass={ "build_ext": CMakeBuild, @@ -9,11 +9,11 @@ }, entry_points={ @@ -593,7 +592,7 @@ setup( - "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", ], -- setup_requires=["setuptools_scm[toml]>=4,<8", "cython<3", "cmake>=3.24.2; python_version>='3.6'"], -+ setup_requires=["setuptools_scm[toml]>=4,<8", "cython<3"], +- setup_requires=["setuptools_scm[toml]>=4", "cython", "cmake>=3.24.2"], ++ setup_requires=["setuptools_scm[toml]>=4", "cython"], ext_modules=ext_modules + cythonize( [