From 959db8da6577c5966a5f7dab0b1f0f58b3e3d77a56a17198b88bd3c47dcc8286 Mon Sep 17 00:00:00 2001 From: Steve Kowalik Date: Mon, 20 Nov 2023 05:10:29 +0000 Subject: [PATCH] - Update to 1.26.2: * TYP: Trim down the ``_NestedSequence.__getitem__`` signature * BUG: fix choose refcount leak * TST: fix running the test suite in builds without BLAS/LAPACK * BUG: random: Fix generation of nan by dirichlet. * TST: fix distutils tests for deprecations in recent setuptools... * MAINT: Remove versioneer * MAINT: Pin upper version of sphinx. * ENH: Add prefix to _ALIGN Macro * BUG: cleanup warnings [skip azp][skip circle][skip travis][skip... * BUG: ``asv dev`` has been removed, use ``asv run``. * BUG: Fix meson build failure due to unchanged inplace auto-generated... * BUG: fix issue with git-version script, needs a shebang to run * BUG: Use a default assignment for git_hash [skip ci] * BUG: fix NPY_cast_info error handling in choose * BUG: Fix common block handling in f2py * BUG: Fix assumed length f2py regression * MAINT: Harmonize fortranobject * TYP: add kind argument to numpy.isin type specification * BUG: fix comparisons between masked and unmasked structured arrays * ENH: Adopt new macOS Accelerate BLAS/LAPACK Interfaces, including... * TYP: Add the missing ``casting`` keyword to ``np.clip`` * TST: convert cython test from setup.py to meson * MAINT: Fixup ``fromnumeric.pyi`` * BUG, ENH: Fix ``iso_c_binding`` type maps * TYP: Allow ``binary_repr`` to accept any object * TYP: Explicitly declare ``dtype`` and ``generic`` hashable * ENH: Refactor the typing "reveal" tests using `typing.assert_type` * ENH: ``meson`` backend for ``f2py`` * MAINT: Refactor partial load Workaround for Clang OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:numeric/python-numpy?expand=0&rev=143 --- ignore-pkg_resources-deprecation.patch | 12 ------ numpy-1.25.2.tar.gz | 3 -- numpy-1.26.2.tar.gz | 3 ++ python-numpy.changes | 59 ++++++++++++++++++++++++++ python-numpy.spec | 41 +++++++----------- 5 files changed, 78 insertions(+), 40 deletions(-) delete mode 100644 ignore-pkg_resources-deprecation.patch delete mode 100644 numpy-1.25.2.tar.gz create mode 100644 numpy-1.26.2.tar.gz diff --git a/ignore-pkg_resources-deprecation.patch b/ignore-pkg_resources-deprecation.patch deleted file mode 100644 index d705897..0000000 --- a/ignore-pkg_resources-deprecation.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: numpy-1.24.2/pytest.ini -=================================================================== ---- numpy-1.24.2.orig/pytest.ini -+++ numpy-1.24.2/pytest.ini -@@ -25,5 +25,7 @@ filterwarnings = - # Ignore DeprecationWarnings from distutils - ignore::DeprecationWarning:.*distutils - ignore:\n\n `numpy.distutils`:DeprecationWarning -+# Ignore DeprecationWarning from pkg_resources -+ ignore:pkg_resources:DeprecationWarning - # Ignore mypy >= 0.971 DeprecationWarnings - ignore:path is deprecated\. Use files\(\) instead:DeprecationWarning:mypy 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/numpy-1.26.2.tar.gz b/numpy-1.26.2.tar.gz new file mode 100644 index 0000000..0a88fe4 --- /dev/null +++ b/numpy-1.26.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f65738447676ab5777f11e6bbbdb8ce11b785e105f690bc45966574816b6d3ea +size 15664248 diff --git a/python-numpy.changes b/python-numpy.changes index 81f4d10..ee9f05d 100644 --- a/python-numpy.changes +++ b/python-numpy.changes @@ -1,3 +1,62 @@ +------------------------------------------------------------------- +Mon Nov 20 05:09:33 UTC 2023 - Steve Kowalik + +- Update to 1.26.2: + * TYP: Trim down the ``_NestedSequence.__getitem__`` signature + * BUG: fix choose refcount leak + * TST: fix running the test suite in builds without BLAS/LAPACK + * BUG: random: Fix generation of nan by dirichlet. + * TST: fix distutils tests for deprecations in recent setuptools... + * MAINT: Remove versioneer + * MAINT: Pin upper version of sphinx. + * ENH: Add prefix to _ALIGN Macro + * BUG: cleanup warnings [skip azp][skip circle][skip travis][skip... + * BUG: ``asv dev`` has been removed, use ``asv run``. + * BUG: Fix meson build failure due to unchanged inplace auto-generated... + * BUG: fix issue with git-version script, needs a shebang to run + * BUG: Use a default assignment for git_hash [skip ci] + * BUG: fix NPY_cast_info error handling in choose + * BUG: Fix common block handling in f2py + * BUG: Fix assumed length f2py regression + * MAINT: Harmonize fortranobject + * TYP: add kind argument to numpy.isin type specification + * BUG: fix comparisons between masked and unmasked structured arrays + * ENH: Adopt new macOS Accelerate BLAS/LAPACK Interfaces, including... + * TYP: Add the missing ``casting`` keyword to ``np.clip`` + * TST: convert cython test from setup.py to meson + * MAINT: Fixup ``fromnumeric.pyi`` + * BUG, ENH: Fix ``iso_c_binding`` type maps + * TYP: Allow ``binary_repr`` to accept any object + * TYP: Explicitly declare ``dtype`` and ``generic`` hashable + * ENH: Refactor the typing "reveal" tests using `typing.assert_type` + * ENH: ``meson`` backend for ``f2py`` + * MAINT: Refactor partial load Workaround for Clang + * BUG: Fix data stmt handling for complex values in f2py + * TYP: Add annotations for the py3.12 buffer protocol + * DOC: Updated the f2py docs to remove a note on -fimplicit-none + * BUG: Fix SIMD f32 trunc test on s390x when baseline is none + * BUG: Fix DATA statements for f2py + * API: Add ``NumpyUnpickler`` for backporting + * MAINT: Xfail test failing on PyPy. + * ENH: meson: implement BLAS/LAPACK auto-detection + * DOC: add a 1.26.1 release notes section for BLAS/LAPACK build + * MAINT: Backport ``numpy._core`` stubs. Remove ``NumpyUnpickler`` + * BUG: loongarch doesn't use REAL(10) + * MAINT: align test_dispatcher s390x targets with _umath_tests_mtargets + * ENH: Add Cython enumeration for NPY_FR_GENERIC + * MAINT: Remove unhelpful error replacements from ``import_array()`` + * BUG: Avoid intp conversion regression in Cython 3 + * MAINT: Add missing ``noexcept`` to shuffle helpers + * DOC: Fix license identifier for OpenBLAS + * BLD: improve detection of Netlib libblas/libcblas/liblapack + * MAINT: Make bitfield integers unsigned + * BUG: Make n a long int for np.random.multinomial + * BUG: ensure passing ``np.dtype`` to itself doesn't crash +- Update BuildRequires as appropiate, build system changed from setuptools + to meson. +- Drop patch ignore-pkg_resources-deprecation.patch, no longer required +- f2py3 no longer shipped + ------------------------------------------------------------------- Wed Aug 16 11:31:28 UTC 2023 - Daniel Garcia diff --git a/python-numpy.spec b/python-numpy.spec index f075d8b..131b732 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.26.2 +%define _ver 1_26_2 %define pname python-numpy %define plainpython python %define hpc_upcase_trans_hyph() %(echo %{**} | tr [a-z] [A-Z] | tr '-' '_') @@ -86,15 +86,18 @@ Source99: python-numpy-rpmlintrc Patch0: numpy-buildfix.patch # PATCH-FIX-OPENSUSE numpy-1.9.0-remove-__declspec.patch -- fix for spurious compiler warnings that cause build failure 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} -BuildRequires: %{python_module base >= 3.8} +BuildRequires: %{python_module Cython >= 3.0} +BuildRequires: %{python_module base >= 3.9} BuildRequires: %{python_module devel} +BuildRequires: %{python_module meson-python >= 0.13} BuildRequires: %{python_module pip} -BuildRequires: %{python_module setuptools >= 60.0.0} +BuildRequires: %{python_module pyproject-metadata >= 0.7.1} BuildRequires: %{python_module wheel} +BuildRequires: cmake +BuildRequires: gcc BuildRequires: gcc-c++ +BuildRequires: ninja >= 1.8.2 +BuildRequires: patchelf BuildRequires: python-rpm-macros >= 20210929 BuildConflicts: gcc11 < 11.2 %if 0%{?suse_version} @@ -186,7 +189,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,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 @@ -218,9 +221,6 @@ export CFLAGS="%{optflags} -fno-strict-aliasing" %if !%{with hpc} %python_clone -a %{buildroot}%{_bindir}/f2py -%python_expand rm %{buildroot}%{$python_sitearch}/numpy/core/include/numpy/.doxyfile -%else -rm %{buildroot}%{p_python_sitearch}/numpy/core/include/numpy/.doxyfile %endif %if 0%{?suse_version} @@ -347,7 +347,8 @@ export PYTHONPATH=%{buildroot}%{$python_sitearch} export PYTHONDONTWRITEBYTECODE=1 [ -n "$test_failok" ] && $python runobstest.py "${test_failok:4}" ||: # test_new_policy: duplicates test runs and output and does not follow our deselection -$python runobstest.py "not (test_new_policy ${test_failok})" +# test_cython: https://github.com/numpy/numpy/issues/24956 +$python runobstest.py "not (test_new_policy ${test_failok} or slow or test_cython)" } popd @@ -367,17 +368,11 @@ popd %files %{python_files} %doc README.md THANKS.txt +%license LICENSE.txt %if %{without hpc} %python_alternative %{_bindir}/f2py -%if "%{python_flavor}" == "python3" || "%{python_provides}" == "python3" -%{_bindir}/f2py3 -%else -%exclude %{_bindir}/f2py3 -%endif -%{_bindir}/f2py%{python_bin_suffix} %{python_sitearch}/numpy/ -%{python_sitearch}/numpy-%{version}*-info -%license %{python_sitearch}/numpy/LICENSE.txt +%{python_sitearch}/numpy-%{version}.dist-info %exclude %{python_sitearch}/numpy/core/include/ %exclude %{python_sitearch}/numpy/distutils/mingw/*.c %exclude %{python_sitearch}/numpy/distutils/checks/*.c @@ -387,15 +382,11 @@ popd %else %if "%{python_flavor}" == "python3" || "%{python_provides}" == "python3" %{p_bindir}/f2py -%{p_bindir}/f2py3 %else %exclude %{p_bindir}/f2py -%exclude %{p_bindir}/f2py3 %endif -%{p_bindir}/f2py%{python_bin_suffix} %{p_python_sitearch}/numpy/ -%{p_python_sitearch}/numpy-%{version}*-info -%license %{p_python_sitearch}/numpy/LICENSE.txt +%{p_python_sitearch}/numpy-%{version}.dist-info %exclude %{p_python_sitearch}/numpy/core/include/ %exclude %{p_python_sitearch}/numpy/core/lib/libnpymath.a %exclude %{p_python_sitearch}/numpy/random/lib/libnpyrandom.a