<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/985835238a8dc20c15c8a37b11b7ca1c9b985039">https://github.com/macports/macports-ports/commit/985835238a8dc20c15c8a37b11b7ca1c9b985039</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 985835238a8dc20c15c8a37b11b7ca1c9b985039
</span>Author: Andrey Stromnov <stromnov@macports.org>
AuthorDate: Mon Jan 22 17:29:08 2024 +0300

<span style='display:block; white-space:pre;color:#404040;'>    py-pandas: update to 2.2.0
</span>---
 python/py-pandas/Portfile                        | 76 ++++++++++--------------
 python/py-pandas/files/patch-a3c158dad2.diff     | 30 ----------
 python/py-pandas/files/patch-pyproject.toml.diff | 34 +++++++++++
 3 files changed, 66 insertions(+), 74 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-pandas/Portfile b/python/py-pandas/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index bba53511f85..3ed8dd679f8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-pandas/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-pandas/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,13 +5,13 @@ PortGroup           python 1.0
</span> PortGroup           compiler_blacklist_versions 1.0
 
 name                py-pandas
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version             1.5.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version             2.2.0
</span> revision            0
 categories-append   science
 license             BSD
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-python.versions     27 37 38 39 310 311 312
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-python.pep517       yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+python.versions     38 39 310 311 312
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+python.pep517_backend   meson
</span> 
 maintainers         {stromnov @stromnov} openmaintainer
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,62 +21,50 @@ long_description    {*}${description}
</span> 
 homepage            https://pandas.pydata.org
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums           rmd160  7119e0a0bb95117c9323840bdcf77ad56371cb04 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sha256  74a3fd7e5a7ec052f183273dc7b0acd3a863edf7520f5d3a1765c04ffdb3b0b1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    size    5203060
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums           rmd160  c803d9d4543d188d2c63976118e447e2a3c2609e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256  30b83f7c3eb217fb4d1b494a57a2fda5444f17834f5df2de6b2ffff68dc3c8e2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    size    4390211
</span> 
 # error: use of undeclared identifier 'signbit'; did you mean 'std::signbit'?
 compiler.blacklist-append \
                     {clang < 600}
 
 if {${name} ne ${subport}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    if {${python.version} eq 27} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        version             0.24.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        revision            1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        distname            ${python.rootname}-${version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        checksums           rmd160  a4b18e58b6be7bf13893dbccaf73542918dda1c8 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            sha256  4f919f409c433577a501e023943e582c57355d50a724c589e78bc1d551a535a2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            size    11837693
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        python.pep517       no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        # fix implicit declaration of tolower_ascii()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        patchfiles-append   patch-a3c158dad2.diff
</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}-cython \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        port:py${python.version}-versioneer \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        port:py${python.version}-wheel
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        depends_build-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        port:py${python.version}-setuptools
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    depends_lib-append  port:py${python.version}-numpy \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        port:py${python.version}-dateutil \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        port:py${python.version}-tz \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        port:py${python.version}-pytzdata
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        depends_lib-append  port:py${python.version}-scipy \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            port:py${python.version}-tables \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            port:py${python.version}-matplotlib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            port:py${python.version}-bottleneck \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            port:py${python.version}-numexpr
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    } elseif {${python.version} eq 37} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        version             1.3.5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    if {${python.version} eq 38} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        version             1.5.3
</span>         revision            0
         distname            ${python.rootname}-${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        checksums           rmd160  b8bba96dcc34dcea8a7b5a27a1a00fdd5ce925c5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            sha256  1e4285f5de1012de20ca46b188ccf33521bff61ba5c5ebd78b4fb28e5416a9f1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            size    4736591
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        python.pep517       no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        depends_build-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        port:py${python.version}-setuptools
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        checksums           rmd160  7119e0a0bb95117c9323840bdcf77ad56371cb04 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            sha256  74a3fd7e5a7ec052f183273dc7b0acd3a863edf7520f5d3a1765c04ffdb3b0b1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            size    5203060
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        python.pep517_backend   setuptools
</span>         post-patch {
             reinplace {s|oldest-supported-numpy>=2022\.8\.16|numpy|g} ${worksrcpath}/pyproject.toml
         }
<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;'>-    # Not yet compatible with Cython 3.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    set compat_path [string replace ${python.pkgd} 0 [string length ${python.prefix}]-1 ${prefix}/lib/py${python.version}-cython-compat]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    build.env-append    PYTHONPATH=${compat_path}
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    depends_build-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        port:py${python.version}-cython-compat
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        set compat_path [string replace ${python.pkgd} 0 [string length ${python.prefix}]-1 ${prefix}/lib/py${python.version}-cython-compat]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        build.env-append    PYTHONPATH=${compat_path}
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    depends_lib-append  port:py${python.version}-dateutil \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        port:py${python.version}-tz \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        port:py${python.version}-numpy
</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}-cython-compat
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        depends_build-delete \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            port:py${python.version}-versioneer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        depends_lib-delete  port:py${python.version}-pytzdata
</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;'>+        build.env-append    CYTHON=${prefix}/bin/cython-${python.branch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        build.env-append    PATH=${python.prefix}/bin:$::env(PATH)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    }
</span> 
     livecheck.type      none
 }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-pandas/files/patch-a3c158dad2.diff b/python/py-pandas/files/patch-a3c158dad2.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 61974f9c7e2..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-pandas/files/patch-a3c158dad2.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,30 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From a3c158dad214a60726cf1332021b083802ac59f9 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Vasily Litvinov <45396231+vnlitvin@users.noreply.github.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Fri, 22 Mar 2019 19:18:37 +0300
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] Safe version of ascii macros, add missing tolower_ascii
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (#25836)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-* Safer version of ascii macros in portable.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-* Add missing tolower_ascii macro needed by lowercase() in parse_helper.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pandas/_libs/src/headers/portable.h | 7 ++++---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 4 insertions(+), 3 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/pandas/_libs/src/headers/portable.h b/pandas/_libs/src/headers/portable.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 9ac4ebc306ba..1976addace3f 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- pandas/_libs/src/headers/portable.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ pandas/_libs/src/headers/portable.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -7,8 +7,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // GH-23516 - works around locale perf issues
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // from MUSL libc, MIT Licensed - see LICENSES
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define isdigit_ascii(c) ((unsigned)c - '0' < 10)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define isspace_ascii(c) (c == ' ' || (unsigned)c-'\t' < 5)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define toupper_ascii(c) (((unsigned)c-'a' < 26) ? (c & 0x5f) : c)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define isdigit_ascii(c) (((unsigned)(c) - '0') < 10u)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define isspace_ascii(c) (((c) == ' ') || (((unsigned)(c) - '\t') < 5))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define toupper_ascii(c) ((((unsigned)(c) - 'a') < 26) ? ((c) & 0x5f) : (c))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define tolower_ascii(c) ((((unsigned)(c) - 'A') < 26) ? ((c) | 0x20) : (c))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-pandas/files/patch-pyproject.toml.diff b/python/py-pandas/files/patch-pyproject.toml.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..f373979df55
</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-pandas/files/patch-pyproject.toml.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,34 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- pyproject.toml.orig    2024-01-22 10:38:02.000000000 +0300
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ pyproject.toml 2024-01-22 10:39:40.000000000 +0300
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2,16 +2,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Minimum requirements for the build system to execute.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # See https://github.com/scipy/scipy/pull/12940 for the AIX issue.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ requires = [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    "meson-python==0.13.1",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    "meson==1.2.1",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    "meson-python",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    "meson",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     "wheel",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    "Cython==3.0.5",  # Note: sync with setup.py, environment.yml and asv.conf.json
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    "Cython",  # Note: sync with setup.py, environment.yml and asv.conf.json
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     # Any NumPy version should be fine for compiling.  Users are unlikely
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     # to get a NumPy<1.25 so the result will be compatible with all relevant
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     # NumPy versions (if not it is presumably compatible with their version).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     # Pin <2.0 for releases until tested against an RC.  But explicitly allow
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     # testing the `.dev0` nightlies (which require the extra index).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    "numpy>1.22.4,<=2.0.0.dev0",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    "numpy",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     "versioneer[toml]"
</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;'>+@@ -30,9 +30,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ license = {file = 'LICENSE'}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ requires-python = '>=3.9'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dependencies = [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  "numpy>=1.22.4,<2; python_version<'3.11'",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  "numpy>=1.23.2,<2; python_version=='3.11'",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  "numpy>=1.26.0,<2; python_version>='3.12'",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  "numpy",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   "python-dateutil>=2.8.2",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   "pytz>=2020.1",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   "tzdata>=2022.7"
</span></pre><pre style='margin:0'>

</pre>