Migration to Numpy 2 (#528)

* test numpy2

* update other req locations

* 231

* release scipy req

* 210

* update np.NaN to np.nan

* numpy>=2.3.0 and no scipy restriction

* update workflows to remove 3.9 and add 3.13

* numpy>=2.2.6

* fix doctest

* fix doctest

* additional doc fixes

* Update numpy requirement in workflow.

Author: kbonney

.github/workflows/build_tests.yml

@@ -46,7 +46,7 @@ jobs:
       uses: pypa/cibuildwheel@79b0dd328794e1180a7268444d46cdf12e1abd01 # v2.21.0
       env:
         CIBW_ENVIRONMENT: BUILD_WNTR_EXTENSIONS='true'
-        CIBW_BUILD: cp39-* cp310-* cp311-* cp312-*
+        CIBW_BUILD: cp310-* cp311-* cp312-* cp313-*
         CIBW_SKIP: "*-win32 *-manylinux_i686 pp* *-musllinux*"
         CIBW_REPAIR_WHEEL_COMMAND: '' # Skip repair step
     - name: Fix macos13 wheel names # For some reason, they come out as macos14 instead of macos13
@@ -77,7 +77,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        python-version: ['3.9', '3.10', '3.11', '3.12']
+        python-version: ['3.10', '3.11', '3.12', '3.13']
         os: [windows-latest, macOS-13, macos-latest, ubuntu-latest]
       fail-fast: false
     steps:
@@ -94,7 +94,7 @@ jobs:
     - name: Install wntr
       run: |
         python -m pip install --upgrade pip
-        pip install wheel "numpy>=1.2.1,<2.0" scipy networkx pandas matplotlib setuptools
+        pip install wheel "numpy>=2.2.6" scipy networkx pandas matplotlib setuptools
         pip install --no-index --pre --find-links=. wntr
     - name: Import wntr
       run: |
@@ -120,7 +120,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        python-version: ['3.9', '3.10', '3.11', '3.12']
+        python-version: ['3.10', '3.11', '3.12', '3.13']
         os: [windows-latest, macOS-13, ubuntu-latest, macos-latest]
       fail-fast: false
     steps:

.github/workflows/quick_check.yml

@@ -15,7 +15,7 @@ jobs:
   test:
     strategy:
       matrix:
-        python-version: ['3.9', '3.11']
+        python-version: ['3.11', '3.13']
       fail-fast: false
     runs-on: ubuntu-latest
     steps:

documentation/advancedsim.rst

@@ -236,9 +236,10 @@ The solution for :math:`u` and :math:`v` is then returned and printed to four si
    >>> ns = NewtonSolver()
    >>> solver_status = ns.solve(m)
    >>> np.round(m.u.value,4)
-   1.618
+   np.float64(1.618)
+
    >>> np.round(m.v.value,4)
-   2.618
+   np.float64(2.618)
 
 Building MSX models
 -------------------

pyproject.toml

@@ -1,5 +1,5 @@
 [build-system]
-requires = ["setuptools", "numpy>=1.21,<2.0"]
+requires = ["setuptools", "numpy>=2.2.6 "]
 build-backend = "setuptools.build_meta"
 
 [tool.pytest.ini_options]

requirements.txt

@@ -1,6 +1,6 @@
 # Required
-numpy>=1.21,<2.0
-scipy<1.13.0
+numpy>=2.2.6 
+scipy
 networkx
 pandas
 matplotlib

setup.py

@@ -72,7 +72,7 @@
 MAINTAINER_EMAIL = 'kaklise@sandia.gov'
 LICENSE = 'Revised BSD'
 URL = 'https://github.com/USEPA/WNTR'
-DEPENDENCIES = ['numpy>=1.21,<2.0', 'scipy', 'networkx', 'pandas', 'matplotlib', 'setuptools']
+DEPENDENCIES = ['numpy>=2.2.6 ', 'scipy', 'networkx', 'pandas', 'matplotlib', 'setuptools']
 
 # use README file as the long description
 file_dir = os.path.abspath(os.path.dirname(__file__))

wntr/epanet/util.py

@@ -1269,7 +1269,7 @@ def to_si(
     >>> from wntr.epanet.util import *
     >>> flow_si = to_si(FlowUnits.GPM, [0.1, 1.0, 4.3], HydParam.Flow)
     >>> print(flow_si)
-    [6.309019640000001e-06, 6.30901964e-05, 0.00027128784452]
+    [np.float64(6.309019640000001e-06), np.float64(6.30901964e-05), np.float64(0.00027128784452)]
 
     Next, we show how to convert the quality parameter from the EPANET units of mg/L to kg/m3.
     If that is not the mass units you prefer, it is possible to change them to ug/L, g/L, or kg/L,
@@ -1283,7 +1283,7 @@ def to_si(
     It is also possible to convert a dictionary of values.
 
     >>> to_si(FlowUnits.GPM, {'node1': 5.6, 'node2': 1.2}, HydParam.Pressure)
-    {'node1': 3.9392568659127623, 'node2': 0.8441264712670206}
+    {'node1': np.float64(3.9392568659127623), 'node2': np.float64(0.8441264712670206)}
 
     For certain coefficients, there are flags that will change how the conversion occurs. For example,
     reaction coefficients depend on the reaction order.
@@ -1357,7 +1357,7 @@ def from_si(
     >>> from wntr.epanet.util import *
     >>> flow_us = from_si(FlowUnits.GPM, [6.309019640000001e-06, 6.30901964e-05, 0.00027128784452], HydParam.Flow)
     >>> print(flow_us)
-    [0.1, 1.0, 4.3]
+    [np.float64(0.1), np.float64(1.0), np.float64(4.3)]
 
     Next, we show how to convert the quality parameter from kg/m3 to mg/L and then to ug/L.
     
@@ -1369,7 +1369,7 @@ def from_si(
     It is also possible to convert a dictionary of values.
 
     >>> from_si(FlowUnits.GPM, {'node1': 3.9392568659127623, 'node2': 0.8441264712670206}, HydParam.Pressure)
-    {'node1': 5.6, 'node2': 1.2}
+    {'node1': np.float64(5.6), 'node2': np.float64(1.2)}
     
     Finally, an example showing the conversion of 1000 cubic meters per second into the different flow units.