Merge pull request #221 from EC-USGS/v0.2.1

Release 0.2.1

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,6 +1,8 @@
 <!-- Feel free to remove check-list items aren't relevant to your change -->
 
 - [ ] Closes #xxxx
-- [ ] Tests and/or performance benchmarks added
+- [ ] Tests added
+- [ ] Performance benchmarks added
+- [ ] Performance regression benchmarks run
 - [ ] User visible changes (including notable bug fixes) are documented in `whats-new.rst`
 - [ ] New functions/methods are listed in `api.rst` or it's sub rsts?

doc/whats-new.rst

@@ -12,9 +12,22 @@ What's New
     np.random.seed(123456)
 
 
+.. _whats-new.0.2.1:
+
+v0.2.1 (19 July 2023)
+---------------------
+
+Bug fixes
+~~~~~~~~~
+- Package data was not properly installed.
+  (:pull:`219`) By `James McCreight <https://github.com/jmccreight>`_.
+- Small addition to notebook 02
+  (:pull:`219`) By `James McCreight <https://github.com/jmccreight>`_.
+
+
 .. _whats-new.0.2.0:
 
-v0.2.0 (12 July 2023)
+v0.2.0 (18 July 2023)
 ---------------------
 
 New features

environment.yml

@@ -1,4 +1,4 @@
-name: pywatershed
+name: pws
 channels:
   - conda-forge
   - nodefaults
@@ -11,12 +11,11 @@ dependencies:
   - filelock
   - geopandas
   - geoviews
+  - git
   - holoviews
   - hvplot
-  - git
   - ipython
   - ipywidgets
-  - jupyter_contrib_nbextensions
   - nb_conda_kernels
   - nbconvert
   - netCDF4
@@ -43,11 +42,12 @@ dependencies:
   - tqdm
   - xarray>=2023.05.0
   - pip:
-      - click != 8.1.0
+      - asv
       - black
+      - click != 8.1.0
       - isort
       - flake8
-      - jupyter_black
-      - pylint
       - git+https://github.com/modflowpy/flopy.git
+      - jupyter_black
       - modflow-devtools
+      - pylint

environment_w_jupyter.yml

@@ -1,4 +1,4 @@
-name: pywatershed
+name: pws
 channels:
   - conda-forge
   - nodefaults
@@ -11,13 +11,12 @@ dependencies:
   - filelock
   - geopandas
   - geoviews
+  - git
   - holoviews
   - hvplot
-  - git
   - ipython
   - ipywidgets
   - jupyter
-  - jupyter_contrib_nbextensions
   - jupyterlab
   - nb_conda_kernels
   - nbconvert
@@ -45,11 +44,12 @@ dependencies:
   - tqdm
   - xarray>=2023.05.0
   - pip:
-      - click != 8.1.0
+      - asv
       - black
+      - click != 8.1.0
       - isort
       - flake8
-      - jupyter_black
-      - pylint
       - git+https://github.com/modflowpy/flopy.git
+      - jupyter_black
       - modflow-devtools
+      - pylint

examples/02_prms_legacy_models.ipynb

@@ -410,8 +410,10 @@
     "    \"input_dir\": run_dir,\n",
     "    \"budget_type\": \"warn\",\n",
     "    \"calc_method\": \"numba\",\n",
-    "    # \"netcdf_output_dir\": nb_output_dir / \"nhm\",\n",
-    "}"
+    "    \"netcdf_output_dir\": nb_output_dir / \"nhm_submodel\",\n",
+    "}\n",
+    "\n",
+    "control.options[\"netcdf_output_var_names\"] = pws.PRMSChannel.get_variables()"
    ]
   },
   {

pyproject.toml

@@ -110,7 +110,7 @@ include = ["pywatershed", "pywatershed.*"]
 
 [tool.setuptools.package-data]
 "pywatershed.static.metadata" = ["*.yaml"]
-"pywatershed.data" = ["*.nc"]
+"pywatershed.data.drb_2yr" = ["*"]
 
 [tool.black]
 line-length = 79

pywatershed/version.py

@@ -1,6 +1,6 @@
-# pywatershed version file automatically created using update_version.py on July 18, 2023 16:50:45
+# pywatershed version file automatically created using update_version.py on July 20, 2023 16:23:17
 
-__version__ = "0.2.0"
+__version__ = "0.2.1"
 __pakname__ = "pywatershed"
 
 author_dict = {

version.txt

@@ -1 +1 @@
-0.2.0
+0.2.1