Skip to content

Remove numpy < 2.0 pinning #214

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 30, 2024
Merged

Remove numpy < 2.0 pinning #214

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
356f6f1
Remove numpy pinning
bobleesj Sep 30, 2024
e3b617c
Add copy none
bobleesj Sep 30, 2024
aceca5f
Add news
bobleesj Sep 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions news/numpy.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
**Added:**

* numpy >= 2.0 support

**Changed:**

* <news item>

**Deprecated:**

* <news item>

**Removed:**

* <news item>

**Fixed:**

* <news item>

**Security:**

* <news item>
2 changes: 1 addition & 1 deletion requirements/run.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
numpy < 2.0.0
numpy
wxpython
diffpy.pdffit2
diffpy.structure
Expand Down
6 changes: 3 additions & 3 deletions src/diffpy/pdfgui/control/fitdataset.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -785,10 +785,10 @@ def grid_interpolation(x0, y0, x1, youtleft=0.0, youtright=0.0):

Return numpy.array of interpolated y1 values.
"""
x0 = numpy.array(x0, copy=False, dtype=float)
y0 = numpy.array(y0, copy=False, dtype=float)
x0 = numpy.asarray(x0, copy=None, dtype=float)
y0 = numpy.asarray(y0, copy=None, dtype=float)
n0 = len(x0)
x1 = numpy.array(x1, copy=False, dtype=float)
x1 = numpy.asarray(x1, copy=None, dtype=float)
n1 = len(x1)
y1 = youtright * numpy.ones(n1, dtype=float)
if n0:
Expand Down