<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/4442421cd477a6d717691d89b4e357029c7a7d36">https://github.com/macports/macports-ports/commit/4442421cd477a6d717691d89b4e357029c7a7d36</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'>     new 4442421cd47 py-scikit-image: update to 0.25.0, add py313 subport
</span>4442421cd47 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 4442421cd477a6d717691d89b4e357029c7a7d36
</span>Author: Erik Bråthen Solem <erikbsolem@hotmail.com>
AuthorDate: Sat Jan 4 03:08:09 2025 +0100

<span style='display:block; white-space:pre;color:#404040;'>    py-scikit-image: update to 0.25.0, add py313 subport
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    * Update to 0.25.0 for Python >= 3.10
</span><span style='display:block; white-space:pre;color:#404040;'>    * Pin to 0.24.0 for Python 3.9
</span><span style='display:block; white-space:pre;color:#404040;'>    * Add py313 subport
</span>---
 python/py-scikit-image/Portfile                    | 29 +++++++++++++++-------
 .../files/patch-pyproject.toml-0.24.0.diff         | 16 ++++++++++++
 .../files/patch-pyproject.toml.diff                | 28 ++++++++-------------
 3 files changed, 46 insertions(+), 27 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-scikit-image/Portfile b/python/py-scikit-image/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1f5b8482a19..1c0cd1bfb64 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-scikit-image/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-scikit-image/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,12 +5,12 @@ PortGroup           python 1.0
</span> 
 name                py-scikit-image
 python.rootname     scikit_image
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version             0.22.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version             0.25.0
</span> revision            0
 categories-append   science
 license             BSD
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-python.versions     39 310 311 312
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+python.versions     39 310 311 312 313
</span> python.pep517_backend   meson
 
 maintainers         {stromnov @stromnov} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,14 +23,27 @@ long_description    Image processing algorithms for SciPy, including IO, \
</span> 
 homepage            https://scikit-image.org/
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums           md5 91dbff8962b4231ca0a9666f43c0d71f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    rmd160 fb8347226da3f17fd149414ce0aeaf93d43993e9 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sha256 018d734df1d2da2719087d15f679d19285fce97cd37695103deadfaef2873236 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    size   22685018
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums           md5 bdddc9565fd64fb6ac6984a5a31f51b8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    rmd160 df0ea1ddf1dee7fe8bc79b00ccf5003686d26267 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256 58d94fea11b6b3306b3770417dc1cbca7fa9bcbd6a13945d7910399c88c2018c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    size   22696477
</span> 
 if {${name} ne ${subport}} {
     compiler.openmp_version 2.5
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    if {${python.version} == 39} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        version             0.24.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        revision            0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        checksums           md5 c91af89808e4aa0d485f62072c81670a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            rmd160 b02c21901ca7ad16a8c5504375120608e71a6868 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            sha256 5d16efe95da8edbeb363e0c4157b99becbd650a60b77f6e3af5768b66cf007ab \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            size   22693928
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        patchfiles-append   patch-pyproject.toml-0.24.0.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        patchfiles-append   patch-pyproject.toml.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>     depends_build-append \
                         path:bin/cython-${python.branch}:py${python.version}-cython \
                         port:py${python.version}-pythran
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,10 +60,8 @@ if {${name} ne ${subport}} {
</span>                         port:py${python.version}-pywavelets \
                         port:py${python.version}-tifffile
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    patchfiles-append   patch-pyproject.toml.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span>     post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        reinplace "s|#!/usr/bin/env python|#!/usr/bin/env python3|" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        reinplace "s|#!/usr/bin/env python.*|#!${python.bin}|" \
</span>             {*}[glob -directory ${worksrcpath}/skimage/_build_utils {[a-z]*.py}]
     }
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-scikit-image/files/patch-pyproject.toml-0.24.0.diff b/python/py-scikit-image/files/patch-pyproject.toml-0.24.0.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..e0cd5bac246
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-scikit-image/files/patch-pyproject.toml-0.24.0.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- pyproject.toml
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ pyproject.toml
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -120,13 +120,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build-backend = 'mesonpy'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ requires = [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     'meson-python>=0.15',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    'wheel',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    'setuptools>=67',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     'packaging>=21',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     'Cython>=3.0.4',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     'pythran',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     'lazy_loader>=0.3',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    'numpy>=2.0.0rc1',
</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;'>+ [tool.spin]
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-scikit-image/files/patch-pyproject.toml.diff b/python/py-scikit-image/files/patch-pyproject.toml.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 6b71ea773c5..ad04cc12994 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-scikit-image/files/patch-pyproject.toml.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-scikit-image/files/patch-pyproject.toml.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,22 +1,14 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- pyproject.toml.orig    2023-10-04 07:14:28
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ pyproject.toml 2023-12-27 14:16:12
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -118,18 +118,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- pyproject.toml
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ pyproject.toml
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -118,11 +118,9 @@
</span>  build-backend = 'mesonpy'
  requires = [
<span style='display:block; white-space:pre;background:#ffe0e0;'>-     'meson-python>=0.14',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--    'wheel',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--    'setuptools>=67',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     'packaging>=21',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     'Cython>=0.29.32',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     'pythran',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     'lazy_loader>=0.3',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--    "numpy==1.22.4; python_version=='3.9' and platform_python_implementation != 'PyPy'",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--    "numpy==1.22.4; python_version=='3.10' and platform_system=='Windows' and platform_python_implementation != 'PyPy'",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--    "numpy==1.22.4; python_version=='3.10' and platform_system != 'Windows' and platform_python_implementation != 'PyPy'",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--    "numpy==1.23.3; python_version=='3.11' and platform_python_implementation != 'PyPy'",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--    "numpy; python_version>='3.12'",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--    "numpy; python_version>='3.9' and platform_python_implementation=='PyPy'",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+    "numpy",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     'meson-python>=0.16',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    'setuptools>=68',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     'Cython>=3.0.8',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     'pythran>=0.16',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     'lazy_loader>=0.4',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    'numpy>=2.0',
</span>  ]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>  [tool.spin]
</pre><pre style='margin:0'>

</pre>