<pre style='margin:0'>
Andrey Stromnov (stromnov) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/848742a77e005f96c6f498edea45d23ea0266b6b">https://github.com/macports/macports-ports/commit/848742a77e005f96c6f498edea45d23ea0266b6b</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 848742a77e005f96c6f498edea45d23ea0266b6b
</span>Author: Andrey Stromnov <stromnov@macports.org>
AuthorDate: Tue Jan 31 10:06:40 2023 +0300
<span style='display:block; white-space:pre;color:#404040;'> py-pywavelets: use pep517, fix livecheck
</span>---
python/py-pywavelets/Portfile | 13 +++---
.../py-pywavelets/files/patch-pyproject.toml.diff | 52 ++++++++++++++++------
2 files changed, 47 insertions(+), 18 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-pywavelets/Portfile b/python/py-pywavelets/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 2eceab480ac..8bed18dbfaf 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-pywavelets/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-pywavelets/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,11 +6,12 @@ PortGroup python 1.0
</span> name py-pywavelets
python.rootname PyWavelets
version 1.4.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories-append science math
license MIT
python.versions 37 38 39 310 311
<span style='display:block; white-space:pre;background:#e0ffe0;'>+python.pep517 yes
</span>
maintainers {stromnov @stromnov} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,15 +32,17 @@ if {${name} ne ${subport}} {
</span> checksums rmd160 27ea9a65abba7cfb7c5a705c0e985bf82da813cf \
sha256 cbaa9d62052d9daf8da765fc8e7c30c38ea2b8e9e1c18841913dfb4aec671ee5 \
size 4585209
<span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${python.version} eq 311} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ python.pep517 no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-setuptools
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span> patchfiles patch-pyproject.toml.diff
}
depends_build-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-setuptools \
</span> port:py${python.version}-cython
depends_lib-append port:py${python.version}-numpy
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ livecheck.type none
</span> }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-pywavelets/files/patch-pyproject.toml.diff b/python/py-pywavelets/files/patch-pyproject.toml.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 72742adbea4..e21e0a32672 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-pywavelets/files/patch-pyproject.toml.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-pywavelets/files/patch-pyproject.toml.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,20 +1,46 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- pyproject.toml.orig 2022-09-16 09:25:42.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ pyproject.toml 2023-01-28 18:47:48.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -7,7 +7,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- pyproject.toml.orig 2023-01-31 09:47:22.000000000 +0300
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ pyproject.toml 2023-01-31 09:57:10.000000000 +0300
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7,41 +7,7 @@
</span> [build-system]
requires = [
"wheel",
- "setuptools<65",
+ "setuptools",
"Cython>=0.29.24,<3.0",
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # NumPy dependencies - to update these, sync from
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -36,7 +36,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # however macOS was broken and it's safe C API/ABI-wise to build against 1.21.6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # (see oldest-supported-numpy issues gh-28 and gh-45)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "numpy==1.21.6; python_version=='3.10' and (platform_system!='Windows' and platform_machine!='loongarch64') and platform_python_implementation != 'PyPy'",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # NumPy dependencies - to update these, sync from
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # https://github.com/scipy/oldest-supported-numpy/, and then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # update minimum version to match our install_requires min version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # ----------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # numpy 1.19 was the first minor release to provide aarch64 wheels, but
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # wheels require fixes contained in numpy 1.19.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "numpy==1.19.2; python_version=='3.8' and platform_machine=='aarch64'",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # aarch64 for py39 is covered by default requirement below
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # arm64 on Darwin supports Python 3.8 and above requires numpy>=1.20.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "numpy==1.20.0; python_version=='3.8' and platform_machine=='arm64' and platform_system=='Darwin'",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "numpy==1.20.0; python_version=='3.9' and platform_machine=='arm64' and platform_system=='Darwin'",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # On Windows we need to avoid 1.21.6, 1.22.0 and 1.22.1 because they were
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # built with vc142. 1.22.3 is the first version that has 32-bit Windows
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # wheels *and* was built with vc141. So use that:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "numpy==1.22.3; python_version=='3.10' and platform_system=='Windows' and platform_python_implementation != 'PyPy'",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # default numpy requirements
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "numpy==1.17.3; python_version=='3.8' and (platform_machine!='arm64' or platform_system!='Darwin') and platform_machine!='aarch64' and platform_python_implementation != 'PyPy'",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "numpy==1.19.3; python_version=='3.9' and (platform_machine!='arm64' or platform_system!='Darwin') and platform_python_implementation != 'PyPy'",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # Note that 1.21.3 was the first version with a complete set of 3.10 wheels,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # however macOS was broken and it's safe C API/ABI-wise to build against 1.21.6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # (see oldest-supported-numpy issues gh-28 and gh-45)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "numpy==1.21.6; python_version=='3.10' and (platform_system!='Windows' and platform_machine!='loongarch64') and platform_python_implementation != 'PyPy'",
</span> - "numpy==1.23.3; python_version=='3.11' and platform_python_implementation != 'PyPy'",
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "numpy; python_version=='3.11' and platform_python_implementation != 'PyPy'",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # For Python versions which aren't yet officially supported,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # we specify an unpinned NumPy which allows source distributions
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # For Python versions which aren't yet officially supported,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # we specify an unpinned NumPy which allows source distributions
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # to be used and allows wheels to be used as soon as they
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # become available.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "numpy; python_version>='3.12'",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "numpy; python_version>='3.8' and platform_python_implementation=='PyPy'",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "numpy",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ]
</span></pre><pre style='margin:0'>
</pre>