Attachment 249318 Details for Bug 277826 – Update to 1.12.0

[patch] Update to 1.12.0

scipy-1.12.0.diff.txt (text/plain), 5.58 KB, created by wen on 2024-03-20 03:08:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: wen

Created: 2024-03-20 03:08:10 UTC

Size: 5.58 KB

patch

obsolete

>diff --git a/devel/meson-python/Makefile b/devel/meson-python/Makefile
>index 735db313163b..100010cebf6a 100644
>--- a/devel/meson-python/Makefile
>+++ b/devel/meson-python/Makefile
>@@ -1,5 +1,5 @@
> PORTNAME=	meson-python
>-DISTVERSION=	0.14.0
>+DISTVERSION=	0.15.0
> CATEGORIES=	devel python
> MASTER_SITES=	PYPI
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>diff --git a/devel/meson-python/distinfo b/devel/meson-python/distinfo
>index c773d72cca68..75de6a78ba0d 100644
>--- a/devel/meson-python/distinfo
>+++ b/devel/meson-python/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1696841319
>-SHA256 (meson_python-0.14.0.tar.gz) = b96866690326544dfe452583753ac3f43313227e9fd9416701a8df90af212234
>-SIZE (meson_python-0.14.0.tar.gz) = 78824
>+TIMESTAMP = 1710836281
>+SHA256 (meson_python-0.15.0.tar.gz) = fddb73eecd49e89c1c41c87937cd89c2d0b65a1c63ba28238681d4bd9484d26f
>+SIZE (meson_python-0.15.0.tar.gz) = 79920
>diff --git a/science/py-scipy/Makefile b/science/py-scipy/Makefile
>index d2178edee619..1488d6c09415 100644
>--- a/science/py-scipy/Makefile
>+++ b/science/py-scipy/Makefile
>@@ -1,6 +1,5 @@
> PORTNAME=	scipy
>-DISTVERSION=	1.11.1
>-PORTREVISION=	2
>+DISTVERSION=	1.12.0
> CATEGORIES=	science python
> MASTER_SITES=	https://docs.scipy.org/doc/${PORTNAME}-${DISTVERSION}/:doc \
> 		PYPI:source \
>@@ -18,42 +17,48 @@ LICENSE=	BSD3CLAUSE
> 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:devel/meson-python@${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}
>+#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:3.9-3.11 shebangfix
>+USE_PYTHON=	autoplist concurrent cython pep517
> 
> 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 '23,26s|numpy==|numpy>=|' \
>+		${WRKSRC}/pyproject.toml
> 
> post-install:
> 	${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR}/scipy/ -name '*.so' | ${XARGS} ${STRIP_CMD}
> 
> post-install-DOCS-on:
> 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
>-	@${UNZIP_CMD} -d ${STAGEDIR}${DOCSDIR} ${DISTDIR}/scipy-html-${DISTVERSION}.zip
>-	@${RM} ${STAGEDIR}${PREFIX}/share/doc/${PYTHON_PKGNAMEPREFIX}${PORTNAME}/.buildinfo
>+	@${UNZIP_NATIVE_CMD} -d ${STAGEDIR}${DOCSDIR} ${DISTDIR}/scipy-html-${DISTVERSION}.zip
>+	@${RM} ${STAGEDIR}${DOCSDIR}/.buildinfo
> 
>-do-test:
>-	@cd ${WRKSRC} && ${TOUCH} .coveragerc && ${PYTHON_CMD} runtests.py
>+#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
>index d48020edde76..267c18d59a08 100644
>--- 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 = 1710836225
>+SHA256 (scipy-1.12.0.tar.gz) = 4bf5abab8a36d20193c698b0f1fc282c1d083c94723902c447e5d2f1780936a3
>+SIZE (scipy-1.12.0.tar.gz) = 56811768
>+SHA256 (scipy-html-1.12.0.zip) = 8b8ee1758a6c6223f4b5f594eee2d09b9625c9a45077f2d044f4a8a8a9947381
>+SIZE (scipy-html-1.12.0.zip) = 52137147
>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
>index c885d4d4a25f..000000000000
>--- 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')

Actions: View | Diff

Attachments on bug 277826: 249318