From 9d67365ab95b9551b08b6b275ae8711c148ab1077433e1afa3e5b2a78e971c83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mark=C3=A9ta=20Machov=C3=A1?= Date: Fri, 21 Jul 2023 10:31:40 +0000 Subject: [PATCH 1/7] Accepting request 1099876 from home:Guillaume_G:branches:devel:languages:python:numeric - Update to 1.25.1: * NumPy 1.25.1 is a maintenance release that fixes bugs and regressions discovered after the 1.25.0 release. The Python versions supported by this release are 3.9-3.11. * #23968: MAINT: prepare 1.25.x for further development * #24036: BLD: Port long double identification to C for meson * #24037: BUG: Fix reduction return NULL to be goto fail * #24038: BUG: Avoid undefined behavior in array.astype() * #24039: BUG: Ensure __array_ufunc__ works without any kwargs passed * #24117: MAINT: Pin urllib3 to avoid anaconda-client bug. * #24118: TST: Pin pydantic<2 in Pyodide workflow * #24119: MAINT: Bump pypa/cibuildwheel from 2.13.0 to 2.13.1 * #24120: MAINT: Bump actions/checkout from 3.5.2 to 3.5.3 * #24122: BUG: Multiply or Divides using SIMD without a full vector can... * #24127: MAINT: testing for IS_MUSL closes #24074 * #24128: BUG: Only replace dtype temporarily if dimensions changed * #24129: MAINT: Bump actions/setup-node from 3.6.0 to 3.7.0 * #24134: BUG: Fix private procedures in f2py modules - Skipped 1.25.0: * The NumPy 1.25.0 release continues the ongoing work to improve the handling and promotion of dtypes, increase the execution speed, and clarify the documentation. There has also been work to prepare for the future NumPy 2.0.0 release, resulting in a large number of new and expired deprecation. Highlights are: - Support for MUSL, there are now MUSL wheels. - Support the Fujitsu C/C++ compiler. - Object arrays are now supported in einsum - Support for inplace matrix multiplication (@=). * Full changelog: https://github.com/numpy/numpy/releases/tag/v1.25.0 The Python versions supported in this release are 3.9-3.11. - Remove upstream patch: * remove-deprecated-hypothesis-funcs.patch OBS-URL: https://build.opensuse.org/request/show/1099876 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:numeric/python-numpy?expand=0&rev=131 --- numpy-1.24.2.tar.gz | 3 -- numpy-1.25.1.tar.gz | 3 ++ python-numpy.changes | 36 ++++++++++++++++++++++++ python-numpy.spec | 18 ++++++++---- remove-deprecated-hypothesis-funcs.patch | 13 --------- 5 files changed, 51 insertions(+), 22 deletions(-) delete mode 100644 numpy-1.24.2.tar.gz create mode 100644 numpy-1.25.1.tar.gz delete mode 100644 remove-deprecated-hypothesis-funcs.patch diff --git a/numpy-1.24.2.tar.gz b/numpy-1.24.2.tar.gz deleted file mode 100644 index e55e483..0000000 --- a/numpy-1.24.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:003a9f530e880cb2cd177cba1af7220b9aa42def9c4afc2a2fc3ee6be7eb2b22 -size 10906862 diff --git a/numpy-1.25.1.tar.gz b/numpy-1.25.1.tar.gz new file mode 100644 index 0000000..46cae47 --- /dev/null +++ b/numpy-1.25.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9a3a9f3a61480cc086117b426a8bd86869c213fc4072e606f01c4e4b66eb92bf +size 10428993 diff --git a/python-numpy.changes b/python-numpy.changes index d9d5fad..62d4c6b 100644 --- a/python-numpy.changes +++ b/python-numpy.changes @@ -1,3 +1,39 @@ +------------------------------------------------------------------- +Thu Jul 20 13:21:25 UTC 2023 - Guillaume GARDET + +- Update to 1.25.1: + * NumPy 1.25.1 is a maintenance release that fixes bugs and regressions + discovered after the 1.25.0 release. The Python versions supported by + this release are 3.9-3.11. + * #23968: MAINT: prepare 1.25.x for further development + * #24036: BLD: Port long double identification to C for meson + * #24037: BUG: Fix reduction return NULL to be goto fail + * #24038: BUG: Avoid undefined behavior in array.astype() + * #24039: BUG: Ensure __array_ufunc__ works without any kwargs passed + * #24117: MAINT: Pin urllib3 to avoid anaconda-client bug. + * #24118: TST: Pin pydantic<2 in Pyodide workflow + * #24119: MAINT: Bump pypa/cibuildwheel from 2.13.0 to 2.13.1 + * #24120: MAINT: Bump actions/checkout from 3.5.2 to 3.5.3 + * #24122: BUG: Multiply or Divides using SIMD without a full vector can... + * #24127: MAINT: testing for IS_MUSL closes #24074 + * #24128: BUG: Only replace dtype temporarily if dimensions changed + * #24129: MAINT: Bump actions/setup-node from 3.6.0 to 3.7.0 + * #24134: BUG: Fix private procedures in f2py modules +- Skipped 1.25.0: + * The NumPy 1.25.0 release continues the ongoing work to improve the + handling and promotion of dtypes, increase the execution speed, and + clarify the documentation. There has also been work to prepare for the + future NumPy 2.0.0 release, resulting in a large number of new and + expired deprecation. Highlights are: + - Support for MUSL, there are now MUSL wheels. + - Support the Fujitsu C/C++ compiler. + - Object arrays are now supported in einsum + - Support for inplace matrix multiplication (@=). + * Full changelog: https://github.com/numpy/numpy/releases/tag/v1.25.0 +The Python versions supported in this release are 3.9-3.11. +- Remove upstream patch: + * remove-deprecated-hypothesis-funcs.patch + ------------------------------------------------------------------- Fri Jun 23 12:23:14 UTC 2023 - Stefan Brüns diff --git a/python-numpy.spec b/python-numpy.spec index 12382d4..d2bc3df 100644 --- a/python-numpy.spec +++ b/python-numpy.spec @@ -17,8 +17,8 @@ %global flavor @BUILD_FLAVOR@%{nil} -%define ver 1.24.2 -%define _ver 1_24_2 +%define ver 1.25.1 +%define _ver 1_25_1 %define pname python-numpy %define plainpython python %define hpc_upcase_trans_hyph() %(echo %{**} | tr [a-z] [A-Z] | tr '-' '_') @@ -88,8 +88,6 @@ Patch0: numpy-buildfix.patch Patch1: numpy-1.9.0-remove-__declspec.patch # PATCH-FIX-OPENSUSE Ignore DeprecationWarnings when importing pkg_resources Patch2: ignore-pkg_resources-deprecation.patch -# PATCH-FIX-OPENSUSE Do not call a deprecated hypothesis health check function -Patch3: remove-deprecated-hypothesis-funcs.patch BuildRequires: %{python_module Cython >= 0.29.30} BuildRequires: %{python_module base >= 3.8} BuildRequires: %{python_module devel} @@ -184,7 +182,7 @@ This package contains files for developing applications using numpy. %prep %autosetup -p1 -n numpy-%{version} # Fix non-executable scripts -sed -i '1s/^#!.*$//' numpy/{compat/setup,random/_examples/cython/setup,distutils/{conv_template,cpuinfo,exec_command,from_template,setup,system_info},f2py/{__init__,auxfuncs,capi_maps,cb_rules,cfuncs,common_rules,crackfortran,diagnose,f2py2e,f90mod_rules,func2subr,rules,setup,use_rules},ma/{setup,bench},matrixlib/setup,setup,testing/{print_coercion_tables,setup}}.py +sed -i '1s/^#!.*$//' numpy/{compat/setup,random/_examples/cython/setup,distutils/{conv_template,cpuinfo,exec_command,from_template,setup,system_info},f2py/{__init__,auxfuncs,capi_maps,cb_rules,cfuncs,common_rules,crackfortran,diagnose,f2py2e,f90mod_rules,func2subr,rules,setup,use_rules},matrixlib/setup,setup,testing/{print_coercion_tables,setup}}.py sed -i '1s/^#!.*$//' numpy/random/_examples/cython/*.pyx # force cythonization @@ -314,7 +312,15 @@ test_failok+=" or test_float_remainder_overflow" test_failok+=" or test_identityless_reduction_huge_array" test_failok+=" or test_huge_vectordot" # invalid int type for 32bit -test_failok+=" or (test_kind and test_all)" +test_failok+=" or (test_kind and test_quad_precision)" +test_failok+=" or (test_kind and test_int)" +test_failok+=" or (test_kind and test_real)" +%endif +%ifarch %{arm} +# https://github.com/numpy/numpy/issues/24001 +test_failok+=" or (test_cpu_features and test_impossible_feature_enable)" +test_failok+=" or (test_cpu_features and test_features)" +test_failok+=" or (test_umath and test_unary_spurious_fpexception)" %endif %ifarch riscv64 # These tests fail due to non-portable assumptions about the signbit of NaN diff --git a/remove-deprecated-hypothesis-funcs.patch b/remove-deprecated-hypothesis-funcs.patch deleted file mode 100644 index bd6b12a..0000000 --- a/remove-deprecated-hypothesis-funcs.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: numpy-1.24.2/numpy/conftest.py -=================================================================== ---- numpy-1.24.2.orig/numpy/conftest.py -+++ numpy-1.24.2/numpy/conftest.py -@@ -30,7 +30,7 @@ hypothesis.settings.register_profile( - hypothesis.settings.register_profile( - name="np.test() profile", - deadline=None, print_blob=True, database=None, derandomize=True, -- suppress_health_check=hypothesis.HealthCheck.all(), -+ suppress_health_check=list(hypothesis.HealthCheck), - ) - # Note that the default profile is chosen based on the presence - # of pytest.ini, but can be overridden by passing the From 9f3c5f50bd2a959c491e664f3d5ff2c0182790aa68b4e0b6968cf47e0d5aac70 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Mon, 14 Aug 2023 09:26:08 +0000 Subject: [PATCH 2/7] - update to 1.25.2: * Upgrade various build dependencies. * use ``-ftrapping-math`` with Clang on macOS * properly handle negative indexes in ufunc_at fast path * PyObject_IsTrue and PyObject_Not error handling in setflags * histogram small range robust * Update meson.build files from main branch * exclude min, max and round from ``np.__all__`` * Dependabot updates * Fix the signature for np.array_api.take * update OpenBLAS to an intermeidate commit * Fix reference count leak in str(scalar). * fix invalid function pointer conversion error * Factor out slow ``getenv`` call used for memory policy warning * correct URL in cirrus.star [skip cirrus] * Fix C types in scalartypes * do not modify the input to ufunc_at * Further fixes to indexing loop and added tests OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:numeric/python-numpy?expand=0&rev=132 --- numpy-1.25.1.tar.gz | 3 --- numpy-1.25.2.tar.gz | 3 +++ python-numpy.changes | 22 ++++++++++++++++++++++ python-numpy.spec | 10 +++++----- 4 files changed, 30 insertions(+), 8 deletions(-) delete mode 100644 numpy-1.25.1.tar.gz create mode 100644 numpy-1.25.2.tar.gz diff --git a/numpy-1.25.1.tar.gz b/numpy-1.25.1.tar.gz deleted file mode 100644 index 46cae47..0000000 --- a/numpy-1.25.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9a3a9f3a61480cc086117b426a8bd86869c213fc4072e606f01c4e4b66eb92bf -size 10428993 diff --git a/numpy-1.25.2.tar.gz b/numpy-1.25.2.tar.gz new file mode 100644 index 0000000..985add9 --- /dev/null +++ b/numpy-1.25.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fd608e19c8d7c55021dffd43bfe5492fab8cc105cc8986f813f8c3c048b38760 +size 10805282 diff --git a/python-numpy.changes b/python-numpy.changes index 62d4c6b..afeb456 100644 --- a/python-numpy.changes +++ b/python-numpy.changes @@ -1,3 +1,25 @@ +------------------------------------------------------------------- +Mon Aug 14 07:07:51 UTC 2023 - Dirk Müller + +- update to 1.25.2: + * Upgrade various build dependencies. + * use ``-ftrapping-math`` with Clang on macOS + * properly handle negative indexes in ufunc_at fast path + * PyObject_IsTrue and PyObject_Not error handling in setflags + * histogram small range robust + * Update meson.build files from main branch + * exclude min, max and round from ``np.__all__`` + * Dependabot updates + * Fix the signature for np.array_api.take + * update OpenBLAS to an intermeidate commit + * Fix reference count leak in str(scalar). + * fix invalid function pointer conversion error + * Factor out slow ``getenv`` call used for memory policy warning + * correct URL in cirrus.star [skip cirrus] + * Fix C types in scalartypes + * do not modify the input to ufunc_at + * Further fixes to indexing loop and added tests + ------------------------------------------------------------------- Thu Jul 20 13:21:25 UTC 2023 - Guillaume GARDET diff --git a/python-numpy.spec b/python-numpy.spec index d2bc3df..83b9f1a 100644 --- a/python-numpy.spec +++ b/python-numpy.spec @@ -17,8 +17,8 @@ %global flavor @BUILD_FLAVOR@%{nil} -%define ver 1.25.1 -%define _ver 1_25_1 +%define ver 1.25.2 +%define _ver 1_25_2 %define pname python-numpy %define plainpython python %define hpc_upcase_trans_hyph() %(echo %{**} | tr [a-z] [A-Z] | tr '-' '_') @@ -88,7 +88,7 @@ Patch0: numpy-buildfix.patch Patch1: numpy-1.9.0-remove-__declspec.patch # PATCH-FIX-OPENSUSE Ignore DeprecationWarnings when importing pkg_resources Patch2: ignore-pkg_resources-deprecation.patch -BuildRequires: %{python_module Cython >= 0.29.30} +BuildRequires: %{python_module Cython >= 0.29.30 with %python-Cython < 3} BuildRequires: %{python_module base >= 3.8} BuildRequires: %{python_module devel} BuildRequires: %{python_module setuptools >= 60.0.0} @@ -99,8 +99,8 @@ BuildConflicts: gcc11 < 11.2 BuildRequires: fdupes %endif # SECTION test requirements -BuildRequires: %{python_module pytest >= 6.2.5} -BuildRequires: %{python_module hypothesis >= 6.24.1} +BuildRequires: %{python_module pytest >= 7.4.0} +BuildRequires: %{python_module hypothesis >= 6.75.0} BuildRequires: %{python_module pytest-xdist} BuildRequires: %{python_module testsuite} BuildRequires: %{python_module typing-extensions >= 4.2.0} From d3624c65a5f4f11ede943c41fa708a93ac719679a562cc3a6e0266d1978e2408 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Mon, 14 Aug 2023 09:26:27 +0000 Subject: [PATCH 3/7] OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:numeric/python-numpy?expand=0&rev=133 --- python-numpy.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/python-numpy.spec b/python-numpy.spec index 83b9f1a..754f201 100644 --- a/python-numpy.spec +++ b/python-numpy.spec @@ -134,7 +134,9 @@ Requires(postun):update-alternatives %else BuildRequires: %{compiler_family}%{?c_f_ver}-compilers-hpc-macros-devel BuildRequires: libopenblas%{?hpc_ext}-%{compiler_family}%{?c_f_ver}-hpc-devel +%ifnarch %ix86 %arm BuildRequires: lua-lmod +%endif BuildRequires: suse-hpc Requires: libopenblas%{?hpc_ext}-%{compiler_family}%{?c_f_ver}-hpc %endif From a2a44450e831eca1c8aa48c949638e0128e1516b64497909867d2d1ba60c43c9 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Mon, 14 Aug 2023 11:41:11 +0000 Subject: [PATCH 4/7] osc copypac from project:openSUSE:Factory package:python-numpy revision:118, using keep-link, using expand OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:numeric/python-numpy?expand=0&rev=134 --- numpy-1.24.2.tar.gz | 3 ++ numpy-1.25.2.tar.gz | 3 -- python-numpy.changes | 58 ------------------------ python-numpy.spec | 26 ++++------- remove-deprecated-hypothesis-funcs.patch | 13 ++++++ 5 files changed, 25 insertions(+), 78 deletions(-) create mode 100644 numpy-1.24.2.tar.gz delete mode 100644 numpy-1.25.2.tar.gz create mode 100644 remove-deprecated-hypothesis-funcs.patch diff --git a/numpy-1.24.2.tar.gz b/numpy-1.24.2.tar.gz new file mode 100644 index 0000000..e55e483 --- /dev/null +++ b/numpy-1.24.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:003a9f530e880cb2cd177cba1af7220b9aa42def9c4afc2a2fc3ee6be7eb2b22 +size 10906862 diff --git a/numpy-1.25.2.tar.gz b/numpy-1.25.2.tar.gz deleted file mode 100644 index 985add9..0000000 --- a/numpy-1.25.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fd608e19c8d7c55021dffd43bfe5492fab8cc105cc8986f813f8c3c048b38760 -size 10805282 diff --git a/python-numpy.changes b/python-numpy.changes index afeb456..d9d5fad 100644 --- a/python-numpy.changes +++ b/python-numpy.changes @@ -1,61 +1,3 @@ -------------------------------------------------------------------- -Mon Aug 14 07:07:51 UTC 2023 - Dirk Müller - -- update to 1.25.2: - * Upgrade various build dependencies. - * use ``-ftrapping-math`` with Clang on macOS - * properly handle negative indexes in ufunc_at fast path - * PyObject_IsTrue and PyObject_Not error handling in setflags - * histogram small range robust - * Update meson.build files from main branch - * exclude min, max and round from ``np.__all__`` - * Dependabot updates - * Fix the signature for np.array_api.take - * update OpenBLAS to an intermeidate commit - * Fix reference count leak in str(scalar). - * fix invalid function pointer conversion error - * Factor out slow ``getenv`` call used for memory policy warning - * correct URL in cirrus.star [skip cirrus] - * Fix C types in scalartypes - * do not modify the input to ufunc_at - * Further fixes to indexing loop and added tests - -------------------------------------------------------------------- -Thu Jul 20 13:21:25 UTC 2023 - Guillaume GARDET - -- Update to 1.25.1: - * NumPy 1.25.1 is a maintenance release that fixes bugs and regressions - discovered after the 1.25.0 release. The Python versions supported by - this release are 3.9-3.11. - * #23968: MAINT: prepare 1.25.x for further development - * #24036: BLD: Port long double identification to C for meson - * #24037: BUG: Fix reduction return NULL to be goto fail - * #24038: BUG: Avoid undefined behavior in array.astype() - * #24039: BUG: Ensure __array_ufunc__ works without any kwargs passed - * #24117: MAINT: Pin urllib3 to avoid anaconda-client bug. - * #24118: TST: Pin pydantic<2 in Pyodide workflow - * #24119: MAINT: Bump pypa/cibuildwheel from 2.13.0 to 2.13.1 - * #24120: MAINT: Bump actions/checkout from 3.5.2 to 3.5.3 - * #24122: BUG: Multiply or Divides using SIMD without a full vector can... - * #24127: MAINT: testing for IS_MUSL closes #24074 - * #24128: BUG: Only replace dtype temporarily if dimensions changed - * #24129: MAINT: Bump actions/setup-node from 3.6.0 to 3.7.0 - * #24134: BUG: Fix private procedures in f2py modules -- Skipped 1.25.0: - * The NumPy 1.25.0 release continues the ongoing work to improve the - handling and promotion of dtypes, increase the execution speed, and - clarify the documentation. There has also been work to prepare for the - future NumPy 2.0.0 release, resulting in a large number of new and - expired deprecation. Highlights are: - - Support for MUSL, there are now MUSL wheels. - - Support the Fujitsu C/C++ compiler. - - Object arrays are now supported in einsum - - Support for inplace matrix multiplication (@=). - * Full changelog: https://github.com/numpy/numpy/releases/tag/v1.25.0 -The Python versions supported in this release are 3.9-3.11. -- Remove upstream patch: - * remove-deprecated-hypothesis-funcs.patch - ------------------------------------------------------------------- Fri Jun 23 12:23:14 UTC 2023 - Stefan Brüns diff --git a/python-numpy.spec b/python-numpy.spec index 754f201..12382d4 100644 --- a/python-numpy.spec +++ b/python-numpy.spec @@ -17,8 +17,8 @@ %global flavor @BUILD_FLAVOR@%{nil} -%define ver 1.25.2 -%define _ver 1_25_2 +%define ver 1.24.2 +%define _ver 1_24_2 %define pname python-numpy %define plainpython python %define hpc_upcase_trans_hyph() %(echo %{**} | tr [a-z] [A-Z] | tr '-' '_') @@ -88,7 +88,9 @@ Patch0: numpy-buildfix.patch Patch1: numpy-1.9.0-remove-__declspec.patch # PATCH-FIX-OPENSUSE Ignore DeprecationWarnings when importing pkg_resources Patch2: ignore-pkg_resources-deprecation.patch -BuildRequires: %{python_module Cython >= 0.29.30 with %python-Cython < 3} +# PATCH-FIX-OPENSUSE Do not call a deprecated hypothesis health check function +Patch3: remove-deprecated-hypothesis-funcs.patch +BuildRequires: %{python_module Cython >= 0.29.30} BuildRequires: %{python_module base >= 3.8} BuildRequires: %{python_module devel} BuildRequires: %{python_module setuptools >= 60.0.0} @@ -99,8 +101,8 @@ BuildConflicts: gcc11 < 11.2 BuildRequires: fdupes %endif # SECTION test requirements -BuildRequires: %{python_module pytest >= 7.4.0} -BuildRequires: %{python_module hypothesis >= 6.75.0} +BuildRequires: %{python_module pytest >= 6.2.5} +BuildRequires: %{python_module hypothesis >= 6.24.1} BuildRequires: %{python_module pytest-xdist} BuildRequires: %{python_module testsuite} BuildRequires: %{python_module typing-extensions >= 4.2.0} @@ -134,9 +136,7 @@ Requires(postun):update-alternatives %else BuildRequires: %{compiler_family}%{?c_f_ver}-compilers-hpc-macros-devel BuildRequires: libopenblas%{?hpc_ext}-%{compiler_family}%{?c_f_ver}-hpc-devel -%ifnarch %ix86 %arm BuildRequires: lua-lmod -%endif BuildRequires: suse-hpc Requires: libopenblas%{?hpc_ext}-%{compiler_family}%{?c_f_ver}-hpc %endif @@ -184,7 +184,7 @@ This package contains files for developing applications using numpy. %prep %autosetup -p1 -n numpy-%{version} # Fix non-executable scripts -sed -i '1s/^#!.*$//' numpy/{compat/setup,random/_examples/cython/setup,distutils/{conv_template,cpuinfo,exec_command,from_template,setup,system_info},f2py/{__init__,auxfuncs,capi_maps,cb_rules,cfuncs,common_rules,crackfortran,diagnose,f2py2e,f90mod_rules,func2subr,rules,setup,use_rules},matrixlib/setup,setup,testing/{print_coercion_tables,setup}}.py +sed -i '1s/^#!.*$//' numpy/{compat/setup,random/_examples/cython/setup,distutils/{conv_template,cpuinfo,exec_command,from_template,setup,system_info},f2py/{__init__,auxfuncs,capi_maps,cb_rules,cfuncs,common_rules,crackfortran,diagnose,f2py2e,f90mod_rules,func2subr,rules,setup,use_rules},ma/{setup,bench},matrixlib/setup,setup,testing/{print_coercion_tables,setup}}.py sed -i '1s/^#!.*$//' numpy/random/_examples/cython/*.pyx # force cythonization @@ -314,15 +314,7 @@ test_failok+=" or test_float_remainder_overflow" test_failok+=" or test_identityless_reduction_huge_array" test_failok+=" or test_huge_vectordot" # invalid int type for 32bit -test_failok+=" or (test_kind and test_quad_precision)" -test_failok+=" or (test_kind and test_int)" -test_failok+=" or (test_kind and test_real)" -%endif -%ifarch %{arm} -# https://github.com/numpy/numpy/issues/24001 -test_failok+=" or (test_cpu_features and test_impossible_feature_enable)" -test_failok+=" or (test_cpu_features and test_features)" -test_failok+=" or (test_umath and test_unary_spurious_fpexception)" +test_failok+=" or (test_kind and test_all)" %endif %ifarch riscv64 # These tests fail due to non-portable assumptions about the signbit of NaN diff --git a/remove-deprecated-hypothesis-funcs.patch b/remove-deprecated-hypothesis-funcs.patch new file mode 100644 index 0000000..bd6b12a --- /dev/null +++ b/remove-deprecated-hypothesis-funcs.patch @@ -0,0 +1,13 @@ +Index: numpy-1.24.2/numpy/conftest.py +=================================================================== +--- numpy-1.24.2.orig/numpy/conftest.py ++++ numpy-1.24.2/numpy/conftest.py +@@ -30,7 +30,7 @@ hypothesis.settings.register_profile( + hypothesis.settings.register_profile( + name="np.test() profile", + deadline=None, print_blob=True, database=None, derandomize=True, +- suppress_health_check=hypothesis.HealthCheck.all(), ++ suppress_health_check=list(hypothesis.HealthCheck), + ) + # Note that the default profile is chosen based on the presence + # of pytest.ini, but can be overridden by passing the From d68d7a5cc82c59eb7be325bae6e7658103a44c0f42c9452ee04ac35ea86b875e Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Mon, 14 Aug 2023 11:41:41 +0000 Subject: [PATCH 5/7] - limit to Cython < 3 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:numeric/python-numpy?expand=0&rev=135 --- python-numpy.changes | 5 +++++ python-numpy.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/python-numpy.changes b/python-numpy.changes index d9d5fad..e13fddd 100644 --- a/python-numpy.changes +++ b/python-numpy.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Aug 14 11:41:16 UTC 2023 - Dirk Müller + +- limit to Cython < 3 + ------------------------------------------------------------------- Fri Jun 23 12:23:14 UTC 2023 - Stefan Brüns diff --git a/python-numpy.spec b/python-numpy.spec index 12382d4..6107879 100644 --- a/python-numpy.spec +++ b/python-numpy.spec @@ -90,7 +90,7 @@ Patch1: numpy-1.9.0-remove-__declspec.patch Patch2: ignore-pkg_resources-deprecation.patch # PATCH-FIX-OPENSUSE Do not call a deprecated hypothesis health check function Patch3: remove-deprecated-hypothesis-funcs.patch -BuildRequires: %{python_module Cython >= 0.29.30} +BuildRequires: %{python_module Cython >= 0.29.30 with %python-Cython < 3} BuildRequires: %{python_module base >= 3.8} BuildRequires: %{python_module devel} BuildRequires: %{python_module setuptools >= 60.0.0} From bada428c78676b18339dc3d0ce800e96efd88f3e3cfa56f8ea534f2ba52ccf75 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Mon, 14 Aug 2023 11:44:27 +0000 Subject: [PATCH 6/7] - update to 1.25.2: * Upgrade various build dependencies. * use ``-ftrapping-math`` with Clang on macOS * properly handle negative indexes in ufunc_at fast path * PyObject_IsTrue and PyObject_Not error handling in setflags * histogram small range robust * Update meson.build files from main branch * exclude min, max and round from ``np.__all__`` * Dependabot updates * Fix the signature for np.array_api.take * update OpenBLAS to an intermeidate commit * Fix reference count leak in str(scalar). * fix invalid function pointer conversion error * Factor out slow ``getenv`` call used for memory policy warning * correct URL in cirrus.star [skip cirrus] * Fix C types in scalartypes * do not modify the input to ufunc_at * Further fixes to indexing loop and added tests - Update to 1.25.1: * NumPy 1.25.1 is a maintenance release that fixes bugs and regressions discovered after the 1.25.0 release. The Python versions supported by this release are 3.9-3.11. * #23968: MAINT: prepare 1.25.x for further development * #24036: BLD: Port long double identification to C for meson * #24037: BUG: Fix reduction return NULL to be goto fail * #24038: BUG: Avoid undefined behavior in array.astype() * #24039: BUG: Ensure __array_ufunc__ works without any kwargs passed * #24117: MAINT: Pin urllib3 to avoid anaconda-client bug. * #24118: TST: Pin pydantic<2 in Pyodide workflow OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:numeric/python-numpy?expand=0&rev=136 --- numpy-1.24.2.tar.gz | 3 -- numpy-1.25.2.tar.gz | 3 ++ python-numpy.changes | 58 ++++++++++++++++++++++++ python-numpy.spec | 24 ++++++---- remove-deprecated-hypothesis-funcs.patch | 13 ------ 5 files changed, 77 insertions(+), 24 deletions(-) delete mode 100644 numpy-1.24.2.tar.gz create mode 100644 numpy-1.25.2.tar.gz delete mode 100644 remove-deprecated-hypothesis-funcs.patch diff --git a/numpy-1.24.2.tar.gz b/numpy-1.24.2.tar.gz deleted file mode 100644 index e55e483..0000000 --- a/numpy-1.24.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:003a9f530e880cb2cd177cba1af7220b9aa42def9c4afc2a2fc3ee6be7eb2b22 -size 10906862 diff --git a/numpy-1.25.2.tar.gz b/numpy-1.25.2.tar.gz new file mode 100644 index 0000000..985add9 --- /dev/null +++ b/numpy-1.25.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fd608e19c8d7c55021dffd43bfe5492fab8cc105cc8986f813f8c3c048b38760 +size 10805282 diff --git a/python-numpy.changes b/python-numpy.changes index e13fddd..5487e93 100644 --- a/python-numpy.changes +++ b/python-numpy.changes @@ -3,6 +3,64 @@ Mon Aug 14 11:41:16 UTC 2023 - Dirk Müller - limit to Cython < 3 +------------------------------------------------------------------- +Mon Aug 14 07:07:51 UTC 2023 - Dirk Müller + +- update to 1.25.2: + * Upgrade various build dependencies. + * use ``-ftrapping-math`` with Clang on macOS + * properly handle negative indexes in ufunc_at fast path + * PyObject_IsTrue and PyObject_Not error handling in setflags + * histogram small range robust + * Update meson.build files from main branch + * exclude min, max and round from ``np.__all__`` + * Dependabot updates + * Fix the signature for np.array_api.take + * update OpenBLAS to an intermeidate commit + * Fix reference count leak in str(scalar). + * fix invalid function pointer conversion error + * Factor out slow ``getenv`` call used for memory policy warning + * correct URL in cirrus.star [skip cirrus] + * Fix C types in scalartypes + * do not modify the input to ufunc_at + * Further fixes to indexing loop and added tests + +------------------------------------------------------------------- +Thu Jul 20 13:21:25 UTC 2023 - Guillaume GARDET + +- Update to 1.25.1: + * NumPy 1.25.1 is a maintenance release that fixes bugs and regressions + discovered after the 1.25.0 release. The Python versions supported by + this release are 3.9-3.11. + * #23968: MAINT: prepare 1.25.x for further development + * #24036: BLD: Port long double identification to C for meson + * #24037: BUG: Fix reduction return NULL to be goto fail + * #24038: BUG: Avoid undefined behavior in array.astype() + * #24039: BUG: Ensure __array_ufunc__ works without any kwargs passed + * #24117: MAINT: Pin urllib3 to avoid anaconda-client bug. + * #24118: TST: Pin pydantic<2 in Pyodide workflow + * #24119: MAINT: Bump pypa/cibuildwheel from 2.13.0 to 2.13.1 + * #24120: MAINT: Bump actions/checkout from 3.5.2 to 3.5.3 + * #24122: BUG: Multiply or Divides using SIMD without a full vector can... + * #24127: MAINT: testing for IS_MUSL closes #24074 + * #24128: BUG: Only replace dtype temporarily if dimensions changed + * #24129: MAINT: Bump actions/setup-node from 3.6.0 to 3.7.0 + * #24134: BUG: Fix private procedures in f2py modules +- Skipped 1.25.0: + * The NumPy 1.25.0 release continues the ongoing work to improve the + handling and promotion of dtypes, increase the execution speed, and + clarify the documentation. There has also been work to prepare for the + future NumPy 2.0.0 release, resulting in a large number of new and + expired deprecation. Highlights are: + - Support for MUSL, there are now MUSL wheels. + - Support the Fujitsu C/C++ compiler. + - Object arrays are now supported in einsum + - Support for inplace matrix multiplication (@=). + * Full changelog: https://github.com/numpy/numpy/releases/tag/v1.25.0 +The Python versions supported in this release are 3.9-3.11. +- Remove upstream patch: + * remove-deprecated-hypothesis-funcs.patch + ------------------------------------------------------------------- Fri Jun 23 12:23:14 UTC 2023 - Stefan Brüns diff --git a/python-numpy.spec b/python-numpy.spec index 6107879..754f201 100644 --- a/python-numpy.spec +++ b/python-numpy.spec @@ -17,8 +17,8 @@ %global flavor @BUILD_FLAVOR@%{nil} -%define ver 1.24.2 -%define _ver 1_24_2 +%define ver 1.25.2 +%define _ver 1_25_2 %define pname python-numpy %define plainpython python %define hpc_upcase_trans_hyph() %(echo %{**} | tr [a-z] [A-Z] | tr '-' '_') @@ -88,8 +88,6 @@ Patch0: numpy-buildfix.patch Patch1: numpy-1.9.0-remove-__declspec.patch # PATCH-FIX-OPENSUSE Ignore DeprecationWarnings when importing pkg_resources Patch2: ignore-pkg_resources-deprecation.patch -# PATCH-FIX-OPENSUSE Do not call a deprecated hypothesis health check function -Patch3: remove-deprecated-hypothesis-funcs.patch BuildRequires: %{python_module Cython >= 0.29.30 with %python-Cython < 3} BuildRequires: %{python_module base >= 3.8} BuildRequires: %{python_module devel} @@ -101,8 +99,8 @@ BuildConflicts: gcc11 < 11.2 BuildRequires: fdupes %endif # SECTION test requirements -BuildRequires: %{python_module pytest >= 6.2.5} -BuildRequires: %{python_module hypothesis >= 6.24.1} +BuildRequires: %{python_module pytest >= 7.4.0} +BuildRequires: %{python_module hypothesis >= 6.75.0} BuildRequires: %{python_module pytest-xdist} BuildRequires: %{python_module testsuite} BuildRequires: %{python_module typing-extensions >= 4.2.0} @@ -136,7 +134,9 @@ Requires(postun):update-alternatives %else BuildRequires: %{compiler_family}%{?c_f_ver}-compilers-hpc-macros-devel BuildRequires: libopenblas%{?hpc_ext}-%{compiler_family}%{?c_f_ver}-hpc-devel +%ifnarch %ix86 %arm BuildRequires: lua-lmod +%endif BuildRequires: suse-hpc Requires: libopenblas%{?hpc_ext}-%{compiler_family}%{?c_f_ver}-hpc %endif @@ -184,7 +184,7 @@ This package contains files for developing applications using numpy. %prep %autosetup -p1 -n numpy-%{version} # Fix non-executable scripts -sed -i '1s/^#!.*$//' numpy/{compat/setup,random/_examples/cython/setup,distutils/{conv_template,cpuinfo,exec_command,from_template,setup,system_info},f2py/{__init__,auxfuncs,capi_maps,cb_rules,cfuncs,common_rules,crackfortran,diagnose,f2py2e,f90mod_rules,func2subr,rules,setup,use_rules},ma/{setup,bench},matrixlib/setup,setup,testing/{print_coercion_tables,setup}}.py +sed -i '1s/^#!.*$//' numpy/{compat/setup,random/_examples/cython/setup,distutils/{conv_template,cpuinfo,exec_command,from_template,setup,system_info},f2py/{__init__,auxfuncs,capi_maps,cb_rules,cfuncs,common_rules,crackfortran,diagnose,f2py2e,f90mod_rules,func2subr,rules,setup,use_rules},matrixlib/setup,setup,testing/{print_coercion_tables,setup}}.py sed -i '1s/^#!.*$//' numpy/random/_examples/cython/*.pyx # force cythonization @@ -314,7 +314,15 @@ test_failok+=" or test_float_remainder_overflow" test_failok+=" or test_identityless_reduction_huge_array" test_failok+=" or test_huge_vectordot" # invalid int type for 32bit -test_failok+=" or (test_kind and test_all)" +test_failok+=" or (test_kind and test_quad_precision)" +test_failok+=" or (test_kind and test_int)" +test_failok+=" or (test_kind and test_real)" +%endif +%ifarch %{arm} +# https://github.com/numpy/numpy/issues/24001 +test_failok+=" or (test_cpu_features and test_impossible_feature_enable)" +test_failok+=" or (test_cpu_features and test_features)" +test_failok+=" or (test_umath and test_unary_spurious_fpexception)" %endif %ifarch riscv64 # These tests fail due to non-portable assumptions about the signbit of NaN diff --git a/remove-deprecated-hypothesis-funcs.patch b/remove-deprecated-hypothesis-funcs.patch deleted file mode 100644 index bd6b12a..0000000 --- a/remove-deprecated-hypothesis-funcs.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: numpy-1.24.2/numpy/conftest.py -=================================================================== ---- numpy-1.24.2.orig/numpy/conftest.py -+++ numpy-1.24.2/numpy/conftest.py -@@ -30,7 +30,7 @@ hypothesis.settings.register_profile( - hypothesis.settings.register_profile( - name="np.test() profile", - deadline=None, print_blob=True, database=None, derandomize=True, -- suppress_health_check=hypothesis.HealthCheck.all(), -+ suppress_health_check=list(hypothesis.HealthCheck), - ) - # Note that the default profile is chosen based on the presence - # of pytest.ini, but can be overridden by passing the From 10d8d19460a5232b499722629c700c632d46e76522a13f565ba0ca86b7c0730c Mon Sep 17 00:00:00 2001 From: Daniel Garcia Date: Thu, 17 Aug 2023 06:05:47 +0000 Subject: [PATCH 7/7] Accepting request 1104160 from home:dgarcia:branches:devel:languages:python:numeric - Use %pyproject_wheel and %pyproject_install macros - Disable broken tests in armv7l (bsc#1212710) OBS-URL: https://build.opensuse.org/request/show/1104160 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:numeric/python-numpy?expand=0&rev=137 --- python-numpy.changes | 6 ++++++ python-numpy.spec | 11 +++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/python-numpy.changes b/python-numpy.changes index 5487e93..9f2a2ab 100644 --- a/python-numpy.changes +++ b/python-numpy.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Aug 16 11:31:28 UTC 2023 - Daniel Garcia + +- Use %pyproject_wheel and %pyproject_install macros +- Disable broken tests in armv7l (bsc#1212710) + ------------------------------------------------------------------- Mon Aug 14 11:41:16 UTC 2023 - Dirk Müller diff --git a/python-numpy.spec b/python-numpy.spec index 754f201..f075d8b 100644 --- a/python-numpy.spec +++ b/python-numpy.spec @@ -91,7 +91,9 @@ Patch2: ignore-pkg_resources-deprecation.patch BuildRequires: %{python_module Cython >= 0.29.30 with %python-Cython < 3} BuildRequires: %{python_module base >= 3.8} BuildRequires: %{python_module devel} +BuildRequires: %{python_module pip} BuildRequires: %{python_module setuptools >= 60.0.0} +BuildRequires: %{python_module wheel} BuildRequires: gcc-c++ BuildRequires: python-rpm-macros >= 20210929 BuildConflicts: gcc11 < 11.2 @@ -206,13 +208,13 @@ EOF export CFLAGS="%{optflags} -fno-strict-aliasing" %endif -%python_build +%pyproject_wheel %install %{?with_hpc:%hpc_setup} %{?with_hpc:module load openblas} -%python_exec setup.py install --prefix=%{p_prefix} --root=%{buildroot} +%pyproject_install --prefix %{p_prefix} --root %{buildroot} %if !%{with hpc} %python_clone -a %{buildroot}%{_bindir}/f2py @@ -317,6 +319,7 @@ test_failok+=" or test_huge_vectordot" test_failok+=" or (test_kind and test_quad_precision)" test_failok+=" or (test_kind and test_int)" test_failok+=" or (test_kind and test_real)" +test_failok+=" or (test_multinomial_pvals_float32)" %endif %ifarch %{arm} # https://github.com/numpy/numpy/issues/24001 @@ -373,7 +376,7 @@ popd %endif %{_bindir}/f2py%{python_bin_suffix} %{python_sitearch}/numpy/ -%{python_sitearch}/numpy-%{version}-py*.egg-info +%{python_sitearch}/numpy-%{version}*-info %license %{python_sitearch}/numpy/LICENSE.txt %exclude %{python_sitearch}/numpy/core/include/ %exclude %{python_sitearch}/numpy/distutils/mingw/*.c @@ -391,7 +394,7 @@ popd %endif %{p_bindir}/f2py%{python_bin_suffix} %{p_python_sitearch}/numpy/ -%{p_python_sitearch}/numpy-%{version}-py*.egg-info +%{p_python_sitearch}/numpy-%{version}*-info %license %{p_python_sitearch}/numpy/LICENSE.txt %exclude %{p_python_sitearch}/numpy/core/include/ %exclude %{p_python_sitearch}/numpy/core/lib/libnpymath.a