diff --git a/news/numpy.rst b/news/numpy.rst new file mode 100644 index 00000000..8cab0e07 --- /dev/null +++ b/news/numpy.rst @@ -0,0 +1,23 @@ +**Added:** + +* numpy >= 2.0 support + +**Changed:** + +* + +**Deprecated:** + +* + +**Removed:** + +* + +**Fixed:** + +* + +**Security:** + +* diff --git a/requirements/run.txt b/requirements/run.txt index 949c77f6..5b4d7ebd 100644 --- a/requirements/run.txt +++ b/requirements/run.txt @@ -1,4 +1,4 @@ -numpy < 2.0.0 +numpy wxpython diffpy.pdffit2 diffpy.structure diff --git a/src/diffpy/pdfgui/control/fitdataset.py b/src/diffpy/pdfgui/control/fitdataset.py index 45a0e8e1..c6c8e931 100644 --- a/src/diffpy/pdfgui/control/fitdataset.py +++ b/src/diffpy/pdfgui/control/fitdataset.py @@ -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: