File bottleneck-pr450-numpy2.patch of Package python-Bottleneck

Overview Repositories Revisions Requests Users Attributes Meta

File bottleneck-pr450-numpy2.patch of Package python-Bottleneck (Revision f8cf3578481652343827794ace19927a)

Currently displaying revision f8cf3578481652343827794ace19927a , Show latest

From 24bdaf36ef1c28c0a5b761f775a1e6915b54e2e9 Mon Sep 17 00:00:00 2001
From: Ben Greiner <code@bnavigator.de>
Date: Thu, 9 May 2024 20:47:12 +0200
Subject: [PATCH 2/3] Fix build dependency declaration, remove deprecated
 declarations

---
 pyproject.toml | 2 +-
 setup.py       | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index f27a28b..5861d91 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -14,5 +14,5 @@ requires = [
     #      and disabling build isolation.
     #   3. The <2.3 upper bound is for matching the numpy deprecation policy,
     #      it should not be loosened
-    "numpy>=2.0.0rc1<2.3 ; python_version >= '3.9'",
+    "numpy>=2.0.0rc1,<2.3 ; python_version >= '3.9'",
 ]
diff --git a/setup.py b/setup.py
index 6a8e1ab..07d10ef 100644
--- a/setup.py
+++ b/setup.py
@@ -195,10 +195,6 @@ metadata = dict(
     install_requires=["numpy"],
     extras_require={"doc": ["numpydoc", "sphinx", "gitpython"]},
     cmdclass=cmdclass,
-    setup_requires=[
-        "oldest-supported-numpy ; python_version < '3.9'",
-        "numpy>=2.0.0rc1 ; python_version >= '3.9'"
-    ],
     ext_modules=prepare_modules(),
     zip_safe=False,
 )
-- 
2.44.0

From 787d6daa292ef013efb2ce93f100079457330363 Mon Sep 17 00:00:00 2001
From: Ben Greiner <code@bnavigator.de>
Date: Thu, 9 May 2024 20:27:16 +0200
Subject: [PATCH 3/3] Replace np.array(a, copy=False) with np.asarray(a)

See https://numpy.org/devdocs/numpy_2_0_migration_guide.html#adapting-to-changes-in-the-copy-keyword
---
 bottleneck/slow/move.py           | 8 ++++----
 bottleneck/slow/nonreduce_axis.py | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/bottleneck/slow/move.py b/bottleneck/slow/move.py
index 0aa06f1..76a54a2 100644
--- a/bottleneck/slow/move.py
+++ b/bottleneck/slow/move.py
@@ -52,7 +52,7 @@ def move_argmin(a, window, min_count=None, axis=-1):
     "Slow move_argmin for unaccelerated dtype"
 
     def argmin(a, axis):
-        a = np.array(a, copy=False)
+        a = np.asarray(a)
         flip = [slice(None)] * a.ndim
         flip[axis] = slice(None, None, -1)
         a = a[tuple(flip)]  # if tie, pick index of rightmost tie
@@ -78,7 +78,7 @@ def move_argmax(a, window, min_count=None, axis=-1):
     "Slow move_argmax for unaccelerated dtype"
 
     def argmax(a, axis):
-        a = np.array(a, copy=False)
+        a = np.asarray(a)
         flip = [slice(None)] * a.ndim
         flip[axis] = slice(None, None, -1)
         a = a[tuple(flip)]  # if tie, pick index of rightmost tie
@@ -115,7 +115,7 @@ def move_rank(a, window, min_count=None, axis=-1):
 
 def move_func(func, a, window, min_count=None, axis=-1, **kwargs):
     "Generic moving window function implemented with a python loop."
-    a = np.array(a, copy=False)
+    a = np.asarray(a)
     if min_count is None:
         mc = window
     else:
@@ -226,7 +226,7 @@ def lastrank(a, axis=-1):
     -0.5
 
     """
-    a = np.array(a, copy=False)
+    a = np.asarray(a)
     ndim = a.ndim
     if a.size == 0:
         # At least one dimension has length 0
diff --git a/bottleneck/slow/nonreduce_axis.py b/bottleneck/slow/nonreduce_axis.py
index f09dfa7..1dd6752 100644
--- a/bottleneck/slow/nonreduce_axis.py
+++ b/bottleneck/slow/nonreduce_axis.py
@@ -15,7 +15,7 @@ def nanrankdata(a, axis=None):
 
 
 def _rank(func1d, a, axis):
-    a = np.array(a, copy=False)
+    a = np.asarray(a)
     if axis is None:
         a = a.ravel()
         axis = 0
-- 
2.44.0

Places

File bottleneck-pr450-numpy2.patch of Package python-Bottleneck (Revision f8cf3578481652343827794ace19927a)

Places