science/py-dwave-preprocessing: Update 0.5.4 → 0.6.0

Reported by: portscout
freebsd · Jun 29, 2023 · 9c2d1c3 · 9c2d1c3
1 parent a63ef2a
commit 9c2d1c3
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 15 deletions.
diff --git a/science/py-dwave-preprocessing/Makefile b/science/py-dwave-preprocessing/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	dwave-preprocessing
-DISTVERSION=	0.5.4
-PORTREVISION=	1
+DISTVERSION=	0.6.0
 CATEGORIES=	science python # quantum-computing
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 

diff --git 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
@@ -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
@@ -31,17 +31,25 @@
 %%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