From nobody Wed Aug 16 18:31:49 2023 X-Original-To: dev-commits-ports-main@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 4RQxYd3lQ0z4qxqB; Wed, 16 Aug 2023 18:31:49 +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 4RQxYd38Wjz4STd; Wed, 16 Aug 2023 18:31:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692210709; 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=8DXphoyLMhgJUtfuDnpwDOkVUoscXKxWYGZtGlpjL7U=; b=CGw1jZpWQn9s8SAXs2GJZx+rufd/HGZM3FVAT0LZewg+QIGSdPnQ8/D2wfl0qVwaQstNI8 tIUdmZ8TUsEirdoKSjNGFt0GLbsfYxzjXFbRBV8K6i/JjCGV3GhfvWR6SYzBrG5OcFKDY8 it6kGBP9Q98IGHPXQDQmHRubTVF12zWrZXHgylnWyNiMHI9R0NXA1/WwIf2CUHdfP6gHw4 AdOrwIz1erFLWdZf19PC6QeVmdpQV3ZUGeUw6RJLIq11nH8iOoCcbapxPAXQx9F7M6S3Bl /8SJgSTcdcIGU8/WQme4rskYH0Bu8ef4iC0vG4TQk1KjNhEAnp7i8py/DO2pTA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692210709; 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=8DXphoyLMhgJUtfuDnpwDOkVUoscXKxWYGZtGlpjL7U=; b=n1lyHMReXwxujjlvWkiLIQH+Kztx2kXSv9j9Rl9neIWwYnkapru1mcjEp9JHuVgbX5l2SD JGISTKciIz+wLcGsQkYa4tOYaRuJS7paN+PuFZCRZhVezhmaglpXT/pQwAICU7BZ9kyo2A 1atPGcnb+ZIY0/1cidZu5nlQBhgpFLgHqmc4kwUUFUpS3ogATXu1bjnAFD+PFQT2hmOUS/ cbzMs8J5X3Ry7DBJusdy9x4/b5N1rr+ug1J+vpZp/MfLYtufXWiGYF7+WIt5tBU3thuxpF xaaUVq3aAvYKL8k5CTtwfDxw0+ldPYiUdkNrAOzSHGKDzgcz3dGVwhIBadR/pw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692210709; a=rsa-sha256; cv=none; b=FtMd5bG//PHEBMXVktVD7d6UsUcf0jKV3wL44piZvOa/G56RQWjjntJc5t2Yh4Cku4Rkof CO/Do2n4ivC5clrLWwFQ5wWbLWuzg8mH9oeig9PDZDgGoNAUU3iln7X0fMBhwa2ykkjiOs hYKA5g2eF37oKjy2f2TuxPCtrynVkIzxZQk0Bcy7KaIwNJoE9NXyk7LXdQ/PF3C9Xmi7aX 2EsRtTn38Q4B9+nNPq4yz2vkoheqhRxUxl70v7wKM7RYZXKK4STCTym+pRrAdiAOAA9yVT hF+ZNj7DjHNtGIoXQwXoJ1nxvVYxDMwlU8Yf5qNdTtuEWXiEZsQepqahirl68Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RQxYd2GFSz12js; Wed, 16 Aug 2023 18:31:49 +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 37GIVnZB028059; Wed, 16 Aug 2023 18:31:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37GIVnmW028056; Wed, 16 Aug 2023 18:31:49 GMT (envelope-from git) Date: Wed, 16 Aug 2023 18:31:49 GMT Message-Id: <202308161831.37GIVnmW028056@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: 0c96adba0b2a - main - devel/py-ddtrace: Update to 1.17.2 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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: 0c96adba0b2abfe6ead973a4d479fece30334ef3 Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=0c96adba0b2abfe6ead973a4d479fece30334ef3 commit 0c96adba0b2abfe6ead973a4d479fece30334ef3 Author: Po-Chuan Hsieh AuthorDate: 2023-08-16 18:11:45 +0000 Commit: Po-Chuan Hsieh 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( + [