Merge branch 'USEPA:main' into initial_cond

dbhart · Sep 29, 2022 · 9ca36f7 · 9ca36f7
2 parents 2b81f51 + bfc18f1
commit 9ca36f7
Show file tree

Hide file tree

Showing 24 changed files with 33 additions and 6 deletions.
diff --git a/documentation/installation.rst b/documentation/installation.rst
@@ -6,7 +6,7 @@ Installation
 ======================================
 .. include:: <isonum.txt>
 
-WNTR requires 64-bit Python (tested on versions 3.6, 3.7, 3.8, and 3.9) along with several 
+WNTR requires 64-bit Python (tested on versions 3.7, 3.8, 3.9, and 3.10) along with several 
 Python package dependencies. 
 See :ref:`requirements` and :ref:`optional_dependencies` for more information.
 WNTR can be installed as a Python package as briefly described below. 
@@ -64,7 +64,7 @@ Step 1: Setup the Python environment
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 	Python can be installed on Windows, Linux, and Mac OS X operating systems.
-	WNTR requires 64-bit Python (tested on versions 3.6, 3.7, 3.8, and 3.9) along with several Python package dependencies.
+	WNTR requires 64-bit Python (tested on versions 3.7, 3.8, 3.9, and 3.10) along with several Python package dependencies.
 	Python distributions, such as Anaconda, are recommended to manage 
 	the Python environment.  Anaconda can be downloaded from https://www.anaconda.com/products/individual.
 	General information on Python can be found at https://www.python.org/.
@@ -188,7 +188,7 @@ Step 3: Test installation
 Requirements
 -------------
 
