git: 4b00ea0f8c76 - main - math/py-scikit-umfpack: update 0.3.3 → 0.4.1
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 08 Nov 2024 06:38:01 UTC
The branch main has been updated by yuri:
URL: https://cgit.FreeBSD.org/ports/commit/?id=4b00ea0f8c76b2acb51b5b6e84b1af62b44a0d42
commit 4b00ea0f8c76b2acb51b5b6e84b1af62b44a0d42
Author: Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2024-11-08 05:22:09 +0000
Commit: Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2024-11-08 06:37:37 +0000
math/py-scikit-umfpack: update 0.3.3 → 0.4.1
---
math/py-scikit-umfpack/Makefile | 22 +++--
math/py-scikit-umfpack/distinfo | 6 +-
.../files/patch-scikits_umfpack_umfpack.i | 97 ----------------------
3 files changed, 19 insertions(+), 106 deletions(-)
diff --git a/math/py-scikit-umfpack/Makefile b/math/py-scikit-umfpack/Makefile
index 350e08db38a4..163c7c0853ec 100644
--- a/math/py-scikit-umfpack/Makefile
+++ b/math/py-scikit-umfpack/Makefile
@@ -1,18 +1,20 @@
PORTNAME= scikit-umfpack
-DISTVERSION= 0.3.3
-PORTREVISION= 9
+DISTVERSION= 0.4.1
CATEGORIES= math python
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
+DISTNAME= ${PORTNAME:S/-/_/g}-${PORTVERSION}
MAINTAINER= yuri@FreeBSD.org
COMMENT= Python interface to UMFPACK sparse direct solver
-WWW= https://scikit-umfpack.github.io/scikit-umfpack/
+WWW= https://scikit-umfpack.github.io/scikit-umfpack/ \
+ https://github.com/scikit-umfpack/scikit-umfpack
LICENSE= BSD2CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= ${PYNUMPY} \
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}meson-python>0:devel/meson-python@${PY_FLAVOR} \
+ ${PYNUMPY} \
${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \
swig:devel/swig
LIB_DEPENDS= libamd.so:math/suitesparse-amd \
@@ -22,11 +24,19 @@ LIB_DEPENDS= libamd.so:math/suitesparse-amd \
RUN_DEPENDS= ${PYNUMPY} \
${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR}
-USES= fortran python
-USE_PYTHON= distutils cython autoplist pytest # tests fail, see https://github.com/scikit-umfpack/scikit-umfpack/issues/77
+USES= fortran localbase:ldflags python
+USE_PYTHON= pep517 cython autoplist pytest # tests fail, see https://github.com/scikit-umfpack/scikit-umfpack/issues/77
+
+CFLAGS+= -I/usr/local/include/suitesparse
+CXXFLAGS+= -I/usr/local/include/suitesparse
TEST_ENV= ${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
+post-patch:
+ ${REINPLACE_CMD} \
+ -e "s|swig_inc_args = \[\]|swig_inc_args = [\'-I${LOCALBASE}/include/suitesparse\']|" \
+ ${WRKSRC}/scikits/umfpack/meson.build
+
post-install:
@${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/scikits/umfpack/__umfpack${PYTHON_EXT_SUFFIX}.so
diff --git a/math/py-scikit-umfpack/distinfo b/math/py-scikit-umfpack/distinfo
index c0de857bc408..7da5e8029d69 100644
--- a/math/py-scikit-umfpack/distinfo
+++ b/math/py-scikit-umfpack/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1664086556
-SHA256 (scikit-umfpack-0.3.3.tar.gz) = 464534529de182f2444809807f14133b7fee86605c167060917f115a31633ec4
-SIZE (scikit-umfpack-0.3.3.tar.gz) = 26241
+TIMESTAMP = 1731041698
+SHA256 (scikit_umfpack-0.4.1.tar.gz) = 23a16750fbf866d32341ab3885fd59687bc9d5fbb9d372e50f6a968059604d59
+SIZE (scikit_umfpack-0.4.1.tar.gz) = 31845
diff --git a/math/py-scikit-umfpack/files/patch-scikits_umfpack_umfpack.i b/math/py-scikit-umfpack/files/patch-scikits_umfpack_umfpack.i
deleted file mode 100644
index 40fc3b86b101..000000000000
--- a/math/py-scikit-umfpack/files/patch-scikits_umfpack_umfpack.i
+++ /dev/null
@@ -1,97 +0,0 @@
---- scikits/umfpack/umfpack.i.orig 2017-10-25 11:44:24 UTC
-+++ scikits/umfpack/umfpack.i
-@@ -6,6 +6,8 @@
- /*
- See umfpack.py for more information.
-
-+ Patched from <https://github.com/scikit-umfpack/scikit-umfpack/pull/80/files>
-+
- Created by: Robert Cimrman
- */
-
-@@ -218,18 +220,21 @@ CONF_IN( UMFPACK_INFO )
- };
-
- %include <umfpack.h>
--%include <umfpack_solve.h>
--%include <umfpack_defaults.h>
--%include <umfpack_triplet_to_col.h>
--%include <umfpack_col_to_triplet.h>
--%include <umfpack_transpose.h>
--%include <umfpack_scale.h>
-
--%include <umfpack_report_symbolic.h>
--%include <umfpack_report_numeric.h>
--%include <umfpack_report_info.h>
--%include <umfpack_report_control.h>
-+#if UMFPACK_MAIN_VERSION < 6
-+ %include <umfpack_solve.h>
-+ %include <umfpack_defaults.h>
-+ %include <umfpack_triplet_to_col.h>
-+ %include <umfpack_col_to_triplet.h>
-+ %include <umfpack_transpose.h>
-+ %include <umfpack_scale.h>
-
-+ %include <umfpack_report_symbolic.h>
-+ %include <umfpack_report_numeric.h>
-+ %include <umfpack_report_info.h>
-+ %include <umfpack_report_control.h>
-+#endif
-+
- /*
- The order is important below!
- */
-@@ -240,21 +245,22 @@ OPAQUE_ARGOUT( void * )
- void **Numeric
- }
-
--%include <umfpack_symbolic.h>
--%include <umfpack_numeric.h>
-+#if UMFPACK_MAIN_VERSION < 6
-+ %include <umfpack_symbolic.h>
-+ %include <umfpack_numeric.h>
-+#endif
-
--
- OPAQUE_ARGINOUT( void * )
- %apply void ** opaque_arginout {
- void **Symbolic,
- void **Numeric
- }
-
--%include <umfpack_free_symbolic.h>
--%include <umfpack_free_numeric.h>
-+#if UMFPACK_MAIN_VERSION < 6
-+ %include <umfpack_free_symbolic.h>
-+ %include <umfpack_free_numeric.h>
-+#endif
-
--
--
- /*
- * wnbell - attempt to get L,U,P,Q out
- */
-@@ -280,8 +286,11 @@ OPAQUE_ARGINOUT( void * )
- SuiteSparse_long *n_col,
- SuiteSparse_long *nz_udiag
- };
--%include <umfpack_get_lunz.h>
-
-+#if UMFPACK_MAIN_VERSION < 6
-+ %include <umfpack_get_lunz.h>
-+#endif
-+
- ARRAY_IN( double, double, DOUBLE )
- %apply double *array {
- double Lx [ ],
-@@ -326,6 +335,8 @@ ARRAY_IN( SuiteSparse_long, SuiteSparse_long, INT64 )
- };
- %apply long *OUTPUT { SuiteSparse_long *do_recip};
-
--%include <umfpack_get_numeric.h>
--
-+#if UMFPACK_MAIN_VERSION < 6
-+ %include <umfpack_get_numeric.h>
- #endif
-+
-+#endif // SWIGPYTHON