From cd04272a2edf14cf5a55e94b208ee8eac107451f Mon Sep 17 00:00:00 2001 From: lyn1001 Date: Thu, 29 Feb 2024 15:50:17 +0800 Subject: [PATCH] make the test check --- ...rward-__-deep-copy__-calls-of-_Gener.patch | 64 +++++++++++++++++++ numpy.spec | 10 ++- 2 files changed, 73 insertions(+), 1 deletion(-) create mode 100644 backport-MAINT-Do-not-forward-__-deep-copy__-calls-of-_Gener.patch diff --git a/backport-MAINT-Do-not-forward-__-deep-copy__-calls-of-_Gener.patch b/backport-MAINT-Do-not-forward-__-deep-copy__-calls-of-_Gener.patch new file mode 100644 index 0000000..a23d15c --- /dev/null +++ b/backport-MAINT-Do-not-forward-__-deep-copy__-calls-of-_Gener.patch @@ -0,0 +1,64 @@ +From 8871c7285fc097fd1bf713aa184cba7e2804f625 Mon Sep 17 00:00:00 2 +001 +From: Bas van Beek +Date: Wed, 10 Nov 2021 15:36:00 +0100 +Subject: [PATCH] MAINT: Do not forward `__(deep)copy__` calls of + `_GenericAlias` to the wrapped type + +Adapt to the python 3.9.8 changes made in bpo-45167. + +--- + numpy/typing/_generic_alias.py | 2 ++ + numpy/typing/tests/test_generic_alias.py | 16 ++++++++++++++++ + 2 files changed, 18 insertions(+) + +diff --git a/numpy/typing/_generic_alias.py b/numpy/typing/_generic_alias.py +index 6852382..4195cd9 100644 +--- a/numpy/typing/_generic_alias.py ++++ b/numpy/typing/_generic_alias.py +@@ -178,6 +178,8 @@ class _GenericAlias: + "__mro_entries__", + "__reduce__", + "__reduce_ex__", ++ "__copy__", ++ "__deepcopy__", + }) + + def __getattribute__(self, name: str) -> Any: +diff --git a/numpy/typing/tests/test_generic_alias.py b/numpy/typing/tests/test_generic_alias.py +index 5f0ac91..35c0da3 100644 +--- a/numpy/typing/tests/test_generic_alias.py ++++ b/numpy/typing/tests/test_generic_alias.py +@@ -1,6 +1,7 @@ + from __future__ import annotations + + import sys ++import copy + import types + import pickle + import weakref +@@ -74,6 +75,21 @@ class TestGenericAlias: + value_ref = func(NDArray_ref) + assert value == value_ref + ++ @pytest.mark.parametrize("name,func", [ ++ ("__copy__", lambda n: n == copy.copy(n)), ++ ("__deepcopy__", lambda n: n == copy.deepcopy(n)), ++ ]) ++ def test_copy(self, name: str, func: FuncType) -> None: ++ value = func(NDArray) ++ ++ # xref bpo-45167 ++ GE_398 = ( ++ sys.version_info[:2] == (3, 9) and sys.version_info >= (3, 9, 8) ++ ) ++ if GE_398 or sys.version_info >= (3, 10, 1): ++ value_ref = func(NDArray_ref) ++ assert value == value_ref ++ + def test_weakref(self) -> None: + """Test ``__weakref__``.""" + value = weakref.ref(NDArray)() +-- +2.27.0 + diff --git a/numpy.spec b/numpy.spec index 05f9cda..957bb54 100644 --- a/numpy.spec +++ b/numpy.spec @@ -2,7 +2,7 @@ Name: numpy Version: 1.21.4 -Release: 7 +Release: 8 Epoch: 1 Summary: A fast multidimensional array facility for Python @@ -13,6 +13,7 @@ Source0: https://files.pythonhosted.org/packages/fb/48/b0708ebd7718a8933f BuildRequires: openblas-devel BuildRequires: lapack-devel gcc-gfortran BuildRequires: python3-Cython >= 0.29.24 +BuildRequires: python3-hypothesis Patch0: backport-CVE-2021-41496.patch Patch1: backport-CVE-2021-41495.patch @@ -20,6 +21,7 @@ Patch2: backport-CVE-2021-34141.patch Patch1000: numpy-1.21.4-sw.patch Patch1001: add-loongarch-architecture-support.patch +Patch1002: backport-MAINT-Do-not-forward-__-deep-copy__-calls-of-_Gener.patch %description NumPy is the fundamental package for scientific computing with Python. It contains among other things: @@ -112,6 +114,12 @@ popd &> /dev/null %exclude %{python3_sitearch}/%{name}/f2py/tests/ %changelog +* Thu Feb 29 2024 liyanan - 1:1.21.4-8 +- Type:bugfix +- CVE:NA +- SUG:NA +- DESC:make the test check + * Thu Feb 01 2024 shixuantong - 1:1.21.4-7 - Do not pack open-source test case files -- Gitee