git: 443113925cf4 - main - math/py-pygsl: Update to 2.3.2
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 28 Feb 2022 12:52:23 UTC
The branch main has been updated by sunpoet:
URL: https://cgit.FreeBSD.org/ports/commit/?id=443113925cf469e9d86ee56374d8badb8d7d8754
commit 443113925cf469e9d86ee56374d8badb8d7d8754
Author: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2022-02-28 09:35:47 +0000
Commit: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
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 <perky@fallin.lv>
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