From 46d5a03e250c7c8d67aebe9b321debbd7fbf40a2bf4903c01141c408fcb92c9e Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Sun, 29 May 2022 18:35:40 +0000 Subject: [PATCH] - update to 1.21.6: * Do not forward `__(deep)copy__` calls of `_GenericAlias`... * Fix float16 einsum fastpaths using wrong tempvar * Print os error message when the executable not exist * Force ``npymath` ` to respect ``npy_longdouble`` * Fix failure to create aligned, empty structured dtype * provide a convenience function to replace npy_load_module * update wheel to version that supports python3.10 * Clear errors correctly in F2PY conversions * add a warningfilter to fix pytest workflow. * Help boost::python libraries at least not crash - drop bpo-45167-fixes.patch (upstream) OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:numeric/python-numpy?expand=0&rev=105 --- bpo-45167-fixes.patch | 59 ------------------------------------------- numpy-1.21.4.zip | 3 --- numpy-1.21.6.zip | 3 +++ python-numpy.changes | 16 ++++++++++++ python-numpy.spec | 8 +++--- 5 files changed, 22 insertions(+), 67 deletions(-) delete mode 100644 bpo-45167-fixes.patch delete mode 100644 numpy-1.21.4.zip create mode 100644 numpy-1.21.6.zip diff --git a/bpo-45167-fixes.patch b/bpo-45167-fixes.patch deleted file mode 100644 index fdd8932..0000000 --- a/bpo-45167-fixes.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 8871c7285fc097fd1bf713aa184cba7e2804f625 Mon Sep 17 00:00:00 2001 -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 932f12dd05d..1eb2c8c05f0 100644 ---- a/numpy/typing/_generic_alias.py -+++ b/numpy/typing/_generic_alias.py -@@ -185,6 +185,8 @@ def __eq__(self, value: object) -> bool: - "__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 3021d985934..39343420bdc 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 -@@ -80,6 +81,21 @@ def test_pass(self, name: str, func: FuncType) -> None: - 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)() diff --git a/numpy-1.21.4.zip b/numpy-1.21.4.zip deleted file mode 100644 index 078ed24..0000000 --- a/numpy-1.21.4.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e6c76a87633aa3fa16614b61ccedfae45b91df2767cf097aa9c933932a7ed1e0 -size 10646392 diff --git a/numpy-1.21.6.zip b/numpy-1.21.6.zip new file mode 100644 index 0000000..675a887 --- /dev/null +++ b/numpy-1.21.6.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ecb55251139706669fdec2ff073c98ef8e9a84473e51e716211b41aa0f18e656 +size 10274544 diff --git a/python-numpy.changes b/python-numpy.changes index 0f3110d..a9720c9 100644 --- a/python-numpy.changes +++ b/python-numpy.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Sun May 29 18:15:47 UTC 2022 - Dirk Müller + +- update to 1.21.6: + * Do not forward `__(deep)copy__` calls of `_GenericAlias`... + * Fix float16 einsum fastpaths using wrong tempvar + * Print os error message when the executable not exist + * Force ``npymath` ` to respect ``npy_longdouble`` + * Fix failure to create aligned, empty structured dtype + * provide a convenience function to replace npy_load_module + * update wheel to version that supports python3.10 + * Clear errors correctly in F2PY conversions + * add a warningfilter to fix pytest workflow. + * Help boost::python libraries at least not crash +- drop bpo-45167-fixes.patch (upstream) + ------------------------------------------------------------------- Thu Dec 9 14:43:32 UTC 2021 - Ben Greiner diff --git a/python-numpy.spec b/python-numpy.spec index 2e49616..d500496 100644 --- a/python-numpy.spec +++ b/python-numpy.spec @@ -1,7 +1,7 @@ # # spec file # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,8 +24,8 @@ %endif %global flavor @BUILD_FLAVOR@%{nil} -%define ver 1.21.4 -%define _ver 1_21_4 +%define ver 1.21.6 +%define _ver 1_21_6 %define pname python-numpy %define hpc_upcase_trans_hyph() %(echo %{**} | tr [a-z] [A-Z] | tr '-' '_') %if "%{flavor}" == "" @@ -84,8 +84,6 @@ 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-UPSTREAM -- gh#numpy/numpy#20347 -Patch2: bpo-45167-fixes.patch # PATCH-FIX-UPSTREAM -- gh#numpy/numpy#20388 Patch3: numpy-fix-cpu_asimdfhm.patch BuildConflicts: gcc11 < 11.2