git: 0c96adba0b2a - main - devel/py-ddtrace: Update to 1.17.2

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Po-Chuan Hsieh <sunpoet_at_FreeBSD.org>
Date: Wed, 16 Aug 2023 18:31:49 UTC
The branch main has been updated by sunpoet:

URL: https://cgit.FreeBSD.org/ports/commit/?id=0c96adba0b2abfe6ead973a4d479fece30334ef3

commit 0c96adba0b2abfe6ead973a4d479fece30334ef3
Author:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2023-08-16 18:11:45 +0000
Commit:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2023-08-16 18:25:24 +0000

    devel/py-ddtrace: Update to 1.17.2
    
    - Update WWW
    
    Changes:        https://github.com/DataDog/dd-trace-py/releases
                    https://ddtrace.readthedocs.io/en/stable/release_notes.html
---
 devel/py-ddtrace/Makefile                          | 15 ++++++++++++---
 devel/py-ddtrace/distinfo                          |  8 +++++---
 ...race-appsec-iast-_taint_tracking-CMakeLists.txt | 22 ++++++++++++++++++++++
 devel/py-ddtrace/files/patch-pyproject.toml        |  6 +++---
 devel/py-ddtrace/files/patch-setup.py              | 17 +++++++++++++----
 5 files changed, 55 insertions(+), 13 deletions(-)

diff --git a/devel/py-ddtrace/Makefile b/devel/py-ddtrace/Makefile
index 224f900d6f3f..dfaf1a4317fe 100644
--- a/devel/py-ddtrace/Makefile
+++ b/devel/py-ddtrace/Makefile
@@ -1,19 +1,22 @@
 PORTNAME=	ddtrace
-PORTVERSION=	1.16.0
+PORTVERSION=	1.17.2
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+DISTFILES=	ddtrace-${PORTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Datadog APM client library
-WWW=		https://github.com/DataDog/dd-trace-py
+WWW=		https://ddtrace.readthedocs.io/en/stable/ \
+		https://github.com/DataDog/dd-trace-py
 
 LICENSE=	APACHE20 BSD3CLAUSE
 LICENSE_COMB=	dual
 LICENSE_FILE_APACHE20=	${WRKSRC}/LICENSE.Apache
 LICENSE_FILE_BSD3CLAUSE=${WRKSRC}/LICENSE.BSD3
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=40.6.0:devel/py-setuptools@${PY_FLAVOR} \
+BUILD_DEPENDS=	cmake:devel/cmake-core \
+		${PYTHON_PKGNAMEPREFIX}setuptools>=40.6.0:devel/py-setuptools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}setuptools_scm>=4: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} \
@@ -30,12 +33,18 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}attrs>=20:devel/py-attrs@${PY_FLAVOR} \
 USES=		compiler:c++17-lang python
 USE_PYTHON=	autoplist concurrent cython pep517
 
+USE_GITHUB=	nodefault
+GH_TUPLE=	abseil:abseil-cpp:20211102.0:abseil_abseil_cpp/ddtrace/appsec/iast/_taint_tracking/
+
 OPTIONS_DEFINE=	OPENTRACING
 OPTIONS_DEFAULT=OPENTRACING
 OPENTRACING_DESC=	OpenTracing support
 
 OPENTRACING_RUN_DEPENDS=${PYTHON_PKGNAMEPREFIX}opentracing>=2.0.0:devel/py-opentracing@${PY_FLAVOR}
 
