From 898ad3a4d720f9ce5c1497061444934d483a9090 Mon Sep 17 00:00:00 2001
From: DistroBaker <osci-list@redhat.com>
Date: Mon, 28 Dec 2020 18:36:38 +0000
Subject: [PATCH] Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/numpy.git#6479234f82e8868e0dfe00290aefa1daaa968c97
---
 .gitignore              |   1 +
 numpy-1.19.2-FIPS.patch | 135 ----------------------------------------
 numpy.spec              |  17 ++---
 sources                 |   2 +-
 4 files changed, 12 insertions(+), 143 deletions(-)
 delete mode 100644 numpy-1.19.2-FIPS.patch

diff --git a/.gitignore b/.gitignore
index c5292cc..dcf7523 100644
--- a/.gitignore
+++ b/.gitignore
@@ -82,3 +82,4 @@ numpy-1.4.1.tar.gz
 /numpy-html.zip
 /numpy-1.19.3.tar.gz
 /numpy-1.19.4.tar.gz
+/numpy-1.20.0rc2.tar.gz
diff --git a/numpy-1.19.2-FIPS.patch b/numpy-1.19.2-FIPS.patch
deleted file mode 100644
index 3768799..0000000
--- a/numpy-1.19.2-FIPS.patch
+++ /dev/null
@@ -1,135 +0,0 @@
-From f73d993bcb03701f4e9146005a65eb482689140a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Nikola=20Forr=C3=B3?= <nforro@redhat.com>
-Date: Mon, 26 Oct 2020 18:54:22 +0100
-Subject: [PATCH] TST: Make test suite work in FIPS (140-2) Mode
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Tests using MD5 algorithms fail in FIPS Mode because MD5 is not FIPS
-compliant.
-
-Mark usages of MD5 in test suite as not being used for security
-purposes to overcome that.
-
-Signed-off-by: Nikola Forró <nforro@redhat.com>
----
- numpy/core/tests/test_regression.py          |  2 +-
- numpy/random/tests/test_generator_mt19937.py | 10 +++++-----
- numpy/random/tests/test_random.py            |  4 ++--
- numpy/random/tests/test_randomstate.py       |  6 +++---
- 4 files changed, 11 insertions(+), 11 deletions(-)
-
-diff --git a/numpy/core/tests/test_regression.py b/numpy/core/tests/test_regression.py
-index 2e731d4fa..4633174d9 100644
---- a/numpy/core/tests/test_regression.py
-+++ b/numpy/core/tests/test_regression.py
-@@ -1509,7 +1509,7 @@ class TestRegression:
-         from hashlib import md5
- 
-         x = np.array([1, 2, 3], dtype=np.dtype('<i4'))
--        assert_equal(md5(x).hexdigest(), '2a1dd1e1e59d0a384c26951e316cd7e6')
-+        assert_equal(md5(x, usedforsecurity=False).hexdigest(), '2a1dd1e1e59d0a384c26951e316cd7e6')
- 
-     def test_0d_string_scalar(self):
-         # Bug #1436; the following should succeed
-diff --git a/numpy/random/tests/test_generator_mt19937.py b/numpy/random/tests/test_generator_mt19937.py
-index 6be7d852b..9b166e3a2 100644
---- a/numpy/random/tests/test_generator_mt19937.py
-+++ b/numpy/random/tests/test_generator_mt19937.py
-@@ -507,14 +507,14 @@ class TestIntegers:
-                 val = random.integers(0, 6 - endpoint, size=1000, endpoint=endpoint,
-                                  dtype=dt).byteswap()
- 
--            res = hashlib.md5(val).hexdigest()
-+            res = hashlib.md5(val, usedforsecurity=False).hexdigest()
-             assert_(tgt[np.dtype(dt).name] == res)
- 
-         # bools do not depend on endianness
-         random = Generator(MT19937(1234))
-         val = random.integers(0, 2 - endpoint, size=1000, endpoint=endpoint,
-                          dtype=bool).view(np.int8)
--        res = hashlib.md5(val).hexdigest()
-+        res = hashlib.md5(val, usedforsecurity=False).hexdigest()
-         assert_(tgt[np.dtype(bool).name] == res)
- 
-     def test_repeatability_broadcasting(self, endpoint):
-@@ -910,7 +910,7 @@ class TestRandomDist:
-         actual = random.choice(10000, 5000, replace=False)
-         if sys.byteorder != 'little':
-             actual = actual.byteswap()
--        res = hashlib.md5(actual.view(np.int8)).hexdigest()
-+        res = hashlib.md5(actual.view(np.int8), usedforsecurity=False).hexdigest()
-         assert_(choice_hash == res)
- 
-     def test_bytes(self):
-@@ -2436,7 +2436,7 @@ def test_jumped(config):
-     key = mt19937.state["state"]["key"]
-     if sys.byteorder == 'big':
-         key = key.byteswap()
--    md5 = hashlib.md5(key)
-+    md5 = hashlib.md5(key, usedforsecurity=False)
-     assert mt19937.state["state"]["pos"] == config["initial"]["pos"]
-     assert md5.hexdigest() == config["initial"]["key_md5"]
- 
-@@ -2444,7 +2444,7 @@ def test_jumped(config):
-     key = jumped.state["state"]["key"]
-     if sys.byteorder == 'big':
-         key = key.byteswap()
--    md5 = hashlib.md5(key)
-+    md5 = hashlib.md5(key, usedforsecurity=False)
-     assert jumped.state["state"]["pos"] == config["jumped"]["pos"]
-     assert md5.hexdigest() == config["jumped"]["key_md5"]
- 
-diff --git a/numpy/random/tests/test_random.py b/numpy/random/tests/test_random.py
-index 276b5bc81..e49251af3 100644
---- a/numpy/random/tests/test_random.py
-+++ b/numpy/random/tests/test_random.py
-@@ -233,13 +233,13 @@ class TestRandint:
-             else:
-                 val = self.rfunc(0, 6, size=1000, dtype=dt).byteswap()
- 
--            res = hashlib.md5(val.view(np.int8)).hexdigest()
-+            res = hashlib.md5(val.view(np.int8), usedforsecurity=False).hexdigest()
-             assert_(tgt[np.dtype(dt).name] == res)
- 
-         # bools do not depend on endianness
-         np.random.seed(1234)
-         val = self.rfunc(0, 2, size=1000, dtype=bool).view(np.int8)
--        res = hashlib.md5(val).hexdigest()
-+        res = hashlib.md5(val, usedforsecurity=False).hexdigest()
-         assert_(tgt[np.dtype(bool).name] == res)
- 
-     def test_int64_uint64_corner_case(self):
-diff --git a/numpy/random/tests/test_randomstate.py b/numpy/random/tests/test_randomstate.py
-index 23dbbed6a..aa53d9322 100644
---- a/numpy/random/tests/test_randomstate.py
-+++ b/numpy/random/tests/test_randomstate.py
-@@ -341,13 +341,13 @@ class TestRandint:
-             else:
-                 val = self.rfunc(0, 6, size=1000, dtype=dt).byteswap()
- 
--            res = hashlib.md5(val.view(np.int8)).hexdigest()
-+            res = hashlib.md5(val.view(np.int8), usedforsecurity=False).hexdigest()
-             assert_(tgt[np.dtype(dt).name] == res)
- 
-         # bools do not depend on endianness
-         random.seed(1234)
-         val = self.rfunc(0, 2, size=1000, dtype=bool).view(np.int8)
--        res = hashlib.md5(val).hexdigest()
-+        res = hashlib.md5(val, usedforsecurity=False).hexdigest()
-         assert_(tgt[np.dtype(bool).name] == res)
- 
-     @pytest.mark.skipif(np.iinfo('l').max < 2**32,
-@@ -1987,7 +1987,7 @@ def test_integer_repeat(int_func):
-     val = f(*args, size=1000000)
-     if sys.byteorder != 'little':
-         val = val.byteswap()
--    res = hashlib.md5(val.view(np.int8)).hexdigest()
-+    res = hashlib.md5(val.view(np.int8), usedforsecurity=False).hexdigest()
-     assert_(res == md5)
- 
- 
--- 
-2.26.2
-
diff --git a/numpy.spec b/numpy.spec
index 94f8b57..b686bb5 100644
--- a/numpy.spec
+++ b/numpy.spec
@@ -1,5 +1,5 @@
 #uncomment next line for a release candidate or a beta
-##%global relc rc1
+#%%global relc rc1
 
 # Simple way to disable tests
 %if 0%{?flatpak}
@@ -19,19 +19,17 @@
 %global modname numpy
 
 Name:           numpy
-Version:        1.19.4
-Release:        1%{?dist}
+Version:        1.20.0
+Release:        0.rc2%{?dist}
 Epoch:          1
 Summary:        A fast multidimensional array facility for Python
 
 # Everything is BSD except for class SafeEval in numpy/lib/utils.py which is 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
+Source0:        https://github.com/%{name}/%{name}/releases/download/v%{version}rc2/%{name}-%{version}rc2.tar.gz
 Source1:        https://numpy.org/doc/1.19/numpy-html.zip
 
-Patch0:         numpy-1.19.2-FIPS.patch
-
 %description
 NumPy is a general-purpose array-processing package designed to
 efficiently manipulate large multi-dimensional arrays of arbitrary
@@ -104,7 +102,7 @@ This package provides the complete documentation for NumPy.
 
 
 %prep
-%autosetup -n %{name}-%{version} -p1
+%autosetup -n %{name}-%{version}rc2 -p1
 
 # Force re-cythonization (ifed for PKG-INFO presence in setup.py)
 rm PKG-INFO
@@ -181,6 +179,8 @@ python3 runtests.py
 %{_includedir}/numpy
 %{python3_sitearch}/%{name}/__init__.pxd
 %{python3_sitearch}/%{name}/__init__.cython-30.pxd
+%{python3_sitearch}/%{name}/py.typed
+%{python3_sitearch}/%{name}/typing/
 
 %files -n python3-numpy-f2py
 %{_bindir}/f2py
@@ -194,6 +194,9 @@ python3 runtests.py
 
 
 %changelog
+* Mon Dec 28 2020 Gwyn Ciesla <gwync@protonmail.com> - 1:1.20.0-0.rc2
+- 1.20.0 rc2
+
 * Tue Nov 03 2020 Gwyn Ciesla <gwync@protonmail.com> - 1:1.19.4-1
 - 1.19.4
 
diff --git a/sources b/sources
index 8716d2c..b202a83 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (numpy-1.19.4.tar.gz) = 50529dd1ae64e578c35ecfd19cb3a601b32fccdf88ca2c1161bc13e57e20bbbb58d3ac44e3afa80967c537338246425dfe9d57dd9f04d58346e5be605c529726
+SHA512 (numpy-1.20.0rc2.tar.gz) = f723e1951de7dd4598355e09f64293781808c78e532794e90603c3198ba24291a84dc2bc4748a6dd79a0caa13db864e8f1920b31b28956481bb237dcae4614a5
 SHA512 (numpy-html.zip) = 4a421636523424a0703290b6a0ba53b85a9a9e8a6256363e2481f1c02ae278825c09f2f13d39e99f8aae21f57a4978723f3fc690693520f8c3b45a5b4c5a38ab