From nobody Fri Nov 08 06:38:01 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Xl8QL1Bxrz5cFKR; Fri, 08 Nov 2024 06:38:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xl8QK5nG0z52Kr; Fri, 8 Nov 2024 06:38:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731047881; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7yPF14FvBNZz84K3O9lW5G7J2cF02EXn3VqQjwsPrcA=; b=cjO5DhvHBxvyg+Mq0zoFT+AHcN2fvh4/mYtQ/tG+g/F131s5w5DgHq1Lt8fFrN/DO+/N/F s/yueAgf7xn1AOSY10t0Dd5ZY7AqA4BUINiRqOur/euTeZaVCsoAqKQPBJG1V72g/hMxGL zAG1GBubiyZhSRO83GY58OrqzD4vdMhe1uJUBI8yFCjUilPLWawmQHIKPlTAfIa/erI0+6 znm52DtgwYorWPzJ+6fa5kpzEHQasWK3+HL0nYY363l3DnIWejnlnnT9G2XI4eMNXUH1XH Ph4U9CA0JB+Fm0G1keAikyf2tJfMWlIGtSV20WeXzhFMRgjcAHf6AdFey0pxQg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731047881; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7yPF14FvBNZz84K3O9lW5G7J2cF02EXn3VqQjwsPrcA=; b=shOhIE0CDBQxm/YDGiIJ8Yh/87EXCWsv4SB0WEXAgSr3ISe51yQSr1YLmBGgJ5m4+nrG2C CfVw2WzeDdYWobjfliO6jyRDG1u+ZL4sbAt2CFMgR+P4cEFTDDrZUAX+WhHckQK3nzX1Ba 9aOXPoUun+TixD+vMhlfF98a54CE6V6Hk0kwlTuTqC9TnpI1HWaBqkgbloZf1wUd4orzCK +uykCvtkkwqrj78xYLrKhJhXTtDhvRkXArE5FXUmpjfSa3wb3f4sqoNUy5daOBDw2oFkKx gzZvqjHjHfKBLOqF8MwjOPl7BSHGzxC/MrQYTBFsgNosfsXASkuli8zV9geVdg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1731047881; a=rsa-sha256; cv=none; b=csk/8iHtLmxqMdfZWkm8gpEhobJ06Iglri4F0JXDJtNrb+3+9yZ+WNkvy4L0wK5vk2dAJ1 uexy5iEQ+aMRfi/Ml2caBF7b4wBDJEt/jqTr13WsMfsUKuQWIBz3cUZk4IXEoK9CkwkE8/ 81sFSwKj6KJ6aix3cwrK6kbVoPmy7rSr8E+rVyfY396abznl3k46KRYOLLJthD4CuYLjO1 OcYRLIY11TSeJa/WwnDNGp27o4ZgxoE0ZsfDDFHuvSvUDn+Z73Z7NMIP3fTfuBFC2nbBvc HkgCG/6b9ulo/zk1ChLIpL2R2vn8l3LQgHdCK8Nf6NX+zslL2MCPSOHw2O9J7g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Xl8QK3WcBzJdN; Fri, 8 Nov 2024 06:38:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A86c1T1032541; Fri, 8 Nov 2024 06:38:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A86c1x6032538; Fri, 8 Nov 2024 06:38:01 GMT (envelope-from git) Date: Fri, 8 Nov 2024 06:38:01 GMT Message-Id: <202411080638.4A86c1x6032538@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: 4b00ea0f8c76 - main - math/py-scikit-umfpack: update 0.3.3 =?utf-8?Q?=E2=86=92?= 0.4.1 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4b00ea0f8c76b2acb51b5b6e84b1af62b44a0d42 Auto-Submitted: auto-generated The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=4b00ea0f8c76b2acb51b5b6e84b1af62b44a0d42 commit 4b00ea0f8c76b2acb51b5b6e84b1af62b44a0d42 Author: Yuri Victorovich AuthorDate: 2024-11-08 05:22:09 +0000 Commit: Yuri Victorovich 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 -+ - Created by: Robert Cimrman - */ - -@@ -218,18 +220,21 @@ CONF_IN( UMFPACK_INFO ) - }; - - %include --%include --%include --%include --%include --%include --%include - --%include --%include --%include --%include -+#if UMFPACK_MAIN_VERSION < 6 -+ %include -+ %include -+ %include -+ %include -+ %include -+ %include - -+ %include -+ %include -+ %include -+ %include -+#endif -+ - /* - The order is important below! - */ -@@ -240,21 +245,22 @@ OPAQUE_ARGOUT( void * ) - void **Numeric - } - --%include --%include -+#if UMFPACK_MAIN_VERSION < 6 -+ %include -+ %include -+#endif - -- - OPAQUE_ARGINOUT( void * ) - %apply void ** opaque_arginout { - void **Symbolic, - void **Numeric - } - --%include --%include -+#if UMFPACK_MAIN_VERSION < 6 -+ %include -+ %include -+#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 - -+#if UMFPACK_MAIN_VERSION < 6 -+ %include -+#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 -- -+#if UMFPACK_MAIN_VERSION < 6 -+ %include - #endif -+ -+#endif // SWIGPYTHON