Merge branch 'main' of https://github.com/USEPA/WNTR

Author: terrahaxton

.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
 -------------------

documentation/whatsnew/v1.4.0.rst

@@ -2,8 +2,19 @@ Version 1.4.0 (main)
 ---------------------------------------------------
 WNTR version 1.4.0 includes the following updates:
 
-* Updated binaries with the lates msx build
-* Added a demand pattern library
-* Added the salt water intrusion tutorial
-* Added the landslide analysis tutorial
-* Minor revisions to Jupyter Notebooks and documentation
+* Fixed status badge by @kbonney in https://github.com/USEPA/WNTR/pull/489
+* Added a getting started Jupyter notebook by @kbonney in https://github.com/USEPA/WNTR/pull/469
+* Bug fix for libepanet binaries, replaced with files from the latest build of MSX by @kbonney in https://github.com/USEPA/WNTR/pull/495
+* Added a demand pattern library by @kaklise in https://github.com/USEPA/WNTR/pull/492
+* Added a model development Jupyter notebook tutorial by @kaklise in https://github.com/USEPA/WNTR/pull/491
+* Added a salt water intrusion Jupyter notebook tutorial by @kbonney in https://github.com/USEPA/WNTR/pull/455
+* Added minor revisions to Jupyter Notebooks and documentation by @kaklise in https://github.com/USEPA/WNTR/pull/499
+* Removed version restriction on geopandas, and remove fiona optional dependency by @angusmcb in https://github.com/USEPA/WNTR/pull/488
+* Updated documentation to include release instructions, plus minor formatting updates by @kaklise in https://github.com/USEPA/WNTR/pull/502
+* Moved tests from Jupyter Notebooks to GitHub Action tests by @kaklise in https://github.com/USEPA/WNTR/pull/505
+* Bug fix for initial status and initial setting used by the WNTRSimulator by @kaklise in https://github.com/USEPA/WNTR/pull/506
+* Added signing of dylibs for Apple Silicon by @meggrasse in https://github.com/USEPA/WNTR/pull/498
+* Bug fix for MSX initial concentration and sources by @dbhart in https://github.com/USEPA/WNTR/pull/507
+* Resolved GeoPandas deprecation warnings by @emmanuel-ferdman in https://github.com/USEPA/WNTR/pull/510
+* Bug fix for vertices setter to allow for list of lists by @kaklise in https://github.com/USEPA/WNTR/pull/522
+* Added a model library by @kbonney in https://github.com/USEPA/WNTR/pull/509

examples/getting_started.py

@@ -7,8 +7,7 @@
 import wntr
 
 # Create a water network model
-inp_file = 'networks/Net3.inp'
-wn = wntr.network.WaterNetworkModel(inp_file)
+wn = wntr.network.WaterNetworkModel('Net3')
 
 # Simulate hydraulics
 sim = wntr.sim.EpanetSimulator(wn)

examples/salt_water_intrusion_tutorial.ipynb

@@ -429,11 +429,29 @@
     "salt_water_55_flush = response_quality.loc[55/24,:]\n",
     "ax = wntr.graphics.plot_network(wn, node_attribute=salt_water_55_flush, node_colorbar_label=\"Salt\\nconcentration\\n(kg/m$^3$)\", title=\"Flushing salt concentration hour 55\", show_plot=False, ax=axes[1])"
    ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "# Save results to CSV files\n",
+    "Save average baseline and response water quality results"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "baseline_quality.mean(axis=1).to_csv('salt_water_baseline_quality.csv')\n",
+    "response_quality.mean(axis=1).to_csv('salt_water_response_quality.csv')"
+   ]
   }
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "wntr_test",
+   "display_name": "Python 3 (ipykernel)",
    "language": "python",
    "name": "python3"
   },
@@ -447,7 +465,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.12.10"
+   "version": "3.11.7"
   }
  },
  "nbformat": 4,

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 = '[email protected]'
 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__))