Date: Mon, 21 Aug 2023 17:15:00 GMT From: Po-Chuan Hsieh <sunpoet@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: b6cf9c19675b - main - math/py-pyreadr: Update to 0.4.9 Message-ID: <202308211715.37LHF0UN002029@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=b6cf9c19675b389d4a5b2c1fed1d11598280c1c8 commit b6cf9c19675b389d4a5b2c1fed1d11598280c1c8 Author: Po-Chuan Hsieh <sunpoet@FreeBSD.org> AuthorDate: 2023-08-21 17:04:40 +0000 Commit: Po-Chuan Hsieh <sunpoet@FreeBSD.org> CommitDate: 2023-08-21 17:04:40 +0000 math/py-pyreadr: Update to 0.4.9 - Convert to USE_PYTHON=pep517 Changes: https://github.com/ofajardo/pyreadr/releases https://github.com/ofajardo/pyreadr/blob/master/change_log.md --- math/py-pyreadr/Makefile | 7 ++++--- math/py-pyreadr/distinfo | 6 +++--- math/py-pyreadr/files/patch-pyreadr-librdata.c | 24 ++++++++++++------------ math/py-pyreadr/files/patch-setup.py | 17 +++++++++-------- 4 files changed, 28 insertions(+), 26 deletions(-) diff --git a/math/py-pyreadr/Makefile b/math/py-pyreadr/Makefile index 5bcf10ffd3d2..0bf53ebfa4c7 100644 --- a/math/py-pyreadr/Makefile +++ b/math/py-pyreadr/Makefile @@ -1,6 +1,5 @@ PORTNAME= pyreadr -PORTVERSION= 0.4.7 -PORTREVISION= 1 +PORTVERSION= 0.4.9 CATEGORIES= math python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -11,11 +10,13 @@ WWW= https://github.com/ofajardo/pyreadr LICENSE= AGPLv3+ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} LIB_DEPENDS= librdata.so:math/librdata RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pandas>=1.2.0,1:math/py-pandas@${PY_FLAVOR} USES= localbase python -USE_PYTHON= autoplist concurrent cython distutils +USE_PYTHON= autoplist concurrent cython pep517 post-patch: # Clean up bundled libraries diff --git a/math/py-pyreadr/distinfo b/math/py-pyreadr/distinfo index bede5b09b5f1..c38a3f00b3a2 100644 --- a/math/py-pyreadr/distinfo +++ b/math/py-pyreadr/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1664767968 -SHA256 (pyreadr-0.4.7.tar.gz) = 901110d62b4bedaef288f4db81425fb696edc721fe2c34c1083f5fb11050a73c -SIZE (pyreadr-0.4.7.tar.gz) = 1183279 +TIMESTAMP = 1692211801 +SHA256 (pyreadr-0.4.9.tar.gz) = 448440079ee5be06bc03192f691314c55c9f94bc4e06c44da166a7baa56c2602 +SIZE (pyreadr-0.4.9.tar.gz) = 2275025 diff --git a/math/py-pyreadr/files/patch-pyreadr-librdata.c b/math/py-pyreadr/files/patch-pyreadr-librdata.c index a42f31378cf0..4f1e7dcff114 100644 --- a/math/py-pyreadr/files/patch-pyreadr-librdata.c +++ b/math/py-pyreadr/files/patch-pyreadr-librdata.c @@ -1,29 +1,29 @@ ---- pyreadr/librdata.c.orig 2022-09-24 13:35:34 UTC +--- pyreadr/librdata.c.orig 2023-08-09 09:41:49 UTC +++ pyreadr/librdata.c -@@ -4,8 +4,6 @@ - { +@@ -5,8 +5,6 @@ "distutils": { "depends": [ + "pyreadr/conditional_includes.h", - "pyreadr/libs/librdata/src/rdata.h", - "pyreadr/libs/librdata/src/rdata_io_unistd.h" ], "extra_compile_args": [ "-DHAVE_ZLIB", -@@ -23,13 +21,6 @@ +@@ -24,13 +22,6 @@ "name": "pyreadr.librdata", "sources": [ "pyreadr/librdata.pyx", +- "pyreadr/libs/librdata/src/rdata_write.c", - "pyreadr/libs/librdata/src/rdata_bits.c", -- "pyreadr/libs/librdata/src/rdata_io_unistd.c", +- "pyreadr/libs/librdata/src/rdata_read.c", +- "pyreadr/libs/librdata/src/rdata_parser.c", - "pyreadr/libs/librdata/src/CKHashTable.c", - "pyreadr/libs/librdata/src/rdata_error.c", -- "pyreadr/libs/librdata/src/rdata_read.c", -- "pyreadr/libs/librdata/src/rdata_write.c", -- "pyreadr/libs/librdata/src/rdata_parser.c" +- "pyreadr/libs/librdata/src/rdata_io_unistd.c" ] }, "module_name": "pyreadr.librdata" -@@ -645,8 +636,8 @@ static CYTHON_INLINE float __PYX_NAN() { +@@ -1117,8 +1108,8 @@ static CYTHON_INLINE float __PYX_NAN() { #include <time.h> #include <stdint.h> #include <sys/types.h> @@ -31,6 +31,6 @@ -#include "libs/librdata/src/rdata_io_unistd.h" +#include <rdata.h> +#include <rdata_io_unistd.h> - #include <sys/stat.h> - #include <unistd.h> - #include <fcntl.h> + #include "conditional_includes.h" + #include <string.h> + #ifdef _OPENMP diff --git a/math/py-pyreadr/files/patch-setup.py b/math/py-pyreadr/files/patch-setup.py index 546a07909986..9d4d9a7b11c6 100644 --- a/math/py-pyreadr/files/patch-setup.py +++ b/math/py-pyreadr/files/patch-setup.py @@ -1,23 +1,24 @@ ---- setup.py.orig 2021-06-07 06:47:51 UTC +--- setup.py.orig 2023-08-09 07:13:10 UTC +++ setup.py -@@ -13,7 +13,6 @@ from setuptools import setup, Extension +@@ -13,12 +13,7 @@ from setuptools import setup, Extension from Cython.Build import cythonize + import Cython +-cyver = int(Cython.__version__.split(".")[0]) +-if cyver < 3: +- raise Exception("cython 3.0.0 or newer is required") +- librdata_source_files = [] -librdata_source_files += glob.glob('pyreadr/libs/librdata/src/*.c') librdata_source_files += ['pyreadr/librdata.pyx'] library_dirs = [] -@@ -52,10 +51,11 @@ elif platform.system() == 'Windows': +@@ -54,7 +49,7 @@ elif platform.system() == 'Windows': libraries.append('bz2') libraries.append('lzma') -elif platform.system() == 'Linux': -+elif platform.system() == 'FreeBSD' or platform.system() == 'Linux': ++elif platform.system() == 'FreeBSD': libraries.append('z') libraries.append('bz2') libraries.append('lzma') -+ libraries.append('rdata') - #extra_compile_args.append("--std=gnu99") - else: - raise RuntimeError('Unsupported OS')
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202308211715.37LHF0UN002029>