From nobody Sun Aug 14 21:36:23 2022 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 4M5W1z3NYVz4YTD5; Sun, 14 Aug 2022 21:36:23 +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 4M5W1z2z8wz3r34; Sun, 14 Aug 2022 21:36:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660512983; 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=8T0T/xu6RWRcV/Sfgsh0t8cc+GUbwzkHt5Ae4R5HM/s=; b=XvEOn44/czm1sG1Vl00rE9U4ypoa0VwxO9Or820OcmYqmIZ+TcLvsD6EG83MMGPisOeBbe IsJlxEoq2HHc1drYSRuHl0Z49qbHbayrt/CgbzPAfFVW7YoUw/vOiyn9ub1+8uJVCkqyPb vU3yLYLUt48Ajac7GLV6aVNzQF2VAuQ91k8XrxyBT2tWRHub2JYU6P2KRNkcVjJpLs0UQt 31rIMTI0r/abpsf6sL79ak2wDU+A85WLH6x/QLEcYQ/e/cHSp5XsYzA8wSzt5+oEjOMx6n Uf+UkCN+HY1IIG71tgHBcgD2HZcYjGxfZNzIYCOS5uY16BRY3Eu+G2JsNGLCSw== 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 4M5W1z23Xvz15KH; Sun, 14 Aug 2022 21:36:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 27ELaNLE026759; Sun, 14 Aug 2022 21:36:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27ELaNke026758; Sun, 14 Aug 2022 21:36:23 GMT (envelope-from git) Date: Sun, 14 Aug 2022 21:36:23 GMT Message-Id: <202208142136.27ELaNke026758@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: b4f0b3cecb2b - main - science/py-dwave-preprocessing: Fix conflict with other package 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: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b4f0b3cecb2b25b46246b094523bc9ee9e536373 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660512983; 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=8T0T/xu6RWRcV/Sfgsh0t8cc+GUbwzkHt5Ae4R5HM/s=; b=PDdkh/zk2CUZmD0qvI9MtXbrTQZKPm0Rr6NBHLEJLFKhqbhJCsw9xgx6iJKwltG/pdz2PC /a5Ea9dRMDbYNSNLRTWkhF9SER7skqo9Nu8he99GeXPdxw66eTvVBBJ45Mj1K1sLT10l+v LXatFpY59F8W77HDnqzxBOMJCdRraufUHpxgDGsyUj9G1ft61cUKCwET8B4ZdFr/HHtwf0 prdsa1IifJpdoyhy5rQ+kAHJVSPWGchDh9sC43RrJhFlGleYuarM4wuDDG+23mHDrJZpZ0 rbHUQTxp7w6ar6J60FaMR7zjOiQtHjOMiwusAlNOGUM0AQ1EELBZfTNzF6aPSQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1660512983; a=rsa-sha256; cv=none; b=q2iJDfVBoGoNNtgPM4BKpOVP0Lp8iysblVmFzbtipXawDDMz6i1T6TjMiiNR2UjPP24Qsw 1a5d+rd/QRzeVRgQD7aNSFnrdONnfxylweiG57HLCNaHnaqwHMfa+5Zs6mOBi49lPq+GjA GjQGgaSwHBVs12/Z0NQFiRSdHqzDBoSWs7Osh+FjZ4WG4Qk81FSsE0HYH4p4B33+PJzs2w lRbpBdZ4WK7lYFPsVjf+qHINUnya5yCDMMEFLjt9iNO5RYI9tMjCIq8O8r6NPrgkY3Iblz h3Fa/Pi3hFht+eILbISxLaal3Qrcwp2Q/CYDrWF/3TZKuQWr6txKkh+rFuHRMA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=b4f0b3cecb2b25b46246b094523bc9ee9e536373 commit b4f0b3cecb2b25b46246b094523bc9ee9e536373 Author: Yuri Victorovich AuthorDate: 2022-08-14 19:45:53 +0000 Commit: Yuri Victorovich CommitDate: 2022-08-14 21:36:17 +0000 science/py-dwave-preprocessing: Fix conflict with other package --- science/py-dwave-preprocessing/Makefile | 8 +++++++- science/py-dwave-preprocessing/pkg-plist | 34 ++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 1 deletion(-) diff --git a/science/py-dwave-preprocessing/Makefile b/science/py-dwave-preprocessing/Makefile index 9d4e9d96d53f..076a8a528fb5 100644 --- a/science/py-dwave-preprocessing/Makefile +++ b/science/py-dwave-preprocessing/Makefile @@ -1,5 +1,6 @@ PORTNAME= dwave-preprocessing DISTVERSION= 0.4.0 +PORTREVISION= 1 CATEGORIES= science python # quantum-computing PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -18,7 +19,7 @@ xTEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dwave-system>0:science/dwave-system@${PY_F ${PYTHON_PKGNAMEPREFIX}parameterized>0:devel/py-parameterized@${PY_FLAVOR} USES= python:3.7+ -USE_PYTHON= distutils cython autoplist unittest # 3 tests fail, see https://github.com/dwavesystems/dwave-preprocessing/issues/44 +USE_PYTHON= distutils cython unittest # 3 tests fail, see https://github.com/dwavesystems/dwave-preprocessing/issues/44 USE_GITHUB= yes GH_ACCOUNT= dwavesystems @@ -27,6 +28,11 @@ TEST_ENV= ${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} TEST_WRKSRC= ${WRKSRC}/tests post-install: + # strip binaries @${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/dwave/preprocessing/cyfix_variables${PYTHON_EXT_SUFFIX}.so + # remove conflicting __init__.py, see https://github.com/dwavesystems/dwave-preprocessing/issues/45 + @${RM} -r \ + ${STAGEDIR}${PYTHON_SITELIBDIR}/dwave/__init__.py \ + ${STAGEDIR}${PYTHON_SITELIBDIR}/dwave/__pycache__ .include diff --git a/science/py-dwave-preprocessing/pkg-plist b/science/py-dwave-preprocessing/pkg-plist new file mode 100644 index 000000000000..56e6253a73d6 --- /dev/null +++ b/science/py-dwave-preprocessing/pkg-plist @@ -0,0 +1,34 @@ +%%PYTHON_SITELIBDIR%%/dwave/preprocessing/__init__.py +%%PYTHON_SITELIBDIR%%/dwave/preprocessing/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc +%%PYTHON_SITELIBDIR%%/dwave/preprocessing/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/dwave/preprocessing/__pycache__/lower_bounds%%PYTHON_EXT_SUFFIX%%.opt-1.pyc +%%PYTHON_SITELIBDIR%%/dwave/preprocessing/__pycache__/lower_bounds%%PYTHON_EXT_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/dwave/preprocessing/composites/__init__.py +%%PYTHON_SITELIBDIR%%/dwave/preprocessing/composites/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc +%%PYTHON_SITELIBDIR%%/dwave/preprocessing/composites/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/dwave/preprocessing/composites/__pycache__/clip%%PYTHON_EXT_SUFFIX%%.opt-1.pyc +%%PYTHON_SITELIBDIR%%/dwave/preprocessing/composites/__pycache__/clip%%PYTHON_EXT_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/dwave/preprocessing/composites/__pycache__/connected_components%%PYTHON_EXT_SUFFIX%%.opt-1.pyc +%%PYTHON_SITELIBDIR%%/dwave/preprocessing/composites/__pycache__/connected_components%%PYTHON_EXT_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/dwave/preprocessing/composites/__pycache__/fix_variables%%PYTHON_EXT_SUFFIX%%.opt-1.pyc +%%PYTHON_SITELIBDIR%%/dwave/preprocessing/composites/__pycache__/fix_variables%%PYTHON_EXT_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/dwave/preprocessing/composites/__pycache__/scale%%PYTHON_EXT_SUFFIX%%.opt-1.pyc +%%PYTHON_SITELIBDIR%%/dwave/preprocessing/composites/__pycache__/scale%%PYTHON_EXT_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/dwave/preprocessing/composites/__pycache__/spin_reversal_transform%%PYTHON_EXT_SUFFIX%%.opt-1.pyc +%%PYTHON_SITELIBDIR%%/dwave/preprocessing/composites/__pycache__/spin_reversal_transform%%PYTHON_EXT_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/dwave/preprocessing/composites/clip.py +%%PYTHON_SITELIBDIR%%/dwave/preprocessing/composites/connected_components.py +%%PYTHON_SITELIBDIR%%/dwave/preprocessing/composites/fix_variables.py +%%PYTHON_SITELIBDIR%%/dwave/preprocessing/composites/scale.py +%%PYTHON_SITELIBDIR%%/dwave/preprocessing/composites/spin_reversal_transform.py +%%PYTHON_SITELIBDIR%%/dwave/preprocessing/cyfix_variables.cpp +%%PYTHON_SITELIBDIR%%/dwave/preprocessing/cyfix_variables%%PYTHON_EXT_SUFFIX%%.so +%%PYTHON_SITELIBDIR%%/dwave/preprocessing/cyfix_variables.pyx +%%PYTHON_SITELIBDIR%%/dwave/preprocessing/include/dwave-preprocessing/fix_variables.hpp +%%PYTHON_SITELIBDIR%%/dwave/preprocessing/include/dwave-preprocessing/helper_data_structures.hpp +%%PYTHON_SITELIBDIR%%/dwave/preprocessing/include/dwave-preprocessing/helper_graph_algorithms.hpp +%%PYTHON_SITELIBDIR%%/dwave/preprocessing/include/dwave-preprocessing/implication_network.hpp +%%PYTHON_SITELIBDIR%%/dwave/preprocessing/include/dwave-preprocessing/mapping_policy.hpp +%%PYTHON_SITELIBDIR%%/dwave/preprocessing/include/dwave-preprocessing/posiform_info.hpp +%%PYTHON_SITELIBDIR%%/dwave/preprocessing/include/dwave-preprocessing/push_relabel.hpp +%%PYTHON_SITELIBDIR%%/dwave/preprocessing/lower_bounds.py