Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] python3-pandas: update to 2.2.2.
@ 2024-07-01 10:19 Vinfall
  2024-07-01 10:31 ` Vinfall
                   ` (8 more replies)
  0 siblings, 9 replies; 10+ messages in thread
From: Vinfall @ 2024-07-01 10:19 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1701 bytes --]

There is a new pull request by Vinfall against master on the void-packages repository

https://github.com/Vinfall/void-packages python3-pandas-update
https://github.com/void-linux/void-packages/pull/51060

python3-pandas: update to 2.2.2.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->

#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc

#### Information regarding numpy

numpy is also updated as latest pandas (2.2.2) requires numpy>=2.0.0rc1.
(I can raise a separate PR for numpy if you prefer that.)

Dropped old patches after checking v2.0.0 [pyproject.toml](https://github.com/numpy/numpy/blob/v2.0.0/pyproject.toml) and [pytest.ini](https://github.com/numpy/numpy/blob/v2.0.0/pytest.ini).

`xbps-query -X python3-numpy`:
- python3-imageio (no update, rebuild for python3-numpy)
- python3-matplotlib (rebuild)
- python3-pandas

I'm not sure if python3-numpy-stl is related since it's not a reverse dep.

A patch file from https://github.com/void-linux/void-packages/pull/51060.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-python3-pandas-update-51060.patch --]
[-- Type: text/x-diff, Size: 9743 bytes --]

From fe368521550732c22cedac7a49d7f8dac31eb09b Mon Sep 17 00:00:00 2001
From: Vinfall <neptuniahuai0tc@riseup.net>
Date: Mon, 1 Jul 2024 18:00:20 +0800
Subject: [PATCH 1/4] python3-numpy: update to 2.0.0.

---
 .../python3-numpy/patches/fix-pytest-warning.patch |  8 --------
 .../python3-numpy/patches/version-relaxation.patch | 14 --------------
 srcpkgs/python3-numpy/template                     |  4 ++--
 3 files changed, 2 insertions(+), 24 deletions(-)
 delete mode 100644 srcpkgs/python3-numpy/patches/fix-pytest-warning.patch
 delete mode 100644 srcpkgs/python3-numpy/patches/version-relaxation.patch

diff --git a/srcpkgs/python3-numpy/patches/fix-pytest-warning.patch b/srcpkgs/python3-numpy/patches/fix-pytest-warning.patch
deleted file mode 100644
index 990ab80197542c..00000000000000
--- a/srcpkgs/python3-numpy/patches/fix-pytest-warning.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- a/pytest.ini	2023-06-16 22:48:37.211072200 -0300
-+++ b/pytest.ini	2023-06-19 22:52:00.230063231 -0300
-@@ -27,3 +27,5 @@
-     ignore:\n\n  `numpy.distutils`:DeprecationWarning
- # Ignore mypy >= 0.971 DeprecationWarnings
-     ignore:path is deprecated\. Use files\(\) instead:DeprecationWarning:mypy
-+# Ignore warning raised when importing setuptools.command.
-+    ignore:pkg_resources is deprecated as an API:DeprecationWarning
diff --git a/srcpkgs/python3-numpy/patches/version-relaxation.patch b/srcpkgs/python3-numpy/patches/version-relaxation.patch
deleted file mode 100644
index f36972e5cc96a7..00000000000000
--- a/srcpkgs/python3-numpy/patches/version-relaxation.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-As with SciPy, NumPy abuses specifications of *build requirements* as a means
-to control the environment under which wheels are built for distribution.
-
---- a/pyproject.toml
-+++ b/pyproject.toml
-@@ -2,7 +2,7 @@
- build-backend = "mesonpy"
- requires = [
-     "Cython>=0.29.34,<3.1",
--    "meson-python>=0.15.0,<0.16.0",
-+    "meson-python>=0.15.0",
- ]
- 
- [project]
diff --git a/srcpkgs/python3-numpy/template b/srcpkgs/python3-numpy/template
index e6b6accb42ab4a..885fd26c9a4814 100644
--- a/srcpkgs/python3-numpy/template
+++ b/srcpkgs/python3-numpy/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-numpy'
 pkgname=python3-numpy
-version=1.26.4
+version=2.0.0
 revision=1
 build_style=python3-pep517
 build_helper="meson qemu"
@@ -19,7 +19,7 @@ license="BSD-3-Clause"
 homepage="https://www.numpy.org/"
 changelog="https://github.com/numpy/numpy/releases"
 distfiles="${PYPI_SITE}/n/numpy/numpy-${version}.tar.gz"
-checksum=2a02aba9ed12e4ac4eb3ea9421c420301a0c6460d9830d74a9df87efa4912010
+checksum=cf5d1c9e6837f8af9f92b6bd3e86d513cdc11f60fd62185cc49ec7d1aba34864
 alternatives="numpy:f2py:/usr/bin/f2py3"
 
 build_options="openblas"

From b25af09c0900231ec752b1f3b2faec9666eeed10 Mon Sep 17 00:00:00 2001
From: Vinfall <neptuniahuai0tc@riseup.net>
Date: Mon, 1 Jul 2024 18:08:10 +0800
Subject: [PATCH 2/4] python3-imageio: rebuild for python3-numpy.

---
 srcpkgs/python3-imageio/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-imageio/template b/srcpkgs/python3-imageio/template
index f9b28c4030d10b..50cbb756d55fdc 100644
--- a/srcpkgs/python3-imageio/template
+++ b/srcpkgs/python3-imageio/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-imageio'
 pkgname=python3-imageio
 version=2.34.2
-revision=1
+revision=2
 build_style=python3-module
 # tests have unpackaged dependencies, require network or missing data files
 make_check_args="--ignore=tests/test_pillow.py --ignore=tests/test_ffmpeg.py

From 63a60eae532a7afa482e69562864664182aa3e55 Mon Sep 17 00:00:00 2001
From: Vinfall <neptuniahuai0tc@riseup.net>
Date: Mon, 1 Jul 2024 18:08:19 +0800
Subject: [PATCH 3/4] python3-matplotlib: rebuild for python3-numpy.

---
 srcpkgs/python3-matplotlib/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-matplotlib/template b/srcpkgs/python3-matplotlib/template
index 13f9b255ad16ad..3bc99f9f4de763 100644
--- a/srcpkgs/python3-matplotlib/template
+++ b/srcpkgs/python3-matplotlib/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-matplotlib'
 pkgname=python3-matplotlib
 version=3.9.0
-revision=1
+revision=2
 build_style=python3-pep517
 build_helper="meson numpy"
 make_build_args="-Csetup-args=-Dsystem-freetype=true

From 416c19f1524e9de4211f85b6b3b23207f286817c Mon Sep 17 00:00:00 2001
From: Vinfall <neptuniahuai0tc@riseup.net>
Date: Mon, 1 Jul 2024 18:08:50 +0800
Subject: [PATCH 4/4] python3-pandas: update to 2.2.2.

---
 .../python3-pandas/patches/meson-numpy.patch  | 48 -------------------
 .../patches/version-relaxation.patch          | 24 ++++------
 srcpkgs/python3-pandas/template               |  6 +--
 3 files changed, 11 insertions(+), 67 deletions(-)
 delete mode 100644 srcpkgs/python3-pandas/patches/meson-numpy.patch

diff --git a/srcpkgs/python3-pandas/patches/meson-numpy.patch b/srcpkgs/python3-pandas/patches/meson-numpy.patch
deleted file mode 100644
index aadaf5f7873b13..00000000000000
--- a/srcpkgs/python3-pandas/patches/meson-numpy.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- ./pandas/meson.build.orig	2023-10-02 14:27:27.031989290 -0400
-+++ ./pandas/meson.build	2023-10-02 14:30:18.017083106 -0400
-@@ -1,7 +1,25 @@
--incdir_numpy = run_command(py,
--  [
--    '-c',
--    '''
-+# NumPy include directory - needed in all submodules
-+# The chdir is needed because within numpy there's an `import signal`
-+# statement, and we don't want that to pick up scipy's signal module rather
-+# than the stdlib module. The try-except is needed because when things are
-+# split across drives on Windows, there is no relative path and an exception
-+# gets raised. There may be other such cases, so add a catch-all and switch to
-+# an absolute path. Relative paths are needed when for example a virtualenv is
-+# placed inside the source tree; Meson rejects absolute paths to places inside
-+# the source tree.
-+# For cross-compilation it is often not possible to run the Python interpreter
-+# in order to retrieve numpy's include directory. It can be specified in the
-+# cross file instead:
-+#   [properties]
-+#   numpy-include-dir = /abspath/to/host-pythons/site-packages/numpy/core/include
-+#
-+# This uses the path as is, and avoids running the interpreter.
-+incdir_numpy = meson.get_external_property('numpy-include-dir', 'not-given')
-+if incdir_numpy == 'not-given'
-+  incdir_numpy = run_command(py,
-+    [
-+      '-c',
-+      '''
- import os
- import numpy as np
- try:
-@@ -12,10 +30,11 @@
- except Exception:
-     incdir = np.get_include()
- print(incdir)
--     '''
--  ],
--  check: true
--).stdout().strip()
-+      '''
-+    ],
-+    check: true
-+  ).stdout().strip()
-+endif
- 
- inc_np = include_directories(incdir_numpy)
- inc_pd = include_directories('_libs/include')
diff --git a/srcpkgs/python3-pandas/patches/version-relaxation.patch b/srcpkgs/python3-pandas/patches/version-relaxation.patch
index c94e5fa170eebe..15c5a3d4040062 100644
--- a/srcpkgs/python3-pandas/patches/version-relaxation.patch
+++ b/srcpkgs/python3-pandas/patches/version-relaxation.patch
@@ -1,6 +1,6 @@
---- ./pyproject.toml.orig	2023-10-02 14:33:56.359267774 -0400
-+++ ./pyproject.toml	2023-10-02 14:35:29.662565059 -0400
-@@ -2,8 +2,8 @@
+--- ./pyproject.toml	2024-04-09 22:14:00.000000000 +0000
++++ ./pyproject.toml	2024-07-01 09:43:00.000000000 +0000
+@@ -2,10 +2,10 @@
  # Minimum requirements for the build system to execute.
  # See https://github.com/scipy/scipy/pull/12940 for the AIX issue.
  requires = [
@@ -9,16 +9,8 @@
 +    "meson-python",
 +    "meson",
      "wheel",
-     "Cython>=0.29.33,<3",  # Note: sync with setup.py, environment.yml and asv.conf.json
-     # Note: numpy 1.25 has a backwards compatible C API by default
---- ./meson.build.orig	2023-10-02 14:42:02.161816469 -0400
-+++ ./meson.build	2023-09-20 15:24:13.000000000 -0400
-@@ -4,7 +4,7 @@
-     'c', 'cpp', 'cython',
-     version: run_command(['generate_version.py', '--print'], check: true).stdout().strip(),
-     license: 'BSD-3',
--    meson_version: '>=1.2.1',
-+    meson_version: '>=1.2.0',
-     default_options: [
-         'buildtype=release',
-         'c_std=c99'
+-    "Cython==3.0.5",  # Note: sync with setup.py, environment.yml and asv.conf.json
++    "Cython",  # Note: sync with setup.py, environment.yml and asv.conf.json
+     # Force numpy higher than 2.0rc1, so that built wheels are compatible
+     # with both numpy 1 and 2
+     "numpy>=2.0.0rc1",
diff --git a/srcpkgs/python3-pandas/template b/srcpkgs/python3-pandas/template
index c8e610dee33729..8068bfe232475d 100644
--- a/srcpkgs/python3-pandas/template
+++ b/srcpkgs/python3-pandas/template
@@ -1,10 +1,10 @@
 # Template file for 'python3-pandas'
 pkgname=python3-pandas
-version=2.1.4
+version=2.2.2
 revision=1
 build_style=python3-pep517
 build_helper="meson numpy"
-hostmakedepends="python3-meson-python python3-wheel python3-Cython0.29
+hostmakedepends="python3-meson-python python3-wheel python3-Cython
  python3-numpy python3-versioneer pkg-config"
 makedepends="python3-devel python3-numpy python3-dateutil python3-pytz"
 depends="python3-numpy python3-dateutil python3-pytz"
@@ -14,7 +14,7 @@ license="BSD-3-Clause"
 homepage="https://pandas.pydata.org/"
 changelog="https://pandas.pydata.org/pandas-docs/stable/whatsnew/index.html"
 distfiles="https://github.com/pandas-dev/pandas/archive/v${version}.tar.gz"
-checksum=00e0b049bac3d60c5701cae1f2fe57314f6ab8ae302b28953d4f9337817f6fc1
+checksum=79bc6fb5505afd27875c93fec27cece74318470c4e274ec7ef48b16f046dc006
 # Builds seem to sometimes have missing symbol problems;
 # the intermittent nature suggests this might be a race
 disable_parallel_build=yes

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: python3-pandas: update to 2.2.2.
  2024-07-01 10:19 [PR PATCH] python3-pandas: update to 2.2.2 Vinfall
@ 2024-07-01 10:31 ` Vinfall
  2024-07-01 10:31 ` Vinfall
                   ` (7 subsequent siblings)
  8 siblings, 0 replies; 10+ messages in thread
From: Vinfall @ 2024-07-01 10:31 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 329 bytes --]

New comment by Vinfall on void-packages repository

https://github.com/void-linux/void-packages/pull/51060#issuecomment-2199792513

Comment:
CI is failing to build numpy 2.0.0 while building it locally runs perfectly fine. I'm not sure what's the cause, do I need to raise a PR for numpy, wait for its merge, then update pandas?

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: python3-pandas: update to 2.2.2.
  2024-07-01 10:19 [PR PATCH] python3-pandas: update to 2.2.2 Vinfall
  2024-07-01 10:31 ` Vinfall
@ 2024-07-01 10:31 ` Vinfall
  2024-07-01 12:07 ` classabbyamp
                   ` (6 subsequent siblings)
  8 siblings, 0 replies; 10+ messages in thread
From: Vinfall @ 2024-07-01 10:31 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 355 bytes --]

New comment by Vinfall on void-packages repository

https://github.com/void-linux/void-packages/pull/51060#issuecomment-2199792513

Comment:
CI is failing to build numpy 2.0.0 while building it locally runs perfectly fine. I'm not sure what's the cause, maybe the order is wrong. Do I need to raise a PR for numpy, wait for its merge, then update pandas?

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: python3-pandas: update to 2.2.2.
  2024-07-01 10:19 [PR PATCH] python3-pandas: update to 2.2.2 Vinfall
  2024-07-01 10:31 ` Vinfall
  2024-07-01 10:31 ` Vinfall
@ 2024-07-01 12:07 ` classabbyamp
  2024-07-01 15:05 ` ahesford
                   ` (5 subsequent siblings)
  8 siblings, 0 replies; 10+ messages in thread
From: classabbyamp @ 2024-07-01 12:07 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 353 bytes --]

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/51060#issuecomment-2199974308

Comment:
```
=> python3-numpy-2.0.0_1: running do_check ...
python3: can't open file '/builddir/python3-numpy-2.0.0/runtests.py': [Errno 2] No such file or directory
```
you're probably not running check locally

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: python3-pandas: update to 2.2.2.
  2024-07-01 10:19 [PR PATCH] python3-pandas: update to 2.2.2 Vinfall
                   ` (2 preceding siblings ...)
  2024-07-01 12:07 ` classabbyamp
@ 2024-07-01 15:05 ` ahesford
  2024-07-01 15:06 ` ahesford
                   ` (4 subsequent siblings)
  8 siblings, 0 replies; 10+ messages in thread
From: ahesford @ 2024-07-01 15:05 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 275 bytes --]

New comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/51060#issuecomment-2200411155

Comment:
Please drop the numpy update from this PR; it is a major update and has a lot of dependants, so I'm going to take care of it myself.

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: python3-pandas: update to 2.2.2.
  2024-07-01 10:19 [PR PATCH] python3-pandas: update to 2.2.2 Vinfall
                   ` (3 preceding siblings ...)
  2024-07-01 15:05 ` ahesford
@ 2024-07-01 15:06 ` ahesford
  2024-07-02  1:46 ` Vinfall
                   ` (3 subsequent siblings)
  8 siblings, 0 replies; 10+ messages in thread
From: ahesford @ 2024-07-01 15:06 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 376 bytes --]

New comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/51060#issuecomment-2200411155

Comment:
Please drop the numpy update from this PR; it is a major update and has a lot of dependants, so I'm going to take care of it myself.

Edit: just saw that this is a hard requirement, so let's mark this draft until NumPy 2 is merged.

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: python3-pandas: update to 2.2.2.
  2024-07-01 10:19 [PR PATCH] python3-pandas: update to 2.2.2 Vinfall
                   ` (4 preceding siblings ...)
  2024-07-01 15:06 ` ahesford
@ 2024-07-02  1:46 ` Vinfall
  2024-07-02  1:46 ` [PR PATCH] [Updated] " Vinfall
                   ` (2 subsequent siblings)
  8 siblings, 0 replies; 10+ messages in thread
From: Vinfall @ 2024-07-02  1:46 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 485 bytes --]

New comment by Vinfall on void-packages repository

https://github.com/void-linux/void-packages/pull/51060#issuecomment-2201648743

Comment:
> you're probably not running check locally

Indeed, I always use `xbps-src pkg` and just discovered that it would not run checks :(

> Please drop the numpy update from this PR

Agreed, I'm gonna make this pandas only. NumPy 2.0 update seems to be much larger than I thought although most of my scripts run fine. I'll let you handle it.

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PR PATCH] [Updated] python3-pandas: update to 2.2.2.
  2024-07-01 10:19 [PR PATCH] python3-pandas: update to 2.2.2 Vinfall
                   ` (5 preceding siblings ...)
  2024-07-02  1:46 ` Vinfall
@ 2024-07-02  1:46 ` Vinfall
  2024-07-02 14:35 ` [PR PATCH] [Closed]: " ahesford
  2024-07-02 14:35 ` ahesford
  8 siblings, 0 replies; 10+ messages in thread
From: Vinfall @ 2024-07-02  1:46 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1706 bytes --]

