From nobody Mon Feb 28 12:52:23 2022 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 03E6A19F587E; Mon, 28 Feb 2022 12:52:24 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4K6gJR3Ndpz3jkk; Mon, 28 Feb 2022 12:52:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646052743; 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=Swg92o+3i4tHhe9aXH2qpL6ZXG4D4ODtC/P4kXhFkRE=; b=iQMm8UoHRYwL1fF71mTFr5nlwA6hTqnzjviHbj1d5Iq6kWnE/j2OW8gkkeiVefTFR74Lk/ F4fGcF7VPGUHJYTdoA1NvmkZBjzHhcndJdmMj1ZC2ecZgw/NKLEFw1BmTyruaf6er26E59 bENsy1FyAJ4gm/eK9UIYB56/B7XPY6IbxH5bVPrwf666KXvk48FZamikgdhiV+gu/mKwso rSGzGQUHA+GfwWQBj40HDOsMTct5Gc80VxDn2B2JAdDsTovRrMic9vtE61aKptgZv3vBPk VF+2vJmIowZwZ50+WXRhlDJAXqOvntQQDQjmRjTdp0T3REb3lzyaC0A+AgXo9g== 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 1B1001BA5F; Mon, 28 Feb 2022 12:52:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 21SCqNGH065408; Mon, 28 Feb 2022 12:52:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21SCqN8u065407; Mon, 28 Feb 2022 12:52:23 GMT (envelope-from git) Date: Mon, 28 Feb 2022 12:52:23 GMT Message-Id: <202202281252.21SCqN8u065407@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 443113925cf4 - main - math/py-pygsl: Update to 2.3.2 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 443113925cf469e9d86ee56374d8badb8d7d8754 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646052743; 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=Swg92o+3i4tHhe9aXH2qpL6ZXG4D4ODtC/P4kXhFkRE=; b=tTQtC1EvNChBc3OqionpGMdbcmER4OnSAprt+CtEAwjgTmTiS5Sa9Fh42yRu4Lxl8MY25i 7IdFF1/5jJlU+aCxoL97cQ1FJqfGsuxeGIo6QHhppJpsRgGkcn9wD78qTl2ynd4FoReXA/ c1fOG2Y+zha5IoXw63e8PYOOL0t1kEhRThuVpxAQbBguWf/oOniCOFn/6EXzfTCXNEtjk7 n10Ox6w4yxmpCg0N0wm3lEUeqvHKBJaE8YJmtKHr+2/WCN44YaSKXRvQzEaLuMSpeXjP6N Vl29L4wvA2QAJiouVnyv0zl3kPG8g4j0FVjXJgX1NMQ7Cq7xV9/OgMOLW5nC/A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646052743; a=rsa-sha256; cv=none; b=wTGFF8UwsjXCeExTitY2asj8qU+VpHIM24bTp4AQgB8tnomiDxzIwtexV56RigqcQMrqPD IbYSxJHKvn4RhC/v02b9z6Z1v2Vw/Mvd19aOxgj3InZGroOZYWa56SKRtuqNkW68Vcu+I6 iKRkL5+mbsqf7q3mri+/RcWwTB7NCcNc/8OQ1hayiK+olfN/s7lRmqGk53V7QRAmiVC85s vVYtFcRj6WgxYuYJPzmSCp+GggOkWTm1xWcmPa+DU5UdwiWxsceJ3MvuQ7l0G/ZC/kEEBl G7/F7mGbyOJV3hAm7RhSWiZTAoBG+7y6Uxfkki+Jn4w+rg1ni+2rqMomfI2hyg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=443113925cf469e9d86ee56374d8badb8d7d8754 commit 443113925cf469e9d86ee56374d8badb8d7d8754 Author: Po-Chuan Hsieh AuthorDate: 2022-02-28 09:35:47 +0000 Commit: Po-Chuan Hsieh CommitDate: 2022-02-28 12:46:21 +0000 math/py-pygsl: Update to 2.3.2 - Update WWW Changes: https://github.com/pygsl/pygsl/releases --- math/py-pygsl/Makefile | 6 +-- math/py-pygsl/distinfo | 6 +-- math/py-pygsl/files/patch-setup.py | 50 +++++++++++++++++++++++ math/py-pygsl/files/patch-src_init_initmodule.c | 19 --------- math/py-pygsl/files/patch-src_transform_wavelet.c | 34 --------------- math/py-pygsl/pkg-descr | 2 +- 6 files changed, 55 insertions(+), 62 deletions(-) diff --git a/math/py-pygsl/Makefile b/math/py-pygsl/Makefile index b7c7763c62d5..7ccb5f88f978 100644 --- a/math/py-pygsl/Makefile +++ b/math/py-pygsl/Makefile @@ -1,9 +1,7 @@ # Created by: Hye-Shik Chang PORTNAME= pygsl -PORTVERSION= 2.3.0 -DISTVERSIONSUFFIX= .1 -PORTREVISION= 8 +PORTVERSION= 2.3.2 CATEGORIES= math python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -21,8 +19,6 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=0,1:math/py-numpy@${PY_FLAVOR} USES= python:3.7+ USE_PYTHON= autoplist concurrent distutils -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} - post-install: ${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -name '*.so' -exec ${STRIP_CMD} {} + diff --git a/math/py-pygsl/distinfo b/math/py-pygsl/distinfo index c0222d49d4d2..622e5ac95539 100644 --- a/math/py-pygsl/distinfo +++ b/math/py-pygsl/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1613738787 -SHA256 (pygsl-2.3.0.1.tar.gz) = b248a899a9df0b94996fd5fe070f8ecbd3d42ca07486a829dedcdfdd70a3337d -SIZE (pygsl-2.3.0.1.tar.gz) = 1106326 +TIMESTAMP = 1643971114 +SHA256 (pygsl-2.3.2.tar.gz) = fa5d018d4421373f5390ac199bc5d484ef317d8358505b35a795bb89f96c8a9c +SIZE (pygsl-2.3.2.tar.gz) = 1093630 diff --git a/math/py-pygsl/files/patch-setup.py b/math/py-pygsl/files/patch-setup.py new file mode 100644 index 000000000000..3b3b1f1e273b --- /dev/null +++ b/math/py-pygsl/files/patch-setup.py @@ -0,0 +1,50 @@ +--- setup.py.orig 2021-12-07 16:05:38 UTC ++++ setup.py +@@ -89,8 +89,6 @@ del versiontext + gsldist_path = os.path.join(pygsldir, "gsl_dist") + sys.path.insert(0, gsldist_path) + +-from wheel.bdist_wheel import bdist_wheel as _bdist_wheel +- + import setuptools + import setuptools.command + import setuptools.command.install +@@ -173,26 +171,6 @@ else: + del t_file + + +-class CustomInstallCommand(setuptools.command.install.install): +- def run(self): +- # first re-generate GSL wrappers using SWIG +- self.run_command('gsl_wrappers') +- # then configure +- self.run_command('config') +- # then install +- setuptools.command.install.install.run(self) +- #super().run() +- +-class CustomBdistWheelCommand(_bdist_wheel): +- def run(self): +- # first re-generate GSL wrappers using SWIG +- self.run_command('gsl_wrappers') +- # then configure +- self.run_command('config') +- # then install +- _bdist_wheel.run(self) +- #super().run() +- + py_module_names = ['errors', + 'statistics.__init__', + '_numobj', +@@ -270,10 +248,9 @@ setup (name = proj_name, + ext_package = 'pygsl', + ext_modules = exts, + headers = headers, +- cmdclass = {'bdist_wheel': CustomBdistWheelCommand, ++ cmdclass = { + 'config' : gsl_Config_Path, + 'gsl_wrappers': gsl_CodeGenerator.gsl_CodeGenerator, +- 'install': CustomInstallCommand, + #'build_sphinx': BuildDoc + }, + install_requires = ['numpy'], diff --git a/math/py-pygsl/files/patch-src_init_initmodule.c b/math/py-pygsl/files/patch-src_init_initmodule.c deleted file mode 100644 index 771ed15d3e3c..000000000000 --- a/math/py-pygsl/files/patch-src_init_initmodule.c +++ /dev/null @@ -1,19 +0,0 @@ ---- src/init/initmodule.c.orig 2015-09-27 12:30:47 UTC -+++ src/init/initmodule.c -@@ -111,7 +111,7 @@ PyGSL_set_debug_level(PyObject *self, Py - - FUNC_MESS_BEGIN(); - #if DEBUG == 1 -- PyObject *o; -+ { PyObject *o; - int tmp, i, max, *ptr; - if(!PyArg_ParseTuple(args, "i", &tmp)) - return NULL; -@@ -136,6 +136,7 @@ PyGSL_set_debug_level(PyObject *self, Py - Py_INCREF(Py_None); - FUNC_MESS_END(); - return Py_None; -+ } - #else - PyGSL_ERROR_NULL("PyGSL was not compiled with DEBUG = 1; Can not set DEBUG level!", GSL_EUNIMPL); - #endif diff --git a/math/py-pygsl/files/patch-src_transform_wavelet.c b/math/py-pygsl/files/patch-src_transform_wavelet.c deleted file mode 100644 index 72373da79a50..000000000000 --- a/math/py-pygsl/files/patch-src_transform_wavelet.c +++ /dev/null @@ -1,34 +0,0 @@ ---- src/transform/wavelet.c.orig 2015-09-13 16:16:51 UTC -+++ src/transform/wavelet.c -@@ -147,6 +147,7 @@ PyGSL_wavelet_ ## direction(PyGSL_wavele - { \ - PyObject *tmp; \ - FUNC_MESS_BEGIN(); \ -+ { \ - pygsl_transform_help_s helps;\ - struct _pygsl_transform_help_rf_s s; \ - helps.info = &wavelet_info; \ -@@ -156,6 +157,7 @@ PyGSL_wavelet_ ## direction(PyGSL_wavele - tmp = PyGSL_transform_((PyObject *) self, args, &helps); \ - FUNC_MESS_END(); \ - return tmp; \ -+ } \ - } - PYGSL_WAVLET(forward) - PYGSL_WAVLET(inverse) -@@ -166,6 +168,7 @@ PyGSL_wavelet2d_ ## type ## direction(Py - { \ - PyObject *tmp; \ - FUNC_MESS_BEGIN(); \ -+ { \ - pygsl_transform_help_s helps;\ - struct _pygsl_transform_help_rf_s s; \ - helps.info = &wavelet_info; \ -@@ -175,6 +178,7 @@ PyGSL_wavelet2d_ ## type ## direction(Py - tmp = PyGSL_transform_2d_((PyObject *) self, args, &helps); \ - FUNC_MESS_END(); \ - return tmp; \ -+ } \ - } - PYGSL_WAVLET2D(,forward) - PYGSL_WAVLET2D(,inverse) diff --git a/math/py-pygsl/pkg-descr b/math/py-pygsl/pkg-descr index 0738290a362c..220eebf36c7c 100644 --- a/math/py-pygsl/pkg-descr +++ b/math/py-pygsl/pkg-descr @@ -1,3 +1,3 @@ Python interface to GNU Scientific Library -WWW: https://sourceforge.net/projects/pygsl/ +WWW: https://github.com/pygsl/pygsl