The package rpms/python-scikit-misc.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/python-scikit-misc.git/commit/?id=c1....
Change: +ExcludeArch: %{ix86}
Thanks.
Full change: ============
commit 54befde73abe840c4a3467407158f54990735d39 Author: Benjamin A. Beasley code@musicinmybrain.net Date: Mon Jun 24 14:16:56 2024 -0400
Numpy 1.x backwards-compatibility fix
diff --git a/36.patch b/36.patch new file mode 100644 index 0000000..48f49aa --- /dev/null +++ b/36.patch @@ -0,0 +1,27 @@ +From e8eccceda5d81af16b8cacd3f48f65f3d7fd099c Mon Sep 17 00:00:00 2001 +From: "Benjamin A. Beasley" code@musicinmybrain.net +Date: Mon, 24 Jun 2024 14:04:27 -0400 +Subject: [PATCH] Numpy 1.x backwards-compatibility fix + +Before Numpy 2.0, `numpy.asarray()` does not support a `copy` keyword. + +Partially reverts (one line of) cd9026f90bd9e523fa9343d36968f0c0e4a7980f. + +Fixes #35. +--- + skmisc/loess/src/_loess.pyx | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/skmisc/loess/src/_loess.pyx b/skmisc/loess/src/_loess.pyx +index 6c642bb..2b42682 100644 +--- a/skmisc/loess/src/_loess.pyx ++++ b/skmisc/loess/src/_loess.pyx +@@ -680,7 +680,7 @@ cdef class loess_prediction: + self.allocated = False + + # Note : we need a copy as we may have to normalize +- p_ndr = np.asarray(newdata, copy=True, order='C') ++ p_ndr = np.array(newdata, copy=True, subok=True, order='C') + p_ndr = p_ndr.astype(float) + + # Dimensions should match those of the input diff --git a/python-scikit-misc.spec b/python-scikit-misc.spec index 5d1e026..8e49209 100644 --- a/python-scikit-misc.spec +++ b/python-scikit-misc.spec @@ -21,6 +21,9 @@ Source: %forgesource # Add meson build options to pyproject.toml # Passing this through one of the macros appears unsupported Patch: use_flexiblas.patch +# Numpy 1.x backwards-compatibility fix +# https://github.com/has2k1/scikit-misc/pull/36 +Patch: %{forgeurl}/pull/36.patch
ExcludeArch: %{ix86} BuildRequires: python3-devel
commit 12e8e56e9a69b52404d306d9fab69b42babcd05f Author: Ankur Sinha (Ankur Sinha Gmail) sanjay.ankur@gmail.com Date: Mon Jun 24 14:04:36 2024 +0100
chore: unpin numpy (fixes rh#2293779)
diff --git a/31.patch b/31.patch deleted file mode 100644 index 545c4c0..0000000 --- a/31.patch +++ /dev/null @@ -1,23 +0,0 @@ -From f655ac60730eeee7b48ad2d4530d947f09b233fd Mon Sep 17 00:00:00 2001 -From: Sandro devel@penguinpee.nl -Date: Mon, 25 Mar 2024 14:53:01 +0100 -Subject: [PATCH] Allow building with Python >= 3.12 - -This fixes issue #30. ---- - pyproject.toml | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/pyproject.toml b/pyproject.toml -index a1f7944..fb6ef26 100644 ---- a/pyproject.toml -+++ b/pyproject.toml -@@ -90,7 +90,7 @@ requires = [ - # default numpy requirements - "numpy==1.22.4; python_version<='3.10' and platform_python_implementation != 'PyPy'", - "numpy==1.23.2; python_version=='3.11' and platform_python_implementation != 'PyPy'", -- "numpy>=1.26.0,<1.27; python_version=='3.12'", -+ "numpy>=1.26.0,<1.27; python_version>='3.12'", - ] - - diff --git a/python-scikit-misc.spec b/python-scikit-misc.spec index 0ae9eb0..5d1e026 100644 --- a/python-scikit-misc.spec +++ b/python-scikit-misc.spec @@ -21,9 +21,6 @@ Source: %forgesource # Add meson build options to pyproject.toml # Passing this through one of the macros appears unsupported Patch: use_flexiblas.patch -# Allow building with Python 3.13 -# https://github.com/has2k1/scikit-misc/issues/30 -Patch: %{forgeurl}/pull/31.patch
ExcludeArch: %{ix86} BuildRequires: python3-devel @@ -50,7 +47,7 @@ Summary: %{summary}
%prep -%forgeautosetup -p1 -S git +%forgeautosetup -S git # Supply the version information to mesonpy git tag v%{version}
@@ -59,10 +56,8 @@ git tag v%{version} # Disable coverage sed -i -e 's/--cov=skmisc --cov-report=xml//' pyproject.toml
-# Do not attempt to build with an old version of numpy; this makes -# sense for PyPI distribution (oldest-supported-numpy) but not here. -sed -r -i 's/(numpy)==/\1>=/' pyproject.toml - +# Do not attempt to build with numpy>=2.0 +sed -r -i 's/(numpy)>=2.0/\1/' pyproject.toml
%generate_buildrequires %pyproject_buildrequires -w
commit d9a921068245e6f4e92ea5e4ec68a743cda95b4e Author: Packit hello@packit.dev Date: Sat Jun 22 14:17:28 2024 +0000
Update to 0.4.0 upstream release
- Resolves: rhbz#2293779
Upstream tag: v0.4.0 Upstream commit: 556c22ff
Commit authored by Packit automation (https://packit.dev/)
diff --git a/README.packit b/README.packit new file mode 100644 index 0000000..bc5362c --- /dev/null +++ b/README.packit @@ -0,0 +1,3 @@ +This repository is maintained by packit. +https://packit.dev/ +The file was generated using packit 0.97.2.post1.dev7+g966b87eb. diff --git a/python-scikit-misc.spec b/python-scikit-misc.spec index d236a58..0ae9eb0 100644 --- a/python-scikit-misc.spec +++ b/python-scikit-misc.spec @@ -7,7 +7,7 @@ %bcond tests 1
Name: python-%{pypi_name} -Version: 0.3.1 +Version: 0.4.0 Release: %autorelease Summary: Miscellaneous tools for data analysis and scientific computing
diff --git a/sources b/sources index 95c8b30..2c48b65 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (scikit-misc-0.3.1.tar.gz) = eba09c6b450c023185bc6e17ff9678770177c5a6157ab37bdaf223da252dcf6f79640664305895c3efb66a263897cb8c04a900f706ca579b36d410f862c39ae4 +SHA512 (scikit-misc-0.4.0.tar.gz) = b9a605148ecab37ba1246ae822478ed042cc4c2bea018e02426609d9a3d6cebfa73d95dc65d9f884794bcad808464978b4a1e2d44322bc61c4048e0ebab8aede
commit e2fef318346990df34a78a20cb7ca3869112bd93 Author: Python Maint python-maint@redhat.com Date: Sat Jun 8 08:11:16 2024 +0200
Rebuilt for Python 3.13
commit c16334311ebeceed5d74aa5c57244d1e9937424c Author: Sandro devel@penguinpee.nl Date: Tue May 14 15:33:44 2024 +0200
Restructure spec file
The ordering wasn't quite right. Also made some other minor quality of packager's life improvements.
- Drop `module_name` var (only used in one place) - Put BRs in main package - Move `_description` to a more suitable place - Don't enumerate single source - Stop building for i686 - Use `%forgeautosetup` instead of `%autosetup`
[skip changelog]
diff --git a/python-scikit-misc.spec b/python-scikit-misc.spec index c17b688..d236a58 100644 --- a/python-scikit-misc.spec +++ b/python-scikit-misc.spec @@ -1,16 +1,11 @@ +%global pypi_name scikit-misc # Use GitHub sources. PyPI sources are not suitable for rebuilding. # https://github.com/has2k1/scikit-misc/issues/27 %global forgeurl https://github.com/has2k1/scikit-misc -%global pypi_name scikit-misc -%global module_name skmisc
# Enable tests %bcond tests 1
-%global _description %{expand: -Miscellaneous tools for data analysis and scientific computing.} - - Name: python-%{pypi_name} Version: 0.3.1 Release: %autorelease @@ -22,7 +17,7 @@ Summary: Miscellaneous tools for data analysis and scientific computing # Python-2.0.1 license applies to doc/_static/copybutton.js License: BSD-3-Clause AND MIT AND Python-2.0.1 URL: %forgeurl -Source0: %forgesource +Source: %forgesource # Add meson build options to pyproject.toml # Passing this through one of the macros appears unsupported Patch: use_flexiblas.patch @@ -30,11 +25,7 @@ Patch: use_flexiblas.patch # https://github.com/has2k1/scikit-misc/issues/30 Patch: %{forgeurl}/pull/31.patch
-%description %_description - - -%package -n python3-%{pypi_name} -Summary: %{summary} +ExcludeArch: %{ix86} BuildRequires: python3-devel BuildRequires: git-core # For optimized performance @@ -46,12 +37,20 @@ BuildRequires: patchelf BuildRequires: python3-pytest %endif
+%global _description %{expand: +Miscellaneous tools for data analysis and scientific computing.} + +%description %_description + + +%package -n python3-%{pypi_name} +Summary: %{summary}
%description -n python3-%{pypi_name} %_description
%prep -%autosetup -p1 -n %{pypi_name}-%{version} -S git +%forgeautosetup -p1 -S git # Supply the version information to mesonpy git tag v%{version}
@@ -73,7 +72,7 @@ sed -r -i 's/(numpy)==/\1>=/' pyproject.toml
%install %pyproject_install -%pyproject_save_files %{module_name} +%pyproject_save_files skmisc
%check
commit 0a605fa0573a6730fd7ad001077eb9b6fd002324 Author: Sandro devel@penguinpee.nl Date: Mon May 13 18:01:05 2024 +0200
Build the wheel only once
Skip `%build` entirely since `%pyproject_buildrequires -w` already builds the wheel.
[skip changelog]
diff --git a/python-scikit-misc.spec b/python-scikit-misc.spec index c8d782c..c17b688 100644 --- a/python-scikit-misc.spec +++ b/python-scikit-misc.spec @@ -68,10 +68,8 @@ sed -r -i 's/(numpy)==/\1>=/' pyproject.toml %generate_buildrequires %pyproject_buildrequires -w
- -%build -%pyproject_wheel - +# There is no build section since the wheel is already build as part of +# %%pyproject_buildrequires
%install %pyproject_install
commit c0efddf4447f265168ade1ecefd7d7566aa1a1a9 Author: Sandro devel@penguinpee.nl Date: Mon May 13 17:58:57 2024 +0200
Make tests work with pytest >= 8 (RHBZ#2280000)
[skip changelog]
diff --git a/python-scikit-misc.spec b/python-scikit-misc.spec index 3346fff..c8d782c 100644 --- a/python-scikit-misc.spec +++ b/python-scikit-misc.spec @@ -80,7 +80,10 @@ sed -r -i 's/(numpy)==/\1>=/' pyproject.toml
%check %if %{with tests} - %pytest + # pytest >= 8 wants to import from the skmisc/ src dir + mkdir empty && pushd empty + ln -s ../skmisc/loess/tests . + %pytest -v --pyargs --import-mode=importlib %else %pyproject_check_import %endif
commit 6cb8e95ae9d37b146e489307a89fcc3e78c9bfd2 Author: Sandro devel@penguinpee.nl Date: Mon Mar 25 15:08:49 2024 +0100
Allow building with Python>=3.12 (RHBZ#2260318)
diff --git a/31.patch b/31.patch new file mode 100644 index 0000000..545c4c0 --- /dev/null +++ b/31.patch @@ -0,0 +1,23 @@ +From f655ac60730eeee7b48ad2d4530d947f09b233fd Mon Sep 17 00:00:00 2001 +From: Sandro devel@penguinpee.nl +Date: Mon, 25 Mar 2024 14:53:01 +0100 +Subject: [PATCH] Allow building with Python >= 3.12 + +This fixes issue #30. +--- + pyproject.toml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/pyproject.toml b/pyproject.toml +index a1f7944..fb6ef26 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -90,7 +90,7 @@ requires = [ + # default numpy requirements + "numpy==1.22.4; python_version<='3.10' and platform_python_implementation != 'PyPy'", + "numpy==1.23.2; python_version=='3.11' and platform_python_implementation != 'PyPy'", +- "numpy>=1.26.0,<1.27; python_version=='3.12'", ++ "numpy>=1.26.0,<1.27; python_version>='3.12'", + ] + + diff --git a/python-scikit-misc.spec b/python-scikit-misc.spec index a1a4aec..3346fff 100644 --- a/python-scikit-misc.spec +++ b/python-scikit-misc.spec @@ -26,6 +26,9 @@ Source0: %forgesource # Add meson build options to pyproject.toml # Passing this through one of the macros appears unsupported Patch: use_flexiblas.patch +# Allow building with Python 3.13 +# https://github.com/has2k1/scikit-misc/issues/30 +Patch: %{forgeurl}/pull/31.patch
%description %_description
commit e607ec7393bf44323e4bd58950d3883d7960b2b5 Author: Sandro devel@penguinpee.nl Date: Wed Mar 13 22:50:45 2024 +0100
Fix Packit config
diff --git a/.packit.yaml b/.packit.yaml index a28fe6c..01447ef 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -1,3 +1,5 @@ +upstream_project_url: https://github.com/has2k1/scikit-misc +upstream_tag_template: v{version} copy_upstream_release_description: false
jobs:
arch-excludes@lists.fedoraproject.org