There is an updated pull request by Vinfall against master on the void-packages repository

https://github.com/Vinfall/void-packages python3-pandas-update
https://github.com/void-linux/void-packages/pull/51060

python3-pandas: update to 2.2.2.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->

#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc

#### Information regarding numpy

numpy is also updated as latest pandas (2.2.2) requires numpy>=2.0.0rc1.
(I can raise a separate PR for numpy if you prefer that.)

Dropped old patches after checking v2.0.0 [pyproject.toml](https://github.com/numpy/numpy/blob/v2.0.0/pyproject.toml) and [pytest.ini](https://github.com/numpy/numpy/blob/v2.0.0/pytest.ini).

`xbps-query -X python3-numpy`:
- python3-imageio (no update, rebuild for python3-numpy)
- python3-matplotlib (rebuild)
- python3-pandas

I'm not sure if python3-numpy-stl is related since it's not a reverse dep.

A patch file from https://github.com/void-linux/void-packages/pull/51060.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-python3-pandas-update-51060.patch --]
[-- Type: text/x-diff, Size: 5394 bytes --]

From 64217881b5a0acbb610c4ab5816572a914e6618f Mon Sep 17 00:00:00 2001
From: Vinfall <neptuniahuai0tc@riseup.net>
Date: Mon, 1 Jul 2024 18:08:50 +0800
Subject: [PATCH] python3-pandas: update to 2.2.2.

---
 .../python3-pandas/patches/meson-numpy.patch  | 48 -------------------
 .../patches/version-relaxation.patch          | 24 ++++------
 srcpkgs/python3-pandas/template               |  6 +--
 3 files changed, 11 insertions(+), 67 deletions(-)
 delete mode 100644 srcpkgs/python3-pandas/patches/meson-numpy.patch

diff --git a/srcpkgs/python3-pandas/patches/meson-numpy.patch b/srcpkgs/python3-pandas/patches/meson-numpy.patch
deleted file mode 100644
index aadaf5f7873b13..00000000000000
--- a/srcpkgs/python3-pandas/patches/meson-numpy.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- ./pandas/meson.build.orig	2023-10-02 14:27:27.031989290 -0400
-+++ ./pandas/meson.build	2023-10-02 14:30:18.017083106 -0400
-@@ -1,7 +1,25 @@
--incdir_numpy = run_command(py,
--  [
--    '-c',
--    '''
-+# NumPy include directory - needed in all submodules
-+# The chdir is needed because within numpy there's an `import signal`
-+# statement, and we don't want that to pick up scipy's signal module rather
-+# than the stdlib module. The try-except is needed because when things are
-+# split across drives on Windows, there is no relative path and an exception
-+# gets raised. There may be other such cases, so add a catch-all and switch to
-+# an absolute path. Relative paths are needed when for example a virtualenv is
-+# placed inside the source tree; Meson rejects absolute paths to places inside
-+# the source tree.
-+# For cross-compilation it is often not possible to run the Python interpreter
-+# in order to retrieve numpy's include directory. It can be specified in the
-+# cross file instead:
-+#   [properties]
-+#   numpy-include-dir = /abspath/to/host-pythons/site-packages/numpy/core/include
-+#
-+# This uses the path as is, and avoids running the interpreter.
-+incdir_numpy = meson.get_external_property('numpy-include-dir', 'not-given')
-+if incdir_numpy == 'not-given'
-+  incdir_numpy = run_command(py,
-+    [
-+      '-c',
-+      '''
- import os
- import numpy as np
- try:
-@@ -12,10 +30,11 @@
- except Exception:
-     incdir = np.get_include()
- print(incdir)
--     '''
--  ],
--  check: true
--).stdout().strip()
-+      '''
-+    ],
-+    check: true
-+  ).stdout().strip()
-+endif
- 
- inc_np = include_directories(incdir_numpy)
- inc_pd = include_directories('_libs/include')
diff --git a/srcpkgs/python3-pandas/patches/version-relaxation.patch b/srcpkgs/python3-pandas/patches/version-relaxation.patch
index c94e5fa170eebe..15c5a3d4040062 100644
--- a/srcpkgs/python3-pandas/patches/version-relaxation.patch
+++ b/srcpkgs/python3-pandas/patches/version-relaxation.patch
@@ -1,6 +1,6 @@
---- ./pyproject.toml.orig	2023-10-02 14:33:56.359267774 -0400
-+++ ./pyproject.toml	2023-10-02 14:35:29.662565059 -0400
-@@ -2,8 +2,8 @@
+--- ./pyproject.toml	2024-04-09 22:14:00.000000000 +0000
++++ ./pyproject.toml	2024-07-01 09:43:00.000000000 +0000
+@@ -2,10 +2,10 @@
  # Minimum requirements for the build system to execute.
  # See https://github.com/scipy/scipy/pull/12940 for the AIX issue.
  requires = [
@@ -9,16 +9,8 @@
 +    "meson-python",
 +    "meson",
      "wheel",
-     "Cython>=0.29.33,<3",  # Note: sync with setup.py, environment.yml and asv.conf.json
-     # Note: numpy 1.25 has a backwards compatible C API by default
---- ./meson.build.orig	2023-10-02 14:42:02.161816469 -0400
-+++ ./meson.build	2023-09-20 15:24:13.000000000 -0400
-@@ -4,7 +4,7 @@
-     'c', 'cpp', 'cython',
-     version: run_command(['generate_version.py', '--print'], check: true).stdout().strip(),
-     license: 'BSD-3',
--    meson_version: '>=1.2.1',
-+    meson_version: '>=1.2.0',
-     default_options: [
-         'buildtype=release',
-         'c_std=c99'
+-    "Cython==3.0.5",  # Note: sync with setup.py, environment.yml and asv.conf.json
++    "Cython",  # Note: sync with setup.py, environment.yml and asv.conf.json
+     # Force numpy higher than 2.0rc1, so that built wheels are compatible
+     # with both numpy 1 and 2
+     "numpy>=2.0.0rc1",
diff --git a/srcpkgs/python3-pandas/template b/srcpkgs/python3-pandas/template
index c8e610dee33729..8068bfe232475d 100644
--- a/srcpkgs/python3-pandas/template
+++ b/srcpkgs/python3-pandas/template
@@ -1,10 +1,10 @@
 # Template file for 'python3-pandas'
 pkgname=python3-pandas
-version=2.1.4
+version=2.2.2
 revision=1
 build_style=python3-pep517
 build_helper="meson numpy"
-hostmakedepends="python3-meson-python python3-wheel python3-Cython0.29
+hostmakedepends="python3-meson-python python3-wheel python3-Cython
  python3-numpy python3-versioneer pkg-config"
 makedepends="python3-devel python3-numpy python3-dateutil python3-pytz"
 depends="python3-numpy python3-dateutil python3-pytz"
@@ -14,7 +14,7 @@ license="BSD-3-Clause"
 homepage="https://pandas.pydata.org/"
 changelog="https://pandas.pydata.org/pandas-docs/stable/whatsnew/index.html"
 distfiles="https://github.com/pandas-dev/pandas/archive/v${version}.tar.gz"
-checksum=00e0b049bac3d60c5701cae1f2fe57314f6ab8ae302b28953d4f9337817f6fc1
+checksum=79bc6fb5505afd27875c93fec27cece74318470c4e274ec7ef48b16f046dc006
 # Builds seem to sometimes have missing symbol problems;
 # the intermittent nature suggests this might be a race
 disable_parallel_build=yes

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PR PATCH] [Closed]: python3-pandas: update to 2.2.2.
  2024-07-01 10:19 [PR PATCH] python3-pandas: update to 2.2.2 Vinfall
                   ` (6 preceding siblings ...)
  2024-07-02  1:46 ` [PR PATCH] [Updated] " Vinfall
@ 2024-07-02 14:35 ` ahesford
  2024-07-02 14:35 ` ahesford
  8 siblings, 0 replies; 10+ messages in thread
From: ahesford @ 2024-07-02 14:35 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1536 bytes --]

There's a closed pull request on the void-packages repository

python3-pandas: update to 2.2.2.
https://github.com/void-linux/void-packages/pull/51060

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->

#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc

#### Information regarding numpy

numpy is also updated as latest pandas (2.2.2) requires numpy>=2.0.0rc1.
(I can raise a separate PR for numpy if you prefer that.)

Dropped old patches after checking v2.0.0 [pyproject.toml](https://github.com/numpy/numpy/blob/v2.0.0/pyproject.toml) and [pytest.ini](https://github.com/numpy/numpy/blob/v2.0.0/pytest.ini).

`xbps-query -X python3-numpy`:
- python3-imageio (no update, rebuild for python3-numpy)
- python3-matplotlib (rebuild)
- python3-pandas

I'm not sure if python3-numpy-stl is related since it's not a reverse dep.

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: python3-pandas: update to 2.2.2.
  2024-07-01 10:19 [PR PATCH] python3-pandas: update to 2.2.2 Vinfall
                   ` (7 preceding siblings ...)
  2024-07-02 14:35 ` [PR PATCH] [Closed]: " ahesford
@ 2024-07-02 14:35 ` ahesford
  8 siblings, 0 replies; 10+ messages in thread
From: ahesford @ 2024-07-02 14:35 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 262 bytes --]

New comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/51060#issuecomment-2203389132

Comment:
Because the current version of Pandas requires NumPy < 2, I'm going to include an update in the larger NumPy PR #51077.

^ permalink raw reply	[flat|nested] 10+ messages in thread

end of thread, other threads:[~2024-07-02 14:35 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-07-01 10:19 [PR PATCH] python3-pandas: update to 2.2.2 Vinfall
2024-07-01 10:31 ` Vinfall
2024-07-01 10:31 ` Vinfall
2024-07-01 12:07 ` classabbyamp
2024-07-01 15:05 ` ahesford
2024-07-01 15:06 ` ahesford
2024-07-02  1:46 ` Vinfall
2024-07-02  1:46 ` [PR PATCH] [Updated] " Vinfall
2024-07-02 14:35 ` [PR PATCH] [Closed]: " ahesford
2024-07-02 14:35 ` ahesford

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).