From nobody Mon Aug 21 17:15:00 2023 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 4RTzcj0zfvz4r3TQ; Mon, 21 Aug 2023 17:15:01 +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 4RTzcj021Xz4dp5; Mon, 21 Aug 2023 17:15:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692638101; 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=ajrDLgJnqgmPOCKwoPqVBu0dwZUvHL4P0L51yAc72zc=; b=KycE5Y8/7bE7xIrF/EXvqqO3kN/KofV+DeeYLKl66QQRF8uq7GNYRXbsCOejSAKG67YybM 4+urU+EiUxXa1Ied8D34CsvAN15aT4Xu5Hl4Pa7zqI+TYFisLQTxEDH1Jl+kCa3eXZdIdM Y2Z/M6b75t4pbD1XXqBjL0kojSuufM72+rxb1n9PYJ+I9yo4YVNientA5YOntYsp4wO3ma LJliQM9oLQNCxv/0O9BW8EjXeUpo6Xdwo5Zqs9do0J8SNDzobob1anQ+nnWF7zM6YTkEER YgNwEy/roWyCm/2OorpgaIc1ixDD7VYpJd2vgQg2ew27FK3Wyw9Zvhc+jt0xqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692638101; 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=ajrDLgJnqgmPOCKwoPqVBu0dwZUvHL4P0L51yAc72zc=; b=RXE5vywDtGI87es8Acxeb/bW699d1XCuboDo/UbbCY/hfp4MgXFTi2rsvgP7XNc0mTyoqM pExlUcG+SjNrRsLsuasvwOVVe7FBlUWqhhy64rG47twRvvp1FX724jCYVXAFjD/LV9A2+I CJaxpq4F0qhq+n4+fgFRZE5YNNxaWyNDTk3FJjg2bL7JQG04LkipujUn4TPFoiSpUD8qYQ aLXsDgUnYeGuWdBeKtDR5lIOu5PfCWrB4hhFpueIVEzWltXNXdDcLcuI+piV4IPMcm4lW4 ZdddsGWVgEfn+KDzQ3jy5IU1xHEyNLVpuUpBLdOLSmzLi6kKfT8NoPyFQiiOcw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692638101; a=rsa-sha256; cv=none; b=BzFal+M+1ZpvzQI2zALzAO5MDrjwY5amHOnMg/0xoTwTC/if49yx6vNrmpghNh5zfbmIre 1HSovqDs+4mZBTnlBDjYzOBww7an2xGHpYu8r6ViQfNvHQuxHIImi3bGTfRg6fCCJSgug0 3/JXI+n9O8wxAD7BOJuZrwCjycvdPkKh62OrGQscbGSWwbNPm8aZK0KQd6blbE1L8F/FfA x7GbXYWA+GwyA9F0jO/NKj6GYwANvBbhzp3/Ljyhz9sp2xj9GNW3uJ2U/OdHasJ3Y7Rxe9 S25503K0Zh9xINH8IrtmsBKwp+OLFUZIQ72UIaffI80E9CE97K7zu+ZAtK380w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RTzch68fHzTv7; Mon, 21 Aug 2023 17:15:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37LHF0tH002032; Mon, 21 Aug 2023 17:15:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37LHF0UN002029; Mon, 21 Aug 2023 17:15:00 GMT (envelope-from git) Date: Mon, 21 Aug 2023 17:15:00 GMT Message-Id: <202308211715.37LHF0UN002029@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: b6cf9c19675b - main - math/py-pyreadr: Update to 0.4.9 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: b6cf9c19675b389d4a5b2c1fed1d11598280c1c8 Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=b6cf9c19675b389d4a5b2c1fed1d11598280c1c8 commit b6cf9c19675b389d4a5b2c1fed1d11598280c1c8 Author: Po-Chuan Hsieh AuthorDate: 2023-08-21 17:04:40 +0000 Commit: Po-Chuan Hsieh 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 #include #include @@ -31,6 +31,6 @@ -#include "libs/librdata/src/rdata_io_unistd.h" +#include +#include - #include - #include - #include + #include "conditional_includes.h" + #include + #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')