From fe368521550732c22cedac7a49d7f8dac31eb09b Mon Sep 17 00:00:00 2001 From: Vinfall 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 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 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 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