From 1b520369f80a8f63d02cabbf0bcff74424e35483 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Mon, 1 Jul 2024 12:07:16 -0400 Subject: [PATCH 01/24] python3-numpy: update to 2.0.0. --- .../python3-numpy/files/fenv-constants.patch | 10 ++++----- .../patches/fix-pytest-warning.patch | 8 ------- .../patches/version-relaxation.patch | 14 ------------ srcpkgs/python3-numpy/template | 22 +++++++++++-------- 4 files changed, 18 insertions(+), 36 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/files/fenv-constants.patch b/srcpkgs/python3-numpy/files/fenv-constants.patch index 987ad4e346ffa5..075cac8a0820c6 100644 --- a/srcpkgs/python3-numpy/files/fenv-constants.patch +++ b/srcpkgs/python3-numpy/files/fenv-constants.patch @@ -1,11 +1,11 @@ ---- numpy/core/src/npymath/ieee754.c.src 2020-09-20 14:53:51.998825328 +1000 -+++ numpy/core/src/npymath/ieee754.c.src 2020-09-20 14:54:03.611889518 +1000 +--- numpy/_core/src/npymath/ieee754.c.src.orig 2024-07-02 11:50:48.519261116 -0400 ++++ numpy/_core/src/npymath/ieee754.c.src 2024-07-02 11:51:06.336360850 -0400 @@ -8,6 +8,8 @@ #include "npy_math_private.h" #include "numpy/utils.h" +#include "fenv-constants.h" + - #ifndef HAVE_COPYSIGN - double npy_copysign(double x, double y) - { + /* + The below code is provided for compilers which do not yet provide C11 compatibility (gcc 4.5 and older) + */ 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..2adde47160b768 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" @@ -42,14 +42,10 @@ fi post_patch() { case "${XBPS_TARGET_MACHINE}" in armv5tel-musl) - cp "${FILESDIR}/fenv-constants.h" numpy/core/src/npymath/ + cp "${FILESDIR}/fenv-constants.h" numpy/_core/src/npymath/ patch -Np0 -i "${FILESDIR}/fenv-constants.patch" ;; esac - - if [ "$XBPS_TARGET_LIBC" = musl ] ; then - vsed -i 's|"backtrace",||' numpy/core/setup_common.py - fi } do_check() { @@ -77,9 +73,17 @@ do_check() { local testdir="${wrksrc}/.xbps-testdir/$(date +%s)" python3 -m installer --destdir "${testdir}" dist/numpy*.whl + cd "${testdir}" PATH="${testdir}/usr/bin:${PATH}" PYTHONPATH="${testdir}/${py3_sitelib}" \ - python3 runtests.py --no-build -- \ - -n "${XBPS_MAKEJOBS}" ${_skip+-k "not(${_skip#or})"} + python3 <<-EOF + import numpy + numpy.test( + extra_argv=[ + '-n', '${XBPS_MAKEJOBS}', + ${_skip+'-k', 'not(${_skip#or})'} + ], + ) + EOF } post_install() { From b22234fa3c25d083017f8c3f746fa7c69b7dc12a Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Mon, 1 Jul 2024 15:09:53 -0400 Subject: [PATCH 02/24] common/build-helper/numpy.sh: update paths for python3-numpy-2.0.0 --- common/build-helper/numpy.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/common/build-helper/numpy.sh b/common/build-helper/numpy.sh index e0856dbca7cf3c..0adce85e151fde 100644 --- a/common/build-helper/numpy.sh +++ b/common/build-helper/numpy.sh @@ -19,8 +19,8 @@ fi # python3-setuptools finds numpy libs and headers on the host first; # adding search paths up front allows the target to take priority -CFLAGS+=" -I${XBPS_CROSS_BASE}/${py3_sitelib}/numpy/core/include" -LDFLAGS+=" -L${XBPS_CROSS_BASE}/${py3_sitelib}/numpy/core/lib" +CFLAGS+=" -I${XBPS_CROSS_BASE}/${py3_sitelib}/numpy/_core/include" +LDFLAGS+=" -L${XBPS_CROSS_BASE}/${py3_sitelib}/numpy/_core/lib" LDFLAGS+=" -L${XBPS_CROSS_BASE}/${py3_sitelib}/numpy/random/lib" # distutils from python3-numpy looks to environment variables F77 and @@ -45,7 +45,7 @@ if [[ "${build_helper}" = *meson* ]]; then mkdir -p "${XBPS_WRAPPERDIR}/meson" cat > "${_npy_meson_cross}" <<-EOF [properties] - numpy-include-dir = '${_cross_py_site}/numpy/core/include' + numpy-include-dir = '${_cross_py_site}/numpy/_core/include' pythran-include-dir = '${_cross_py_site}/pythran' EOF fi From da6cf5d116214f1344da79854a766637fc4907b0 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Mon, 1 Jul 2024 14:18:04 -0400 Subject: [PATCH 03/24] gnuradio: rebuild against python3-numpy-2.0.0 --- srcpkgs/gnuradio/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gnuradio/template b/srcpkgs/gnuradio/template index 58127cedd3ddc6..f512f953f07137 100644 --- a/srcpkgs/gnuradio/template +++ b/srcpkgs/gnuradio/template @@ -1,8 +1,9 @@ # Template file for 'gnuradio' pkgname=gnuradio version=3.10.8.0 -revision=1 +revision=2 build_style=cmake +build_helper="python3" conf_files="/etc/gnuradio/conf.d/*" configure_args="-DMATHJAX2_USE_ROOT=/usr/share/mathjax -DZEROMQ_INCLUDE_DIRS=${XBPS_CROSS_BASE}/usr/include @@ -27,7 +28,7 @@ python_version=3 if [ "$CROSS_BUILD" ]; then # CMake fails when cross-compiling. - configure_args+=" -DENABLE_TESTING=OFF" + configure_args+=" -DENABLE_TESTING=OFF -DPYBIND11_USE_CROSSCOMPILING=ON" fi if [ "${XBPS_TARGET_MACHINE%-musl}" = "i686" ]; then From 02ecb5f7945be18534d672a57ad23b019d5912e4 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Mon, 1 Jul 2024 14:13:46 -0400 Subject: [PATCH 04/24] mypaint: rebuild against python3-numpy-2.0.0 --- srcpkgs/mypaint/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/mypaint/template b/srcpkgs/mypaint/template index 1a1d995bd7e7cd..d5fdb8d67cf5ca 100644 --- a/srcpkgs/mypaint/template +++ b/srcpkgs/mypaint/template @@ -1,7 +1,7 @@ # Template file for 'mypaint' pkgname=mypaint version=2.0.1 -revision=5 +revision=6 build_style=python3-module pycompile_dirs="/usr/share/mypaint" hostmakedepends="swig pkg-config gettext python3-setuptools python3-numpy python3" From a54d6ab7a0badce9bd2af360c90242cf687ef7ea Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Mon, 1 Jul 2024 14:12:42 -0400 Subject: [PATCH 05/24] opencv: rebuild against python3-numpy-2.0.0 --- srcpkgs/opencv/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/opencv/template b/srcpkgs/opencv/template index aea4bfc3a265cf..0022fd863cc192 100644 --- a/srcpkgs/opencv/template +++ b/srcpkgs/opencv/template @@ -1,7 +1,7 @@ # Template file for 'opencv' pkgname=opencv version=4.6.0 -revision=6 +revision=7 create_wrksrc=yes build_wrksrc=${pkgname}-${version} build_style=cmake @@ -33,7 +33,7 @@ make_check=no if [ "$CROSS_BUILD" ]; then # Tell opencv where to find python and numpy configure_args+=" -DPYTHON3_INCLUDE_PATH=${XBPS_CROSS_BASE}/${py3_inc} - -DPYTHON3_NUMPY_INCLUDE_DIRS=${XBPS_CROSS_BASE}/${py3_sitelib}/numpy/core/include" + -DPYTHON3_NUMPY_INCLUDE_DIRS=${XBPS_CROSS_BASE}/${py3_sitelib}/numpy/_core/include" fi case "$XBPS_TARGET_MACHINE" in From 36365981f7fbba88418b36f8829e484b085ad342 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Mon, 1 Jul 2024 14:12:42 -0400 Subject: [PATCH 06/24] plplot: rebuild against python3-numpy-2.0.0 --- srcpkgs/plplot/template | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/srcpkgs/plplot/template b/srcpkgs/plplot/template index a80e12310e9338..b17eee96f21240 100644 --- a/srcpkgs/plplot/template +++ b/srcpkgs/plplot/template @@ -1,11 +1,14 @@ # Template file for 'plplot' pkgname=plplot version=5.15.0 -revision=5 +revision=6 build_style=cmake -build_helper="qemu" -configure_args="-DPL_FREETYPE_FONT_PATH=/usr/share/fonts/TTF - -DCMAKE_NATIVE_BINARY_DIR=/usr -DPREBUILT_DOC=ON -DLUA_DIR=/usr/lib/lua/5.3" +build_helper="qemu numpy" +configure_args=" + -DPL_FREETYPE_FONT_PATH=/usr/share/fonts/TTF + -DCMAKE_NATIVE_BINARY_DIR=/usr -DPREBUILT_DOC=ON -DLUA_DIR=/usr/lib/lua/5.3 + -DCMAKE_C_FLAGS=-I${XBPS_CROSS_BASE}/${py3_sitelib}/numpy/_core/include +" hostmakedepends="pkg-config gcc-fortran swig freefont-ttf lua53 python3-numpy python3-setuptools plplot-devel" makedepends="pango-devel cairo-devel freetype-devel libqhull-devel From 3fb224ff2cc1fdcb77166b5ead03d231dab666b5 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Mon, 1 Jul 2024 14:07:21 -0400 Subject: [PATCH 07/24] python3-Bottleneck: update to 1.4.0. --- srcpkgs/python3-Bottleneck/template | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/srcpkgs/python3-Bottleneck/template b/srcpkgs/python3-Bottleneck/template index afafcd572ddb58..1c9400da55a2ec 100644 --- a/srcpkgs/python3-Bottleneck/template +++ b/srcpkgs/python3-Bottleneck/template @@ -1,9 +1,10 @@ # Template file for 'python3-Bottleneck' pkgname=python3-Bottleneck -version=1.3.7 +version=1.4.0 revision=1 -build_style=python3-module -hostmakedepends="python3-setuptools python3-numpy" +build_style=python3-pep517 +make_check_target=".xbps-testdir/*/${py3_sitelib}/bottleneck/tests" +hostmakedepends="python3-setuptools python3-versioneer python3-wheel python3-numpy" makedepends="python3-devel" depends="python3-numpy" checkdepends="python3-pytest-xdist $depends" @@ -11,8 +12,8 @@ short_desc="Fast NumPy array functions written in C (Python3)" maintainer="Orphaned " license="BSD-2-Clause" homepage="https://github.com/kwgoodman/bottleneck" -distfiles="${PYPI_SITE}/B/Bottleneck/Bottleneck-${version}.tar.gz" -checksum=e1467e373ad469da340ed0ff283214d6531cc08bfdca2083361a3aa6470681f8 +distfiles="${PYPI_SITE}/b/bottleneck/bottleneck-${version}.tar.gz" +checksum=beb36df519b8709e7d357c0c9639b03b885ca6355bbf5e53752c685de51605b8 post_install() { rm -f ${DESTDIR}/usr/lib/python*/site-packages/bottleneck/LICENSE From 1586dc9d235dae96877ff762361b952ce997b14f Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Mon, 1 Jul 2024 14:06:53 -0400 Subject: [PATCH 08/24] python3-PyOpenGL-accelerate: rebuild without python3-numpy --- srcpkgs/python3-PyOpenGL-accelerate/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/python3-PyOpenGL-accelerate/template b/srcpkgs/python3-PyOpenGL-accelerate/template index cec8b8c0bc6f4d..2161cd9b433d47 100644 --- a/srcpkgs/python3-PyOpenGL-accelerate/template +++ b/srcpkgs/python3-PyOpenGL-accelerate/template @@ -1,11 +1,11 @@ # Template file for 'python3-PyOpenGL-accelerate' pkgname=python3-PyOpenGL-accelerate version=3.1.7 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools python3-Cython" -makedepends="python3-devel python3-numpy" -depends="python3-numpy" +makedepends="python3-devel" +depends="python3" short_desc="Acceleration code for PyOpenGL (Python3)" maintainer="Alain Kalker " license="BSD-3-Clause" From a082b2b569a2c8ff8cc0c3b99ae8c3f2cc5f6f23 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Mon, 1 Jul 2024 13:33:54 -0400 Subject: [PATCH 09/24] python3-h5py: rebuild against python3-numpy-2.0.0 --- srcpkgs/python3-h5py/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/python3-h5py/template b/srcpkgs/python3-h5py/template index e71350fbf60ecb..c77df7c1123719 100644 --- a/srcpkgs/python3-h5py/template +++ b/srcpkgs/python3-h5py/template @@ -1,7 +1,7 @@ # Template file for 'python3-h5py' pkgname=python3-h5py version=3.11.0 -revision=1 +revision=2 build_style=python3-module build_helper="numpy" hostmakedepends="python3-setuptools python3-Cython0.29 python3-pkgconfig" From 12303bf20de7888932166707c6f36f8cda69cf6f Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Mon, 1 Jul 2024 12:56:19 -0400 Subject: [PATCH 10/24] python3-matplotlib: rebuild against python3-numpy-2.0.0 --- 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 f5109f48f8970d8f554bae0ca89fe25d7b9e986a Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Mon, 1 Jul 2024 13:58:03 -0400 Subject: [PATCH 11/24] python3-numexpr: update to 2.10.1. --- srcpkgs/python3-numexpr/template | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/srcpkgs/python3-numexpr/template b/srcpkgs/python3-numexpr/template index 4e4b9dc3177840..d148218d101708 100644 --- a/srcpkgs/python3-numexpr/template +++ b/srcpkgs/python3-numexpr/template @@ -1,19 +1,20 @@ # Template file for 'python3-numexpr' pkgname=python3-numexpr -version=2.8.3 -revision=3 -build_style=python3-module -build_helper=numpy -hostmakedepends="python3-wheel" +version=2.10.1 +revision=1 +build_style=python3-pep517 +build_helper="numpy" +make_check_args="-k not(test_max_threads_unset)" +hostmakedepends="python3-setuptools python3-wheel" makedepends="python3-devel python3-numpy" -depends="python3-numpy python3-packaging" -checkdepends="${depends} python3-pytest-xdist" +depends="python3-numpy" +checkdepends="${depends} python3-pytest" short_desc="Fast numerical expression evaluator for NumPy (Python3)" maintainer="Orphaned " license="MIT" homepage="https://github.com/pydata/numexpr" distfiles="https://github.com/pydata/numexpr/archive/v${version}.tar.gz" -checksum=389ceefca74eff30ec3fd03fc4c3b7ab3df8f22d1f235117a392ce702ed208c0 +checksum=e499bd19a7fd9803d5ec1b2cff2e0a11a2f01a109d5326e5a09eff590448c793 pre_check() { python3 setup.py build_ext --inplace From 933719a386fcf340363c6c76df3c4e6807b2a9ec Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Mon, 1 Jul 2024 13:58:03 -0400 Subject: [PATCH 12/24] python3-numpy-stl: rebuild against python3-numpy-2.0.0 --- srcpkgs/python3-numpy-stl/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/python3-numpy-stl/template b/srcpkgs/python3-numpy-stl/template index 9257dca68817b6..72a7448c990aad 100644 --- a/srcpkgs/python3-numpy-stl/template +++ b/srcpkgs/python3-numpy-stl/template @@ -1,7 +1,7 @@ # Template file for 'python3-numpy-stl' pkgname=python3-numpy-stl version=2.17.1 -revision=3 +revision=4 build_style=python3-module build_helper="numpy" # skip flake8 tests From 5096de7370d990a3ab00e9cb496440f17c3290e7 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Mon, 1 Jul 2024 13:58:02 -0400 Subject: [PATCH 13/24] python3-pandas: update to 2.2.2. --- .../patches/version-relaxation.patch | 24 ------------------- srcpkgs/python3-pandas/template | 10 ++++---- 2 files changed, 6 insertions(+), 28 deletions(-) delete mode 100644 srcpkgs/python3-pandas/patches/version-relaxation.patch diff --git a/srcpkgs/python3-pandas/patches/version-relaxation.patch b/srcpkgs/python3-pandas/patches/version-relaxation.patch deleted file mode 100644 index c94e5fa170eebe..00000000000000 --- a/srcpkgs/python3-pandas/patches/version-relaxation.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- ./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 @@ - # Minimum requirements for the build system to execute. - # See https://github.com/scipy/scipy/pull/12940 for the AIX issue. - requires = [ -- "meson-python==0.13.1", -- "meson==1.2.1", -+ "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' diff --git a/srcpkgs/python3-pandas/template b/srcpkgs/python3-pandas/template index c8e610dee33729..79e6f8462349cd 100644 --- a/srcpkgs/python3-pandas/template +++ b/srcpkgs/python3-pandas/template @@ -1,10 +1,12 @@ # Template file for 'python3-pandas' pkgname=python3-pandas -version=2.1.4 -revision=1 +version=2.2.2 +revision=2 build_style=python3-pep517 build_helper="meson numpy" -hostmakedepends="python3-meson-python python3-wheel python3-Cython0.29 +# Pandas imposes strict and unnecessary restrictions on build dependencies +make_build_args="--skip-dependency-check" +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 +16,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 From dd8879b7b5785b1efbe0c36eea709a2adcf69485 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Mon, 1 Jul 2024 13:15:55 -0400 Subject: [PATCH 14/24] python3-pyFFTW: rebuild against python3-numpy-2.0.0 --- srcpkgs/python3-pyFFTW/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/python3-pyFFTW/template b/srcpkgs/python3-pyFFTW/template index ba1f6fc9e158ab..414b77b639ada5 100644 --- a/srcpkgs/python3-pyFFTW/template +++ b/srcpkgs/python3-pyFFTW/template @@ -1,7 +1,7 @@ # Template file for 'python3-pyFFTW' pkgname=python3-pyFFTW version=0.13.1 -revision=2 +revision=3 build_style=python3-module hostmakedepends="python3-setuptools python3-Cython0.29 python3-numpy" makedepends="fftw-devel python3-devel" From 72377e59053bf2c8036a543e02eac7e9cd72a164 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Mon, 1 Jul 2024 13:10:18 -0400 Subject: [PATCH 15/24] python3-pyopencl: rebuild against python3-numpy-2.0.0 --- srcpkgs/python3-pyopencl/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/python3-pyopencl/template b/srcpkgs/python3-pyopencl/template index f57ba9421ed35a..09320616592f80 100644 --- a/srcpkgs/python3-pyopencl/template +++ b/srcpkgs/python3-pyopencl/template @@ -1,7 +1,7 @@ # Template file for 'python3-pyopencl' pkgname=python3-pyopencl version=2024.2.7 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-setuptools python3-wheel python3-numpy python3-scikit-build-core cmake ninja python3-nanobind" From 406d2d347f40f1a8d53e71f0571a6f26d0eaa9dd Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Mon, 1 Jul 2024 13:10:18 -0400 Subject: [PATCH 16/24] python3-pywt: rebuild against python3-numpy-2.0.0 --- srcpkgs/python3-pywt/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/python3-pywt/template b/srcpkgs/python3-pywt/template index b4890de4450b45..9930684cedcff0 100644 --- a/srcpkgs/python3-pywt/template +++ b/srcpkgs/python3-pywt/template @@ -1,7 +1,7 @@ # Template file for 'python3-pywt' pkgname=python3-pywt version=1.6.0 -revision=1 +revision=2 build_style=python3-pep517 build_helper="meson numpy" make_check_target=".xbps-testdir/*/${py3_sitelib}/pywt/tests" From 02b0a55ab5c8fbdf74a2a0495dd8d71f1095398a Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Mon, 1 Jul 2024 17:03:26 -0400 Subject: [PATCH 17/24] pythran: fix required gast version --- srcpkgs/pythran/patches/gast-0.6.patch | 76 ++++++++++++++++++++++++++ srcpkgs/pythran/template | 2 +- 2 files changed, 77 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/pythran/patches/gast-0.6.patch diff --git a/srcpkgs/pythran/patches/gast-0.6.patch b/srcpkgs/pythran/patches/gast-0.6.patch new file mode 100644 index 00000000000000..87dfcdcf450bce --- /dev/null +++ b/srcpkgs/pythran/patches/gast-0.6.patch @@ -0,0 +1,76 @@ +From 840a0e706ec39963aec6bcd1f118bf33177c20b4 Mon Sep 17 00:00:00 2001 +From: serge-sans-paille +Date: Sat, 29 Jun 2024 19:13:02 +0200 +Subject: [PATCH] Bump gast requirement to 0.6.0 + +This mostly helps for harmonious behavior wrt. gast.dump +--- + docs/TUTORIAL.rst | 8 ++++---- + pythran/utils.py | 2 +- + requirements.txt | 2 +- + 3 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/docs/TUTORIAL.rst b/docs/TUTORIAL.rst +index 09f6902f9..7692547eb 100644 +--- a/docs/TUTORIAL.rst ++++ b/docs/TUTORIAL.rst +@@ -20,7 +20,7 @@ Python ships a standard module, ``ast`` to turn Python code into an AST. For ins + >>> code = "a=1" + >>> tree = ast.parse(code) # turn the code into an AST + >>> print(ast.dump(tree)) # view it as a string +- Module(body=[Assign(targets=[Name(id='a', ctx=Store(), annotation=None, type_comment=None)], value=Constant(value=1, kind=None), type_comment=None)], type_ignores=[]) ++ Module(body=[Assign(targets=[Name(id='a', ctx=Store())], value=Constant(value=1, kind=None))]) + + Deciphering the above line, one learns that the single assignment is parsed as + a module containing a single statement, which is an assignment to a single +@@ -33,7 +33,7 @@ Eventually, one needs to parse more complex codes, and things get a bit more cry + ... return n if n< 2 else fib(n-1) + fib(n-2)""" + >>> tree = ast.parse(fib_src) + >>> print(ast.dump(tree)) +- Module(body=[FunctionDef(name='fib', args=arguments(args=[Name(id='n', ctx=Param(), annotation=None, type_comment=None)], posonlyargs=[], vararg=None, kwonlyargs=[], kw_defaults=[], kwarg=None, defaults=[]), body=[Return(value=IfExp(test=Compare(left=Name(id='n', ctx=Load(), annotation=None, type_comment=None), ops=[Lt()], comparators=[Constant(value=2, kind=None)]), body=Name(id='n', ctx=Load(), annotation=None, type_comment=None), orelse=BinOp(left=Call(func=Name(id='fib', ctx=Load(), annotation=None, type_comment=None), args=[BinOp(left=Name(id='n', ctx=Load(), annotation=None, type_comment=None), op=Sub(), right=Constant(value=1, kind=None))], keywords=[]), op=Add(), right=Call(func=Name(id='fib', ctx=Load(), annotation=None, type_comment=None), args=[BinOp(left=Name(id='n', ctx=Load(), annotation=None, type_comment=None), op=Sub(), right=Constant(value=2, kind=None))], keywords=[]))))], decorator_list=[], returns=None, type_comment=None)], type_ignores=[]) ++ Module(body=[FunctionDef(name='fib', args=arguments(args=[Name(id='n', ctx=Param())]), body=[Return(value=IfExp(test=Compare(left=Name(id='n', ctx=Load()), ops=[Lt()], comparators=[Constant(value=2, kind=None)]), body=Name(id='n', ctx=Load()), orelse=BinOp(left=Call(func=Name(id='fib', ctx=Load()), args=[BinOp(left=Name(id='n', ctx=Load()), op=Sub(), right=Constant(value=1, kind=None))]), op=Add(), right=Call(func=Name(id='fib', ctx=Load()), args=[BinOp(left=Name(id='n', ctx=Load()), op=Sub(), right=Constant(value=2, kind=None))]))))])]) + + The idea remains the same. The whole Python syntax is described in + http://docs.python.org/2/library/ast.html and is worth a glance, otherwise +@@ -199,7 +199,7 @@ constant expressions. In the previous code, there is only two constant + + >>> ce = pm.gather(analyses.ConstantExpressions, tree) + >>> sorted(map(ast.dump, ce)) +- ["Attribute(value=Name(id='math', ctx=Load(), annotation=None, type_comment=None), attr='cos', ctx=Load())", 'Constant(value=3, kind=None)'] ++ ["Attribute(value=Name(id='math', ctx=Load()), attr='cos', ctx=Load())", 'Constant(value=3, kind=None)'] + + One of the most critical analyse of Pythran is the points-to analysis. There + are two flavors of this analyse, one that computes an over-set of the aliased +@@ -210,7 +210,7 @@ variable, and one that computes an under set. ``Aliases`` computes an over-set:: + >>> al = pm.gather(analyses.Aliases, tree) + >>> returned = tree.body[-1].body[-1].value + >>> print(ast.dump(returned)) +- Name(id='b', ctx=Load(), annotation=None, type_comment=None) ++ Name(id='b', ctx=Load()) + >>> sorted(a.id for a in al[returned]) + ['c', 'd'] + +diff --git a/pythran/utils.py b/pythran/utils.py +index 2d7a67327..55a7e8ad6 100644 +--- a/pythran/utils.py ++++ b/pythran/utils.py +@@ -106,7 +106,7 @@ def get_variable(assignable): + ... slice=ast.Name('j', ast.Load(), None, None), + ... ctx=ast.Load()) + >>> ast.dump(get_variable(ref)) +- "Name(id='a', ctx=Load(), annotation=None, type_comment=None)" ++ "Name(id='a', ctx=Load())" + """ + msg = "Only name and subscript can be assigned." + assert isinstance(assignable, (ast.Name, ast.Subscript)), msg +diff --git a/requirements.txt b/requirements.txt +index fd6a738e5..c7a25c52a 100644 +--- a/requirements.txt ++++ b/requirements.txt +@@ -1,5 +1,5 @@ + ply>=3.4 + setuptools +-gast~=0.5.0 ++gast~=0.6.0 + numpy + beniget~=0.4.0 diff --git a/srcpkgs/pythran/template b/srcpkgs/pythran/template index a717256074d6d3..9a8761a767f67e 100644 --- a/srcpkgs/pythran/template +++ b/srcpkgs/pythran/template @@ -1,7 +1,7 @@ # Template file for 'pythran' pkgname=pythran version=0.16.1 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-setuptools python3-wheel" depends="python3-ply python3-gast python3-beniget python3-numpy From e3eba576e11e122547d09fb6929c1aceec5c08e0 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Mon, 1 Jul 2024 13:49:07 -0400 Subject: [PATCH 18/24] python3-scikit-image: rebuild against python3-numpy-2.0.0 --- srcpkgs/python3-scikit-image/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/python3-scikit-image/template b/srcpkgs/python3-scikit-image/template index 144193cd39b330..914aa23ce673f2 100644 --- a/srcpkgs/python3-scikit-image/template +++ b/srcpkgs/python3-scikit-image/template @@ -1,7 +1,7 @@ # Template file for 'python3-scikit-image' pkgname=python3-scikit-image version=0.24.0 -revision=1 +revision=2 build_style=python3-pep517 build_helper="meson numpy" hostmakedepends="python3-build python3-installer python3-meson-python From 0ff0dd379c311f5704b65abeef4da37d2a1fe2a3 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Mon, 1 Jul 2024 13:49:07 -0400 Subject: [PATCH 19/24] python3-scikit-learn: update to 1.5.0. --- .../patches/numpy-version.patch | 11 ---------- srcpkgs/python3-scikit-learn/template | 20 +++++++------------ 2 files changed, 7 insertions(+), 24 deletions(-) delete mode 100644 srcpkgs/python3-scikit-learn/patches/numpy-version.patch diff --git a/srcpkgs/python3-scikit-learn/patches/numpy-version.patch b/srcpkgs/python3-scikit-learn/patches/numpy-version.patch deleted file mode 100644 index 0ffb53e3433e9b..00000000000000 --- a/srcpkgs/python3-scikit-learn/patches/numpy-version.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/pyproject.toml -+++ b/pyproject.toml -@@ -9,7 +9,7 @@ - # wheels on PyPI - # - # see: https://github.com/scipy/oldest-supported-numpy/blob/main/setup.cfg -- "oldest-supported-numpy; python_version!='3.10' or platform_system!='Windows' or platform_python_implementation=='PyPy'", -+ "numpy>=1.23.2; python_version!='3.10' or platform_system!='Windows' or platform_python_implementation=='PyPy'", - # For CPython 3.10 under Windows, SciPy requires NumPy 1.22.3 while the - # oldest supported NumPy is defined as 1.21.6. We therefore need to force - # it for this specific configuration. For details, see diff --git a/srcpkgs/python3-scikit-learn/template b/srcpkgs/python3-scikit-learn/template index a6364f089c4f4d..c0983fe4624dd3 100644 --- a/srcpkgs/python3-scikit-learn/template +++ b/srcpkgs/python3-scikit-learn/template @@ -1,27 +1,21 @@ # Template file for 'python3-scikit-learn' pkgname=python3-scikit-learn -version=1.3.0 -revision=2 +version=1.5.0 +revision=1 build_style=python3-pep517 -hostmakedepends="python3-setuptools python3-Cython python3-numpy python3-scipy - python3-wheel" -makedepends="python3-devel libgomp-devel" +build_helper="numpy meson" +hostmakedepends="python3-Cython python3-numpy python3-scipy + python3-meson-python pkg-config" +makedepends="python3-devel python3-numpy libgomp-devel" depends="python3-numpy python3-scipy python3-joblib python3-threadpoolctl" short_desc="Python3 modules for machine learning and data mining" maintainer="Orphaned " license="BSD-3-Clause" homepage="https://scikit-learn.org/" distfiles="https://github.com/scikit-learn/scikit-learn/archive/${version}.tar.gz" -checksum=ead129f466a0859555ce4f41280ae06623ef3255efff0b1692c57f15e39767b5 +checksum=cd2aac2b566c7e740d34aabb4737864c74ba33c29aad7101fbf1bab2931c02dc make_check=no # tests don't work properly unless package is installed -export SKLEARN_BUILD_PARALLEL="${XBPS_MAKEJOBS}" - -if [ "$CROSS_BUILD" ]; then - # Without this, setup.py tries to run a target executable - export PYTHON_CROSSENV=1 -fi - post_install() { vlicense COPYING } From 235a6db04e2e2d5320166b0fd089142b63fef1bd Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Mon, 1 Jul 2024 13:10:18 -0400 Subject: [PATCH 20/24] python3-scipy: rebuild against python3-numpy-2.0.0 --- srcpkgs/python3-scipy/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/python3-scipy/template b/srcpkgs/python3-scipy/template index 41cf9ddb873aab..e35cd25b4595c6 100644 --- a/srcpkgs/python3-scipy/template +++ b/srcpkgs/python3-scipy/template @@ -1,7 +1,7 @@ # Template file for 'python3-scipy' pkgname=python3-scipy version=1.14.0 -revision=1 +revision=2 build_style=python3-pep517 build_helper="meson numpy" # SciPy imposes strict and unnecessary restrictions on build dependencies From b04aa65910e77a0226540f7e431acbe29ac4cb65 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Mon, 1 Jul 2024 13:57:27 -0400 Subject: [PATCH 21/24] python3-tables: rebuild against python3-numpy-2.0.0 --- srcpkgs/python3-tables/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/python3-tables/template b/srcpkgs/python3-tables/template index 81b7351b972649..38c93292ea4bf8 100644 --- a/srcpkgs/python3-tables/template +++ b/srcpkgs/python3-tables/template @@ -1,7 +1,7 @@ # Template file for 'python3-tables' pkgname=python3-tables version=3.7.0 -revision=3 +revision=4 build_style=python3-module build_helper=numpy # XXX: c-blosc (using internal for now) From 6df01fc4e4bcbd700deafeeb771e75d425b84d5d Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Mon, 1 Jul 2024 13:57:27 -0400 Subject: [PATCH 22/24] python3-vispy: rebuild against python3-numpy-2.0.0 --- srcpkgs/python3-vispy/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/python3-vispy/template b/srcpkgs/python3-vispy/template index 60dc8ae4b82996..6411756abc3b71 100644 --- a/srcpkgs/python3-vispy/template +++ b/srcpkgs/python3-vispy/template @@ -1,7 +1,7 @@ # Template file for 'python3-vispy' pkgname=python3-vispy version=0.6.1 -revision=8 +revision=9 build_style=python3-module build_helper=numpy hostmakedepends="python3-setuptools python3-Cython python3-numpy" From ddae40a07368eec32be75e27a33e68dde7baa4e3 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Mon, 1 Jul 2024 13:57:27 -0400 Subject: [PATCH 23/24] urh: rebuild against python3-numpy-2.0.0 --- srcpkgs/urh/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/urh/template b/srcpkgs/urh/template index f86a7ea530c762..7c109b044b1462 100644 --- a/srcpkgs/urh/template +++ b/srcpkgs/urh/template @@ -1,7 +1,7 @@ # Template file for 'urh' pkgname=urh version=2.9.6 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools python3-Cython0.29 python3-numpy" makedepends="python3-devel python3-PyQt5 libairspy-devel librtlsdr-devel From 5253943e274c5ed05e17cf70412d3830fecac004 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Mon, 1 Jul 2024 13:08:40 -0400 Subject: [PATCH 24/24] wxPython: fix runtime dependencies --- srcpkgs/wxPython/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/wxPython/template b/srcpkgs/wxPython/template index 7f4c8a21e18589..0d29630771a48f 100644 --- a/srcpkgs/wxPython/template +++ b/srcpkgs/wxPython/template @@ -1,14 +1,14 @@ # Template file for 'wxPython' pkgname=wxPython version=4.2.1 -revision=4 +revision=5 build_style=python3-module make_build_args="--skip-build" make_install_args="--skip-build" hostmakedepends="pkg-config python3-setuptools python3-pathlib2 python3-Cython0.29" makedepends="python3-devel wxWidgets-gtk3-devel SDL2-devel gst-plugins-base1-devel" -depends="python3 python3-six python3-numpy python3-Pillow" +depends="python3-six" short_desc="Python bindings for wxWidgets" maintainer="Orphaned " license="custom:wxWindows"