git: aa1d40c553a9 - main - devel/py-ddtrace: Update to 2.1.6
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 14 Nov 2023 21:23:42 UTC
The branch main has been updated by sunpoet:
URL: https://cgit.FreeBSD.org/ports/commit/?id=aa1d40c553a9647d4dae1fe3eb7f44507e95d056
commit aa1d40c553a9647d4dae1fe3eb7f44507e95d056
Author: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2023-11-14 21:02:57 +0000
Commit: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
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 <bsd.port.pre.mk>
+
+.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 <bsd.port.mk>
+.include <bsd.port.post.mk>
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(
[