+post-patch:
+	@${MV} ${WRKSRC}/ddtrace/appsec/iast/_taint_tracking/abseil-cpp-20211102.0/ ${WRKSRC}/ddtrace/appsec/iast/_taint_tracking/_deps/
+
 post-install:
 	${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -name '*.so' -exec ${STRIP_CMD} {} +
 
diff --git a/devel/py-ddtrace/distinfo b/devel/py-ddtrace/distinfo
index 7d5c6c152b36..99d8eb153573 100644
--- a/devel/py-ddtrace/distinfo
+++ b/devel/py-ddtrace/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1689398837
-SHA256 (ddtrace-1.16.0.tar.gz) = 534fce8cf2583157a3d3621253427bda3aa5386807dd98a705f6a4fec837f9f4
-SIZE (ddtrace-1.16.0.tar.gz) = 5490750
+TIMESTAMP = 1691070036
+SHA256 (ddtrace-1.17.2.tar.gz) = b20b1fad48c5b1ffb413d57266ecd13431295f1c6380dd5ddf6678c07f67dcde
+SIZE (ddtrace-1.17.2.tar.gz) = 6109987
+SHA256 (abseil-abseil-cpp-20211102.0_GH0.tar.gz) = dcf71b9cba8dc0ca9940c4b316a0c796be8fab42b070bb6b7cab62b48f0e66c4
+SIZE (abseil-abseil-cpp-20211102.0_GH0.tar.gz) = 1884080
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..8521d60acbad
--- /dev/null
+++ b/devel/py-ddtrace/files/patch-ddtrace-appsec-iast-_taint_tracking-CMakeLists.txt
@@ -0,0 +1,22 @@
+--- ddtrace/appsec/iast/_taint_tracking/CMakeLists.txt.orig	2023-07-25 21:04:28 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(".")
+ 
+@@ -66,4 +62,4 @@ set_target_properties(
+         LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_LIST_DIR}"
+ )
+ 
+-target_link_libraries(${APP_NAME} PRIVATE absl::node_hash_map)
+\ No newline at end of file
++target_link_libraries(${APP_NAME} PRIVATE absl::node_hash_map)
diff --git a/devel/py-ddtrace/files/patch-pyproject.toml b/devel/py-ddtrace/files/patch-pyproject.toml
index 7abb97524323..5b1e4264866a 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-04-28 22:12:26 UTC
+--- pyproject.toml.orig	2023-07-25 21:04:28 UTC
 +++ pyproject.toml
 @@ -1,5 +1,5 @@
  [build-system]
--requires = ["setuptools >= 40.6.0", "setuptools_scm[toml] >=4,<6.1", "cython"]
-+requires = ["setuptools >= 40.6.0", "setuptools_scm[toml] >=4", "cython"]
+-requires = ["setuptools >= 40.6.0", "setuptools_scm[toml] >=4,<6.1", "cython<3", "cmake"]
++requires = ["setuptools >= 40.6.0", "setuptools_scm[toml] >=4", "cython<3"]
  build-backend = "setuptools.build_meta"
  
  [tool.setuptools_scm]
diff --git a/devel/py-ddtrace/files/patch-setup.py b/devel/py-ddtrace/files/patch-setup.py
index 71f27317c5aa..e9dd8c161c73 100644
--- a/devel/py-ddtrace/files/patch-setup.py
+++ b/devel/py-ddtrace/files/patch-setup.py
@@ -1,10 +1,19 @@
---- setup.py.orig	2023-02-17 21:33:11 UTC
+--- setup.py.orig	2023-07-25 21:04:28 UTC
 +++ setup.py
-@@ -366,7 +366,6 @@ setup(
+@@ -557,7 +557,6 @@ setup(
+     tests_require=["flake8"],
      cmdclass={
-         "test": Tox,
-         "build_ext": BuildExtCommand,
+         "build_ext": CMakeBuild,
 -        "build_py": LibraryDownloader,
          "clean": CleanLibraries,
      },
      entry_points={
+@@ -584,7 +583,7 @@ setup(
+         "Programming Language :: Python :: 3.11",
+     ],
+     use_scm_version={"write_to": "ddtrace/_version.py"},
+-    setup_requires=["setuptools_scm[toml]>=4", "cython<3", "cmake>=3.24.2; python_version>='3.6'"],
++    setup_requires=["setuptools_scm[toml]>=4", "cython<3"],
+     ext_modules=ext_modules
+     + cythonize(
+         [