git: b4f0b3cecb2b - main - science/py-dwave-preprocessing: Fix conflict with other package

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Yuri Victorovich <yuri_at_FreeBSD.org>
Date: Sun, 14 Aug 2022 21:36:23 UTC
The branch main has been updated by yuri:

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

commit b4f0b3cecb2b25b46246b094523bc9ee9e536373
Author:     Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2022-08-14 19:45:53 +0000
Commit:     Yuri Victorovich <yuri@FreeBSD.org>
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 <bsd.port.mk>
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