Page MenuHomeFreeBSD
Files F109244880

D42144.diff
No OneTemporary
Actions

D42144.diff
View Options

diff --git a/science/py-scipy/Makefile b/science/py-scipy/Makefile
--- a/science/py-scipy/Makefile
+++ b/science/py-scipy/Makefile
@@ -1,5 +1,5 @@
PORTNAME= scipy
-DISTVERSION= 1.11.1
+DISTVERSION= 1.11.3
CATEGORIES= science python
MASTER_SITES= https://docs.scipy.org/doc/${PORTNAME}-${DISTVERSION}/:doc \
PYPI:source \
@@ -17,42 +17,43 @@
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
BUILD_DEPENDS= ${PYNUMPY} \
- ${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pybind11>0:devel/py-pybind11@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pythran>=0:devel/py-pythran@${PY_FLAVOR} \
- unzip>0:archivers/unzip
-LIB_DEPENDS= libblas.so:math/blas \
- libopenblas.so:math/openblas
+ ${PYTHON_PKGNAMEPREFIX}meson-python>=0.12.1:devel/meson-python@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pybind11>=2.10.4:devel/py-pybind11@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pythran>=0.12.0:devel/py-pythran@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR}
RUN_DEPENDS= ${PYNUMPY}
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gmpy2>0:math/py-gmpy2@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}mpmath>0:math/py-mpmath@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pooch>0:devel/py-pooch@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pytest-cov>0:devel/py-pytest-cov@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pytest-timeout>0:devel/py-pytest-timeout@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pytest-xdist>0:devel/py-pytest-xdist@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}scikit-umfpack>0:math/py-scikit-umfpack@${PY_FLAVOR}
-USES= compiler:c++14-lang cpe fortran python:3.9-3.11 shebangfix
-USE_PYTHON= autoplist concurrent cython distutils
+USES= compiler:c++14-lang cpe fortran pkgconfig python shebangfix
+USE_PYTHON= autoplist concurrent cython pep517
+
+BINARY_ALIAS= cython=cython-${PYTHON_VER} \
+ pybind11-config=pybind11-config-${PYTHON_VER} \
+ pythran=pythran-${PYTHON_VER}
FFLAGS+= -std=legacy
-LDFLAGS+= -shared
-PYDISTUTILS_BUILDARGS= --fcompiler=gnu95
-PYDISTUTILS_CONFIGUREARGS= --fcompiler=gnu95
PORTDOCS= *
OPTIONS_DEFINE= DOCS
+OPTIONS_SINGLE= BLASLIB
+OPTIONS_SINGLE_BLASLIB= ATLAS NETLIB OPENBLAS
+OPTIONS_DEFAULT= OPENBLAS
+
+ATLAS_USES= blaslapack:atlas
+NETLIB_USES= blaslapack:netlib
+OPENBLAS_USES= blaslapack:openblas
+
+post-patch:
+ @${REINPLACE_CMD} -e 's|pybind11>=2.10.4,<2.11.1|pybind11>=2.10.4|' \
+ -e '39,46s|numpy==|numpy>=|' \
+ ${WRKSRC}/pyproject.toml
post-install:
- ${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR}/scipy/ -name '*.so' | ${XARGS} ${STRIP_CMD}
+ ${FIND} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/scipy/ -name '*.so' | ${XARGS} ${STRIP_CMD}
post-install-DOCS-on:
@${MKDIR} ${STAGEDIR}${DOCSDIR}
- @${UNZIP_CMD} -d ${STAGEDIR}${DOCSDIR} ${DISTDIR}/scipy-html-${DISTVERSION}.zip
+ @${UNZIP_NATIVE_CMD} -d ${STAGEDIR}${DOCSDIR} ${DISTDIR}/scipy-html-${DISTVERSION}.zip
@${RM} ${STAGEDIR}${PREFIX}/share/doc/${PYTHON_PKGNAMEPREFIX}${PORTNAME}/.buildinfo
-do-test:
- @cd ${WRKSRC} && ${TOUCH} .coveragerc && ${PYTHON_CMD} runtests.py
-
.include <bsd.port.mk>
diff --git a/science/py-scipy/distinfo b/science/py-scipy/distinfo
--- a/science/py-scipy/distinfo
+++ b/science/py-scipy/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1688646879
-SHA256 (scipy-1.11.1.tar.gz) = fb5b492fa035334fd249f0973cc79ecad8b09c604b42a127a677b45a9a3d4289
-SIZE (scipy-1.11.1.tar.gz) = 56031509
-SHA256 (scipy-html-1.11.1.zip) = e0a90d5fb0b93f0433c63cc1f80c8084e54c0402606a60a7898f61b53be60f13
-SIZE (scipy-html-1.11.1.zip) = 50389323
+TIMESTAMP = 1696840867
+SHA256 (scipy-1.11.3.tar.gz) = bba4d955f54edd61899776bad459bf7326e14b9fa1c552181f0479cc60a568cd
+SIZE (scipy-1.11.3.tar.gz) = 56335652
+SHA256 (scipy-html-1.11.3.zip) = 1ada7ab15a484a39dfe3b770249526fafe6ed897b770141c10d577125e060f30
+SIZE (scipy-html-1.11.3.zip) = 50442667
diff --git a/science/py-scipy/files/patch-scipy_linalg_setup.py b/science/py-scipy/files/patch-scipy_linalg_setup.py
deleted file mode 100644
--- a/science/py-scipy/files/patch-scipy_linalg_setup.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- scipy/linalg/setup.py.orig 2022-08-08 07:24:08 UTC
-+++ scipy/linalg/setup.py
-@@ -160,7 +160,7 @@ def configuration(parent_package='', top_path=None):
-
- # Add any license files
- config.add_data_files('src/id_dist/doc/doc.tex')
-- config.add_data_files('src/lapack_deprecations/LICENSE')
-+ #config.add_data_files('src/lapack_deprecations/LICENSE')
-
- # Type stubs
- config.add_data_files('*.pyi')
diff --git a/science/py-scipy/files/patch-scipy_sparse_tests_test__base.py b/science/py-scipy/files/patch-scipy_sparse_tests_test__base.py
deleted file mode 100644
--- a/science/py-scipy/files/patch-scipy_sparse_tests_test__base.py
+++ /dev/null
@@ -1,35 +0,0 @@
---- scipy/sparse/tests/test_base.py.orig 1970-01-01 00:00:00 UTC
-+++ scipy/sparse/tests/test_base.py
-@@ -4774,19 +4774,19 @@ class TestCSCNonCanonical(_NonCanonicalCSMixin, TestCS
- pass
-
-
--class TestBSRNonCanonical(_NonCanonicalCompressedMixin, TestBSR):
-- def _insert_explicit_zero(self, M, i, j):
-- x = M.tocsr()
-- x[i,j] = 0
-- return x.tobsr(blocksize=M.blocksize)
--
-- @pytest.mark.xfail(run=False, reason='diagonal broken with non-canonical BSR')
-- def test_diagonal(self):
-- pass
--
-- @pytest.mark.xfail(run=False, reason='expm broken with non-canonical BSR')
-- def test_expm(self):
-- pass
-+#class TestBSRNonCanonical(_NonCanonicalCompressedMixin, TestBSR):
-+# def _insert_explicit_zero(self, M, i, j):
-+# x = M.tocsr()
-+# x[i,j] = 0
-+# return x.tobsr(blocksize=M.blocksize)
-+#
-+# @pytest.mark.xfail(run=False, reason='diagonal broken with non-canonical BSR')
-+# def test_diagonal(self):
-+# pass
-+#
-+# @pytest.mark.xfail(run=False, reason='expm broken with non-canonical BSR')
-+# def test_expm(self):
-+# pass
-
-
- class TestCOONonCanonical(_NonCanonicalMixin, TestCOO):

File Metadata

Mime Type
text/plain
Expires
Mon, Feb 3, 1:25 PM (21 h, 24 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
16434774
Default Alt Text
D42144.diff (5 KB)

Event Timeline