diff --git a/21543.patch b/21543.patch deleted file mode 100644 index 68c9654e3b44ebe762a8207b73eac2e1d2426a61..0000000000000000000000000000000000000000 --- a/21543.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 42f3203a45231b338cf1a4c77fe81ca4b7fef4ef Mon Sep 17 00:00:00 2001 -From: Bas van Beek <43369155+BvB93@users.noreply.github.com> -Date: Fri, 20 May 2022 02:42:37 +0200 -Subject: [PATCH 1/2] TST,TYP: Fix a python 3.11 failure for the `GenericAlias` - tests - ---- - numpy/typing/tests/test_generic_alias.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/numpy/typing/tests/test_generic_alias.py b/numpy/typing/tests/test_generic_alias.py -index 52d3deae4ed..267230a95d6 100644 ---- a/numpy/typing/tests/test_generic_alias.py -+++ b/numpy/typing/tests/test_generic_alias.py -@@ -20,11 +20,11 @@ - if sys.version_info >= (3, 9): - DType_ref = types.GenericAlias(np.dtype, (ScalarType,)) - NDArray_ref = types.GenericAlias(np.ndarray, (Any, DType_ref)) -- FuncType = Callable[[Union[_GenericAlias, types.GenericAlias]], Any] -+ FuncType = Callable[["_GenericAlias | types.GenericAlias"], Any] - else: - DType_ref = Any - NDArray_ref = Any -- FuncType = Callable[[_GenericAlias], Any] -+ FuncType = Callable[["_GenericAlias"], Any] - - GETATTR_NAMES = sorted(set(dir(np.ndarray)) - _GenericAlias._ATTR_EXCEPTIONS) - - -From 7c98e8c18c147bcbf6f9344376ca380a5d8f6c7b Mon Sep 17 00:00:00 2001 -From: Bas van Beek -Date: Fri, 20 May 2022 19:24:38 +0200 -Subject: [PATCH 2/2] DOC: Add a note about `npt._GenericAlias` >=3.11 - stability - ---- - numpy/typing/tests/test_generic_alias.py | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/numpy/typing/tests/test_generic_alias.py b/numpy/typing/tests/test_generic_alias.py -index 267230a95d6..ae55ef43951 100644 ---- a/numpy/typing/tests/test_generic_alias.py -+++ b/numpy/typing/tests/test_generic_alias.py -@@ -17,6 +17,10 @@ - DType = _GenericAlias(np.dtype, (ScalarType,)) - NDArray = _GenericAlias(np.ndarray, (Any, DType)) - -+# NOTE: The `npt._GenericAlias` *class* isn't quite stable on python >=3.11. -+# This is not a problem during runtime (as it's 3.8-exclusive), but we still -+# need it for the >=3.9 in order to verify its semantics match -+# `types.GenericAlias` replacement. xref numpy/numpy#21526 - if sys.version_info >= (3, 9): - DType_ref = types.GenericAlias(np.dtype, (ScalarType,)) - NDArray_ref = types.GenericAlias(np.ndarray, (Any, DType_ref)) diff --git a/numpy-1.22.0.tar.gz b/numpy-1.24.1.tar.gz similarity index 55% rename from numpy-1.22.0.tar.gz rename to numpy-1.24.1.tar.gz index ef7c82f769b0056ab3321de9a1ab2aa17cb5b7ec..4c3e03be2a724ab19a254e95df5f823ffac3a928 100644 Binary files a/numpy-1.22.0.tar.gz and b/numpy-1.24.1.tar.gz differ diff --git a/numpy-html.zip b/numpy-html.zip index bef3f267502e88670c79b3f582cea08b348d912a..4ff0519980895aed405d380bb2a4c74cee8bdca5 100644 Binary files a/numpy-html.zip and b/numpy-html.zip differ diff --git a/numpy.spec b/numpy.spec index a790d3d80eae7f11d68562cbda121591cce9243f..ccacec34de17183e4e3c8b06a1fde1f8c2e5748e 100644 --- a/numpy.spec +++ b/numpy.spec @@ -6,7 +6,7 @@ %global modname numpy Name: numpy -Version: 1.22.0 +Version: 1.24.1 Release: %{anolis_release}%{?dist} Epoch: 1 Summary: A fast multidimensional array facility for Python @@ -15,9 +15,7 @@ Summary: A fast multidimensional array facility for Python License: BSD and Python and ASL 2.0 URL: http://www.numpy.org/ Source0: https://github.com/%{name}/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.gz -Source1: https://numpy.org/doc/1.19/numpy-html.zip -# Upstream issue: https://github.com/numpy/numpy/issues/21526 -Patch0: 21543.patch +Source1: https://numpy.org/doc/1.24/numpy-html.zip %description NumPy is a general-purpose array-processing package designed to @@ -43,7 +41,7 @@ Obsoletes: numpy < 1:1.10.1-3 BuildRequires: python3-devel BuildRequires: python3-setuptools -BuildRequires: python3-Cython +BuildRequires: python3-Cython >= 0.29.30 BuildRequires: gcc-gfortran gcc gcc-c++ BuildRequires: lapack-devel %if %{with tests} @@ -181,6 +179,8 @@ python3 runtests.py --no-build -- -ra -k 'not test_ppc64_ibm_double_double128 an %{python3_sitearch}/%{name}/py.typed %{python3_sitearch}/%{name}/typing/ %{python3_sitearch}/%{name}/array_api/ +%{python3_sitearch}/%{name}/_pyinstaller/ +%{python3_sitearch}/%{name}/_typing/ %files -n python3-numpy-f2py %{_bindir}/f2py @@ -194,5 +194,8 @@ python3 runtests.py --no-build -- -ra -k 'not test_ppc64_ibm_double_double128 an %changelog +* Fri Jan 27 2023 Funda Wang - 1:1.24.1-1 +- New version 1.24.1 + * Tue Jul 12 2022 happy_orange - 1:1.22.0-1 - Init pcakage from upstream