From a69576a5b3acdf24310792d6fecccea45c4fcc4d Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Mon, 17 Jul 2023 13:18:36 -0400 Subject: [PATCH 1/4] python3-Cython: update to 3.0.0. --- srcpkgs/python3-Cython/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-Cython/template b/srcpkgs/python3-Cython/template index 2daf981d349b..77e5be64c24c 100644 --- a/srcpkgs/python3-Cython/template +++ b/srcpkgs/python3-Cython/template @@ -1,6 +1,6 @@ # Template file for 'python3-Cython' pkgname=python3-Cython -version=0.29.36 +version=3.0.0 revision=1 build_style=python3-module hostmakedepends="python3-setuptools" @@ -12,7 +12,7 @@ license="Apache-2.0" homepage="https://cython.org/" changelog="https://raw.githubusercontent.com/cython/cython/master/CHANGES.rst" distfiles="${PYPI_SITE}/C/Cython/Cython-${version}.tar.gz" -checksum=41c0cfd2d754e383c9eeb95effc9aa4ab847d0c9747077ddd7c0dcb68c3bc01f +checksum=350b18f9673e63101dbbfcf774ee2f57c20ac4636d255741d76ca79016b1bd82 # Tests are flaky make_check=no From d453187e841c2d215abcfa115ac003252afc5fba Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Mon, 17 Jul 2023 15:18:59 -0400 Subject: [PATCH 2/4] python3-scipy: patch and rebuild for python3-Cython-3.0.0 --- srcpkgs/python3-scipy/patches/cython-version.patch | 11 +++++++++++ srcpkgs/python3-scipy/template | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/python3-scipy/patches/cython-version.patch diff --git a/srcpkgs/python3-scipy/patches/cython-version.patch b/srcpkgs/python3-scipy/patches/cython-version.patch new file mode 100644 index 000000000000..04f5d7264264 --- /dev/null +++ b/srcpkgs/python3-scipy/patches/cython-version.patch @@ -0,0 +1,11 @@ +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -11,7 +11,7 @@ + build-backend = 'mesonpy' + requires = [ + "meson-python>=0.12.1,<0.14.0", # already working with 0.13.x series at branch time +- "Cython>=0.29.35,<3.0", # when updating version, also update check in meson.build ++ "Cython>=0.29.35", + "pybind11>=2.10.4,<2.11.0", + "pythran>=0.12.0,<0.14.0", # already working with 0.13.x series at branch time + # `wheel` is needed for non-isolated builds, given that `meson-python` diff --git a/srcpkgs/python3-scipy/template b/srcpkgs/python3-scipy/template index eb7c7a3e0166..7cc9bcfbfa06 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.11.1 -revision=1 +revision=2 build_style=meson build_helper="python3" configure_args="$(vopt_if openblas "" "-Dblas=blas -Dlapack=lapack")" From b4f74f3ad4387f4edba54ee917e644518df43b92 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Mon, 17 Jul 2023 16:11:36 -0400 Subject: [PATCH 3/4] python3-yaml: patch and rebuild for python3-Cython-3.0.0 --- srcpkgs/python3-yaml/patches/cython3.patch | 11 +++++++++++ srcpkgs/python3-yaml/template | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/python3-yaml/patches/cython3.patch diff --git a/srcpkgs/python3-yaml/patches/cython3.patch b/srcpkgs/python3-yaml/patches/cython3.patch new file mode 100644 index 000000000000..601e79891aac --- /dev/null +++ b/srcpkgs/python3-yaml/patches/cython3.patch @@ -0,0 +1,11 @@ +--- a/setup.py ++++ b/setup.py +@@ -81,7 +81,7 @@ + with_cython = True + try: + from Cython.Distutils.extension import Extension as _Extension +- from Cython.Distutils import build_ext as _build_ext ++ from Cython.Distutils.old_build_ext import old_build_ext as _build_ext + with_cython = True + except ImportError: + if with_cython: diff --git a/srcpkgs/python3-yaml/template b/srcpkgs/python3-yaml/template index f281f217fa40..ab7417caf44c 100644 --- a/srcpkgs/python3-yaml/template +++ b/srcpkgs/python3-yaml/template @@ -1,7 +1,7 @@ # Template file for 'python3-yaml' pkgname=python3-yaml version=6.0 -revision=2 +revision=3 build_style=python3-module hostmakedepends="python3-setuptools python3-Cython" makedepends="libyaml-devel python3-devel" From e9e9480da61d12efe3fb60c274e18554285fdad8 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Tue, 18 Jul 2023 09:40:26 -0400 Subject: [PATCH 4/4] python3-scikit-learn: update to 1.3.0. --- .../patches/numpy-version.patch | 11 +++++++++++ srcpkgs/python3-scikit-learn/template | 14 ++++++++------ 2 files changed, 19 insertions(+), 6 deletions(-) create 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 new file mode 100644 index 000000000000..0ffb53e3433e --- /dev/null +++ b/srcpkgs/python3-scikit-learn/patches/numpy-version.patch @@ -0,0 +1,11 @@ +--- 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 9fc96efd4ab1..aed65406cad2 100644 --- a/srcpkgs/python3-scikit-learn/template +++ b/srcpkgs/python3-scikit-learn/template @@ -1,17 +1,19 @@ # Template file for 'python3-scikit-learn' pkgname=python3-scikit-learn -version=0.24.2 -revision=3 -build_style=python3-module -hostmakedepends="python3-setuptools python3-Cython python3-numpy python3-scipy" -makedepends="python3-devel" +version=1.3.0 +revision=1 +build_style=python3-pep517 +hostmakedepends="python3-setuptools python3-Cython python3-numpy python3-scipy + python3-wheel" +makedepends="python3-devel 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=642fb016bfe4bb7539ba6bf4e6dd5a95d2d25638387040b0f5eefdb84a840297 +checksum=ead129f466a0859555ce4f41280ae06623ef3255efff0b1692c57f15e39767b5 +make_check=no # tests don't work properly unless package is installed export SKLEARN_BUILD_PARALLEL="${XBPS_MAKEJOBS}"