-Requirements for WNTR include 64-bit Python (tested on versions 3.6, 3.7, 3.8, and 3.9) along with several Python packages. 
+Requirements for WNTR include 64-bit Python (tested on versions 3.7, 3.8, 3.9, and 3.10) along with several Python packages. 
 Users should have experience using Python (https://www.python.org/), including the installation of additional Python packages. The following Python packages are required:
 
 

diff --git a/documentation/waternetworkmodel.rst b/documentation/waternetworkmodel.rst
@@ -37,6 +37,11 @@ The following example builds a water network model.
     ...    wn = wntr.network.model.WaterNetworkModel('../examples/networks/Net3.inp')
     ... except:
     ...    wn = wntr.network.model.WaterNetworkModel('examples/networks/Net3.inp')
+    >>> import matplotlib as mpl
+    >>> try:
+    ...     mpl.use('Agg')
+    ... except:
+    ...     pass
 
 .. note:: 
   Unless otherwise noted, examples in the WNTR documentation use Net3.inp to build the

diff --git a/documentation/whatsnew.rst b/documentation/whatsnew.rst
@@ -1,6 +1,8 @@
 Release notes
 ================
 
+.. include:: whatsnew/v0.5.0.rst
+
 .. include:: whatsnew/v0.4.2.rst
 
 .. include:: whatsnew/v0.4.1.rst

diff --git a/documentation/whatsnew/v0.4.2.rst b/documentation/whatsnew/v0.4.2.rst
@@ -1,10 +1,18 @@
 .. _whatsnew_042:
 
-v0.4.2 (main)
+v0.4.2 (June 23, 2022)
 ---------------------------------------------------
 
+* Bug fix for emitter units `#270 <https://github.com/USEPA/WNTR/pull/270>`_
+
+* Bug fix for patterns that are all integers `#272 <https://github.com/USEPA/WNTR/pull/272>`_ 
+
 * Added plt.show to graphics functions so that the graphics display properly outside Spyder
   `#265 <https://github.com/USEPA/WNTR/pull/265>`_
 
-* Updated documentation
+* Moved sensor placement example to Chama `#270 <https://github.com/USEPA/WNTR/pull/270>`_
+
+* Added additional demos `#275 <https://github.com/USEPA/WNTR/pull/275>`_
+
+* Updated documentation and tests `#266 <https://github.com/USEPA/WNTR/pull/266>`_, `#267 <https://github.com/USEPA/WNTR/pull/267>`_
 
diff --git a/documentation/whatsnew/v0.5.0.rst b/documentation/whatsnew/v0.5.0.rst
@@ -0,0 +1,12 @@
+.. _whatsnew_050:
+
+v0.5.0 (main)
+---------------------------------------------------
+
+* Added support for Python 3.10, dropped support for Python 3.6.  
+
+* The build workflow now creates wheel artifacts.  
+  The `_evaluator` and `_network_isolation` binaries are also distributed with the code.
+
+* Updated documentation
+
diff --git a/wntr/__init__.py b/wntr/__init__.py
@@ -7,7 +7,7 @@
 from wntr import graphics
 from wntr import utils
 
-__version__ = '0.4.2'
+__version__ = '0.5.0'
 
 __copyright__ = """Copyright 2019 National Technology & Engineering 
 Solutions of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 

diff --git a/wntr/sim/aml/_evaluator.cp310-win_amd64.pyd b/wntr/sim/aml/_evaluator.cp310-win_amd64.pyd
diff --git a/wntr/sim/aml/_evaluator.cp35-win_amd64.pyd b/wntr/sim/aml/_evaluator.cp35-win_amd64.pyd
diff --git a/wntr/sim/aml/_evaluator.cp36-win_amd64.pyd b/wntr/sim/aml/_evaluator.cp36-win_amd64.pyd
diff --git a/wntr/sim/aml/_evaluator.cpython-310-darwin.so b/wntr/sim/aml/_evaluator.cpython-310-darwin.so
diff --git a/wntr/sim/aml/_evaluator.cpython-310-x86_64-linux-gnu.so b/wntr/sim/aml/_evaluator.cpython-310-x86_64-linux-gnu.so
diff --git a/wntr/sim/aml/_evaluator.cpython-35m-darwin.so b/wntr/sim/aml/_evaluator.cpython-35m-darwin.so
diff --git a/wntr/sim/aml/_evaluator.cpython-35m-x86_64-linux-gnu.so b/wntr/sim/aml/_evaluator.cpython-35m-x86_64-linux-gnu.so
diff --git a/wntr/sim/aml/_evaluator.cpython-36m-darwin.so b/wntr/sim/aml/_evaluator.cpython-36m-darwin.so
diff --git a/wntr/sim/aml/_evaluator.cpython-36m-x86_64-linux-gnu.so b/wntr/sim/aml/_evaluator.cpython-36m-x86_64-linux-gnu.so
diff --git a/wntr/sim/network_isolation/_network_isolation.cp310-win_amd64.pyd b/wntr/sim/network_isolation/_network_isolation.cp310-win_amd64.pyd
diff --git a/wntr/sim/network_isolation/_network_isolation.cp35-win_amd64.pyd b/wntr/sim/network_isolation/_network_isolation.cp35-win_amd64.pyd
diff --git a/wntr/sim/network_isolation/_network_isolation.cp36-win_amd64.pyd b/wntr/sim/network_isolation/_network_isolation.cp36-win_amd64.pyd
diff --git a/wntr/sim/network_isolation/_network_isolation.cpython-310-darwin.so b/wntr/sim/network_isolation/_network_isolation.cpython-310-darwin.so
diff --git a/wntr/sim/network_isolation/_network_isolation.cpython-310-x86_64-linux-gnu.so b/wntr/sim/network_isolation/_network_isolation.cpython-310-x86_64-linux-gnu.so
diff --git a/wntr/sim/network_isolation/_network_isolation.cpython-35m-darwin.so b/wntr/sim/network_isolation/_network_isolation.cpython-35m-darwin.so
diff --git a/wntr/sim/network_isolation/_network_isolation.cpython-35m-x86_64-linux-gnu.so b/wntr/sim/network_isolation/_network_isolation.cpython-35m-x86_64-linux-gnu.so
diff --git a/wntr/sim/network_isolation/_network_isolation.cpython-36m-darwin.so b/wntr/sim/network_isolation/_network_isolation.cpython-36m-darwin.so
diff --git a/wntr/sim/network_isolation/_network_isolation.cpython-36m-x86_64-linux-gnu.so b/wntr/sim/network_isolation/_network_isolation.cpython-36m-x86_64-linux-gnu.so