diff --git a/science/py-dwave-preprocessing/Makefile b/science/py-dwave-preprocessing/Makefile index c4d24ad56308..15a21bb2d944 100644 --- a/science/py-dwave-preprocessing/Makefile +++ b/science/py-dwave-preprocessing/Makefile @@ -1,40 +1,39 @@ PORTNAME= dwave-preprocessing -DISTVERSION= 0.5.4 -PORTREVISION= 1 +DISTVERSION= 0.6.0 CATEGORIES= science python # quantum-computing PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= yuri@FreeBSD.org COMMENT= DWave: Preprocessing tools to aid in solving binary quadratic models WWW= https://github.com/dwavesystems/dwave-preprocessing LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE PY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dimod>=0.12.2:science/py-dimod@${PY_FLAVOR} \ ${PYNUMPY} BUILD_DEPENDS= ${PY_DEPENDS} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0.30.0:devel/py-wheel@${PY_FLAVOR} LIB_DEPENDS= libspdlog.so:devel/spdlog RUN_DEPENDS= ${PY_DEPENDS} USES= localbase:ldflags python USE_PYTHON= distutils cython unittest # 1 test fails, see https://github.com/dwavesystems/dwave-preprocessing/issues/74 USE_GITHUB= yes GH_ACCOUNT= dwavesystems 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 \ ${STAGEDIR}${PYTHON_SITELIBDIR}/dwave/preprocessing/presolve/cypresolve${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/distinfo b/science/py-dwave-preprocessing/distinfo index 00656393515d..5301902eeec9 100644 --- a/science/py-dwave-preprocessing/distinfo +++ b/science/py-dwave-preprocessing/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1671954380 -SHA256 (dwavesystems-dwave-preprocessing-0.5.4_GH0.tar.gz) = 864ec18a8f14a83f0439d3cb6a9006c0d9577012f2cab14b622dc715bac17b24 -SIZE (dwavesystems-dwave-preprocessing-0.5.4_GH0.tar.gz) = 104138 +TIMESTAMP = 1688052867 +SHA256 (dwavesystems-dwave-preprocessing-0.6.0_GH0.tar.gz) = 6b7b78c20a3a4dc09a773824571f1001152451bc3e11c2204423949b45360e94 +SIZE (dwavesystems-dwave-preprocessing-0.6.0_GH0.tar.gz) = 123008 diff --git a/science/py-dwave-preprocessing/files/patch-setup.py b/science/py-dwave-preprocessing/files/patch-setup.py index eb472512857e..3502e3ac7a03 100644 --- a/science/py-dwave-preprocessing/files/patch-setup.py +++ b/science/py-dwave-preprocessing/files/patch-setup.py @@ -1,10 +1,10 @@ ---- setup.py.orig 2022-12-25 07:50:44 UTC +--- setup.py.orig 2023-06-29 15:35:53 UTC +++ setup.py -@@ -26,6 +26,7 @@ extra_compile_args = { - 'msvc': ['/std:c++17', '/EHsc'], - 'unix': [ - '-std=c++17', -+ '-DSPDLOG_FMT_EXTERNAL=1', - ], - } - +@@ -63,7 +63,6 @@ setup( + include_dirs=[ + numpy.get_include(), + dimod.get_include(), +- 'extern/spdlog/include/', + ], + install_requires=[ + 'numpy>=1.17.3,<2.0.0', # this is the oldest supported NumPy on Python 3.8 diff --git a/science/py-dwave-preprocessing/pkg-plist b/science/py-dwave-preprocessing/pkg-plist index e869dca5837e..93a7865b4dcf 100644 --- a/science/py-dwave-preprocessing/pkg-plist +++ b/science/py-dwave-preprocessing/pkg-plist @@ -1,47 +1,55 @@ %%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/include/dwave/presolve.h +%%PYTHON_SITELIBDIR%%/dwave/preprocessing/include/dwave/exceptions.hpp +%%PYTHON_SITELIBDIR%%/dwave/preprocessing/include/dwave/flags.hpp +%%PYTHON_SITELIBDIR%%/dwave/preprocessing/include/dwave/presolve.hpp %%PYTHON_SITELIBDIR%%/dwave/preprocessing/libcpp.pxd %%PYTHON_SITELIBDIR%%/dwave/preprocessing/lower_bounds.py %%PYTHON_SITELIBDIR%%/dwave/preprocessing/presolve/__init__.pxd %%PYTHON_SITELIBDIR%%/dwave/preprocessing/presolve/__init__.py %%PYTHON_SITELIBDIR%%/dwave/preprocessing/presolve/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc %%PYTHON_SITELIBDIR%%/dwave/preprocessing/presolve/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/dwave/preprocessing/presolve/__pycache__/exceptions%%PYTHON_EXT_SUFFIX%%.opt-1.pyc +%%PYTHON_SITELIBDIR%%/dwave/preprocessing/presolve/__pycache__/exceptions%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/dwave/preprocessing/presolve/__pycache__/pypresolve%%PYTHON_EXT_SUFFIX%%.opt-1.pyc %%PYTHON_SITELIBDIR%%/dwave/preprocessing/presolve/__pycache__/pypresolve%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/dwave/preprocessing/presolve/cypresolve.cpp %%PYTHON_SITELIBDIR%%/dwave/preprocessing/presolve/cypresolve%%PYTHON_EXT_SUFFIX%%.so %%PYTHON_SITELIBDIR%%/dwave/preprocessing/presolve/cypresolve.pxd %%PYTHON_SITELIBDIR%%/dwave/preprocessing/presolve/cypresolve.pyx +%%PYTHON_SITELIBDIR%%/dwave/preprocessing/presolve/exceptions.py %%PYTHON_SITELIBDIR%%/dwave/preprocessing/presolve/pypresolve.py +%%PYTHON_SITELIBDIR%%/dwave/preprocessing/src/exceptions.cpp +%%PYTHON_SITELIBDIR%%/dwave/preprocessing/src/presolve.cpp +%%PYTHON_SITELIBDIR%%/dwave/preprocessing/src/presolveimpl.hpp