diff --git a/.docs/Notebooks/array_output_tutorial.py b/.docs/Notebooks/array_output_tutorial.py
index 7e56125a2..ac790a7af 100644
--- a/.docs/Notebooks/array_output_tutorial.py
+++ b/.docs/Notebooks/array_output_tutorial.py
@@ -25,9 +25,9 @@
# + [markdown] pycharm={"name": "#%% md\n"}
# load and run the Freyberg model
-import os
# + pycharm={"name": "#%%\n"}
+import os
import sys
from tempfile import TemporaryDirectory
diff --git a/.docs/Notebooks/plot_cross_section_example.py b/.docs/Notebooks/plot_cross_section_example.py
index 832a8f833..a17f1b12f 100644
--- a/.docs/Notebooks/plot_cross_section_example.py
+++ b/.docs/Notebooks/plot_cross_section_example.py
@@ -23,9 +23,9 @@
#
# ### Mapping is demonstrated for MODFLOW-2005 and MODFLOW-6 models in this notebook
-import os
# + pycharm={"name": "#%%\n"}
+import os
import sys
from tempfile import TemporaryDirectory
diff --git a/.docs/Notebooks/plot_map_view_example.py b/.docs/Notebooks/plot_map_view_example.py
index 3a489d182..d24854c7a 100644
--- a/.docs/Notebooks/plot_map_view_example.py
+++ b/.docs/Notebooks/plot_map_view_example.py
@@ -24,9 +24,9 @@
# ### Mapping is demonstrated for MODFLOW-2005, MODFLOW-USG, and MODFLOW-6 models in this notebook
#
-import os
# +
+import os
import sys
from tempfile import TemporaryDirectory
@@ -315,8 +315,6 @@
# + [markdown] pycharm={"name": "#%% md\n"}
# Array contours can be exported directly to a shapefile.
-from shapefile import Reader
-
# + pycharm={"name": "#%%\n"}
from flopy.export.utils import ( # use export_contourf for filled contours
export_contours,
@@ -325,6 +323,8 @@
shp_path = os.path.join(modelpth, "contours.shp")
export_contours(shp_path, contour_set)
+from shapefile import Reader
+
with Reader(shp_path) as r:
nshapes = len(r.shapes())
print("Contours:", nshapes)
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 9d0f6dd87..44b7a2539 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -237,73 +237,3 @@ jobs:
- name: Publish to PyPI
run: python -m twine upload dist/*
-
- reset:
- name: Draft reset PR
- if: ${{ github.event_name == 'release' }}
- runs-on: ubuntu-22.04
- permissions:
- contents: write
- pull-requests: write
- defaults:
- run:
- shell: bash -l {0}
- steps:
-
- - name: Checkout master branch
- uses: actions/checkout@v3
- with:
- ref: master
-
- - name: Setup Python
- uses: actions/setup-python@v4
- with:
- python-version: 3.8
- cache: 'pip'
- cache-dependency-path: pyproject.toml
-
- - name: Install Python dependencies
- run: |
- pip install --upgrade pip
- pip install build twine
- pip install .
- pip install ".[lint, test, optional]"
-
- - name: Get release tag
- uses: oprypin/find-latest-tag@v1
- id: latest_tag
- with:
- repository: ${{ github.repository }}
- releases-only: true
-
- - name: Draft pull request
- env:
- GITHUB_TOKEN: ${{ github.token }}
- run: |
- # create reset branch from master
- reset_branch="post-release-${{ steps.latest_tag.outputs.tag }}-reset"
- git switch -c $reset_branch
-
- # update version string (append '+' to indicate development status)
- version=$(cat version.txt)
- version="$version+"
- python scripts/update_version.py -v "$version"
-
- # lint Python files
- python scripts/pull_request_prepare.py
-
- # commit and push reset branch
- git config core.sharedRepository true
- git config user.name "github-actions[bot]"
- git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
- git add -A
- git commit -m "ci(release): update to version $version"
- git push -u origin $reset_branch
-
- # create PR into develop
- body='
- # Reinitialize for development
-
- Updates the `develop` branch from `master` following a successful release.
- '
- gh pr create -B "develop" -H "$reset_branch" --title "Reinitialize develop branch" --draft --body "$body"
diff --git a/CITATION.cff b/CITATION.cff
index 355ce5030..a6dc9b992 100644
--- a/CITATION.cff
+++ b/CITATION.cff
@@ -3,7 +3,7 @@ message: If you use this software, please cite both the article from preferred-c
and the software itself.
type: software
title: FloPy
-version: 3.4.0
+version: 3.4.1
date-released: '2023-06-29'
doi: 10.5066/F7BK19FH
abstract: A Python package to create, run, and post-process MODFLOW-based models.
diff --git a/README.md b/README.md
index d2cfbc8aa..fda5f75b1 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
-### Version 3.4.0
+### Version 3.4.1
[![flopy continuous integration](https://github.com/modflowpy/flopy/actions/workflows/commit.yml/badge.svg?branch=develop)](https://github.com/modflowpy/flopy/actions/workflows/commit.yml)
[![Read the Docs](https://github.com/modflowpy/flopy/actions/workflows/rtd.yml/badge.svg?branch=develop)](https://github.com/modflowpy/flopy/actions/workflows/rtd.yml)
@@ -142,7 +142,7 @@ How to Cite
##### ***Software/Code citation for FloPy:***
-[Bakker, Mark, Post, Vincent, Hughes, J. D., Langevin, C. D., White, J. T., Leaf, A. T., Paulinski, S. R., Bellino, J. C., Morway, E. D., Toews, M. W., Larsen, J. D., Fienen, M. N., Starn, J. J., Brakenhoff, D. A., and Bonelli, W. P., 2023, FloPy v3.4.0: U.S. Geological Survey Software Release, 29 June 2023, https://doi.org/10.5066/F7BK19FH](https://doi.org/10.5066/F7BK19FH)
+[Bakker, Mark, Post, Vincent, Hughes, J. D., Langevin, C. D., White, J. T., Leaf, A. T., Paulinski, S. R., Bellino, J. C., Morway, E. D., Toews, M. W., Larsen, J. D., Fienen, M. N., Starn, J. J., Brakenhoff, D. A., and Bonelli, W. P., 2023, FloPy v3.4.1: U.S. Geological Survey Software Release, 29 June 2023, https://doi.org/10.5066/F7BK19FH](https://doi.org/10.5066/F7BK19FH)
Additional FloPy Related Publications
diff --git a/autotest/test_flopy_module.py b/autotest/test_flopy_module.py
index bc623c2b9..1a4bd40ea 100644
--- a/autotest/test_flopy_module.py
+++ b/autotest/test_flopy_module.py
@@ -3,6 +3,7 @@
from pathlib import Path
import numpy as np
+from packaging.version import Version
import flopy
@@ -10,10 +11,8 @@
def test_import_and_version_string():
import flopy
- # matches any 1-3 component, dot-separated version string
- # https://stackoverflow.com/a/82205/6514033
- pattern = r"^(\d+\.)?(\d+\.)?(\*|\d+)$"
- assert re.match(pattern, flopy.__version__)
+ # an error is raised if the version string can't be parsed
+ Version(flopy.__version__)
def test_modflow():
diff --git a/code.json b/code.json
index 35ffd8dcc..0f8443399 100644
--- a/code.json
+++ b/code.json
@@ -29,7 +29,7 @@
"downloadURL": "https://code.usgs.gov/usgs/modflow/flopy/archive/master.zip",
"vcs": "git",
"laborHours": -1,
- "version": "3.4.0",
+ "version": "3.4.1",
"date": {
"metadataLastUpdated": "2023-06-29"
},
diff --git a/docs/PyPI_release.md b/docs/PyPI_release.md
index 9b1ba6aca..521e29b46 100644
--- a/docs/PyPI_release.md
+++ b/docs/PyPI_release.md
@@ -30,7 +30,7 @@ How to Cite
*Software/Code citation for FloPy:*
-[Bakker, Mark, Post, Vincent, Hughes, J. D., Langevin, C. D., White, J. T., Leaf, A. T., Paulinski, S. R., Bellino, J. C., Morway, E. D., Toews, M. W., Larsen, J. D., Fienen, M. N., Starn, J. J., Brakenhoff, D. A., and Bonelli, W. P., 2023, FloPy v3.4.0: U.S. Geological Survey Software Release, 29 June 2023, https://doi.org/10.5066/F7BK19FH](https://doi.org/10.5066/F7BK19FH)
+[Bakker, Mark, Post, Vincent, Hughes, J. D., Langevin, C. D., White, J. T., Leaf, A. T., Paulinski, S. R., Bellino, J. C., Morway, E. D., Toews, M. W., Larsen, J. D., Fienen, M. N., Starn, J. J., Brakenhoff, D. A., and Bonelli, W. P., 2023, FloPy v3.4.1: U.S. Geological Survey Software Release, 29 June 2023, https://doi.org/10.5066/F7BK19FH](https://doi.org/10.5066/F7BK19FH)
Disclaimer
diff --git a/docs/make_release.md b/docs/make_release.md
index b8b01ff72..b057a5e81 100644
--- a/docs/make_release.md
+++ b/docs/make_release.md
@@ -66,7 +66,7 @@ If the branch name does not end with `rc`, the workflow will proceed to open a P
**Note:** the PR should be merged, not squashed. Squashing removes the commit history from the `master` branch and causes `develop` and `master` to diverge, which can cause future PRs updating `master` to replay commits from previous releases.
-Publishing the release triggers jobs to publish the `flopy` package to PyPI and open a PR updating `develop` from `master`. This PR also updates version numbers to the just-released version, and appends "+" to the end of the version string to indicate development status.
+Publishing the release triggers a final job to publish the `flopy` package to PyPI.
##### Trusted publishing
@@ -109,7 +109,7 @@ As described above, making a release manually involves the following steps:
1. Merge the `master` branch into the `develop` branch.
-2. Set the version as appropriate: `python scripts/update_version.py -v `.
+2. Set the development version as appropriate: `python scripts/update_version.py -v `. The version number must comply with [PEP 440](https://peps.python.org/pep-0440/).
3. Lint Python files: `python scripts/pull_request_prepare.py`
diff --git a/docs/version_changes.md b/docs/version_changes.md
index 93fc12987..934d29fc2 100644
--- a/docs/version_changes.md
+++ b/docs/version_changes.md
@@ -1,3 +1,9 @@
+### Version 3.4.1
+
+#### Bug fixes
+
+* [fix(get-modflow)](https://github.com/modflowpy/flopy/commit/b8dffbc6bc7bee70d18d7ec24c96e33517e4f0e8): Accommodate mf6 release asset name change (#1855). Committed by w-bonelli on 2023-06-29.
+
### Version 3.4.0
#### New features
diff --git a/etc/environment.yml b/etc/environment.yml
index b765d1fba..d4a6b62a5 100644
--- a/etc/environment.yml
+++ b/etc/environment.yml
@@ -29,7 +29,7 @@ dependencies:
- pytest-dotenv
- pytest-virtualenv
- pytest-xdist
-
+ - virtualenv
# optional
- python-dateutil>=2.4.0
diff --git a/flopy/mf6/modflow/mfems.py b/flopy/mf6/modflow/mfems.py
index f490e1fae..78e49a113 100644
--- a/flopy/mf6/modflow/mfems.py
+++ b/flopy/mf6/modflow/mfems.py
@@ -1,6 +1,6 @@
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
# mf6/utils/createpackages.py
-# FILE created on June 29, 2023 01:58:48 UTC
+# FILE created on June 29, 2023 14:20:38 UTC
from .. import mfpackage
diff --git a/flopy/mf6/modflow/mfgnc.py b/flopy/mf6/modflow/mfgnc.py
index d5884be5c..3231317e6 100644
--- a/flopy/mf6/modflow/mfgnc.py
+++ b/flopy/mf6/modflow/mfgnc.py
@@ -1,6 +1,6 @@
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
# mf6/utils/createpackages.py
-# FILE created on June 29, 2023 01:58:48 UTC
+# FILE created on June 29, 2023 14:20:38 UTC
from .. import mfpackage
from ..data.mfdatautil import ListTemplateGenerator
diff --git a/flopy/mf6/modflow/mfgwf.py b/flopy/mf6/modflow/mfgwf.py
index e067d9840..9601fb38c 100644
--- a/flopy/mf6/modflow/mfgwf.py
+++ b/flopy/mf6/modflow/mfgwf.py
@@ -1,6 +1,6 @@
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
# mf6/utils/createpackages.py
-# FILE created on June 29, 2023 01:58:48 UTC
+# FILE created on June 29, 2023 14:20:38 UTC
from .. import mfmodel
from ..data.mfdatautil import ArrayTemplateGenerator, ListTemplateGenerator
diff --git a/flopy/mf6/modflow/mfgwfapi.py b/flopy/mf6/modflow/mfgwfapi.py
index e9d2d947d..53232b640 100644
--- a/flopy/mf6/modflow/mfgwfapi.py
+++ b/flopy/mf6/modflow/mfgwfapi.py
@@ -1,6 +1,6 @@
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
# mf6/utils/createpackages.py
-# FILE created on June 29, 2023 01:58:48 UTC
+# FILE created on June 29, 2023 14:20:38 UTC
from .. import mfpackage
from ..data.mfdatautil import ListTemplateGenerator
diff --git a/flopy/mf6/modflow/mfgwfbuy.py b/flopy/mf6/modflow/mfgwfbuy.py
index fad4fd354..216c0c091 100644
--- a/flopy/mf6/modflow/mfgwfbuy.py
+++ b/flopy/mf6/modflow/mfgwfbuy.py
@@ -1,6 +1,6 @@
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
# mf6/utils/createpackages.py
-# FILE created on June 29, 2023 01:58:48 UTC
+# FILE created on June 29, 2023 14:20:38 UTC
from .. import mfpackage
from ..data.mfdatautil import ListTemplateGenerator
diff --git a/flopy/mf6/modflow/mfgwfchd.py b/flopy/mf6/modflow/mfgwfchd.py
index 2370767d7..b1d018e02 100644
--- a/flopy/mf6/modflow/mfgwfchd.py
+++ b/flopy/mf6/modflow/mfgwfchd.py
@@ -1,6 +1,6 @@
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
# mf6/utils/createpackages.py
-# FILE created on June 29, 2023 01:58:48 UTC
+# FILE created on June 29, 2023 14:20:38 UTC
from .. import mfpackage
from ..data.mfdatautil import ListTemplateGenerator
diff --git a/flopy/mf6/modflow/mfgwfcsub.py b/flopy/mf6/modflow/mfgwfcsub.py
index ee8f52e87..44262ed25 100644
--- a/flopy/mf6/modflow/mfgwfcsub.py
+++ b/flopy/mf6/modflow/mfgwfcsub.py
@@ -1,6 +1,6 @@
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
# mf6/utils/createpackages.py
-# FILE created on June 29, 2023 01:58:48 UTC
+# FILE created on June 29, 2023 14:20:38 UTC
from .. import mfpackage
from ..data.mfdatautil import ArrayTemplateGenerator, ListTemplateGenerator
diff --git a/flopy/mf6/modflow/mfgwfdis.py b/flopy/mf6/modflow/mfgwfdis.py
index 8ac9218ce..e72579690 100644
--- a/flopy/mf6/modflow/mfgwfdis.py
+++ b/flopy/mf6/modflow/mfgwfdis.py
@@ -1,6 +1,6 @@
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
# mf6/utils/createpackages.py
-# FILE created on June 29, 2023 01:58:48 UTC
+# FILE created on June 29, 2023 14:20:38 UTC
from .. import mfpackage
from ..data.mfdatautil import ArrayTemplateGenerator
diff --git a/flopy/mf6/modflow/mfgwfdisu.py b/flopy/mf6/modflow/mfgwfdisu.py
index 95760b3af..60a69828e 100644
--- a/flopy/mf6/modflow/mfgwfdisu.py
+++ b/flopy/mf6/modflow/mfgwfdisu.py
@@ -1,6 +1,6 @@
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
# mf6/utils/createpackages.py
-# FILE created on June 29, 2023 01:58:48 UTC
+# FILE created on June 29, 2023 14:20:38 UTC
from .. import mfpackage
from ..data.mfdatautil import ArrayTemplateGenerator, ListTemplateGenerator
diff --git a/flopy/mf6/modflow/mfgwfdisv.py b/flopy/mf6/modflow/mfgwfdisv.py
index 8c9247de3..74ceb30c6 100644
--- a/flopy/mf6/modflow/mfgwfdisv.py
+++ b/flopy/mf6/modflow/mfgwfdisv.py
@@ -1,6 +1,6 @@
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
# mf6/utils/createpackages.py
-# FILE created on June 29, 2023 01:58:48 UTC
+# FILE created on June 29, 2023 14:20:38 UTC
from .. import mfpackage
from ..data.mfdatautil import ArrayTemplateGenerator, ListTemplateGenerator
diff --git a/flopy/mf6/modflow/mfgwfdrn.py b/flopy/mf6/modflow/mfgwfdrn.py
index 03143a342..5e3e68612 100644
--- a/flopy/mf6/modflow/mfgwfdrn.py
+++ b/flopy/mf6/modflow/mfgwfdrn.py
@@ -1,6 +1,6 @@
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
# mf6/utils/createpackages.py
-# FILE created on June 29, 2023 01:58:48 UTC
+# FILE created on June 29, 2023 14:20:38 UTC
from .. import mfpackage
from ..data.mfdatautil import ListTemplateGenerator
diff --git a/flopy/mf6/modflow/mfgwfevt.py b/flopy/mf6/modflow/mfgwfevt.py
index bbb601f5f..fcc407e9c 100644
--- a/flopy/mf6/modflow/mfgwfevt.py
+++ b/flopy/mf6/modflow/mfgwfevt.py
@@ -1,6 +1,6 @@
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
# mf6/utils/createpackages.py
-# FILE created on June 29, 2023 01:58:48 UTC
+# FILE created on June 29, 2023 14:20:38 UTC
from .. import mfpackage
from ..data.mfdatautil import ListTemplateGenerator
diff --git a/flopy/mf6/modflow/mfgwfevta.py b/flopy/mf6/modflow/mfgwfevta.py
index 16d812d32..eb74556e7 100644
--- a/flopy/mf6/modflow/mfgwfevta.py
+++ b/flopy/mf6/modflow/mfgwfevta.py
@@ -1,6 +1,6 @@
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
# mf6/utils/createpackages.py
-# FILE created on June 29, 2023 01:58:48 UTC
+# FILE created on June 29, 2023 14:20:38 UTC
from .. import mfpackage
from ..data.mfdatautil import ArrayTemplateGenerator, ListTemplateGenerator
diff --git a/flopy/mf6/modflow/mfgwfghb.py b/flopy/mf6/modflow/mfgwfghb.py
index 395190a97..0bc28e420 100644
--- a/flopy/mf6/modflow/mfgwfghb.py
+++ b/flopy/mf6/modflow/mfgwfghb.py
@@ -1,6 +1,6 @@
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
# mf6/utils/createpackages.py
-# FILE created on June 29, 2023 01:58:48 UTC
+# FILE created on June 29, 2023 14:20:38 UTC
from .. import mfpackage
from ..data.mfdatautil import ListTemplateGenerator
diff --git a/flopy/mf6/modflow/mfgwfgnc.py b/flopy/mf6/modflow/mfgwfgnc.py
index 80217c0bf..9524630f9 100644
--- a/flopy/mf6/modflow/mfgwfgnc.py
+++ b/flopy/mf6/modflow/mfgwfgnc.py
@@ -1,6 +1,6 @@
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
# mf6/utils/createpackages.py
-# FILE created on June 29, 2023 01:58:48 UTC
+# FILE created on June 29, 2023 14:20:38 UTC
from .. import mfpackage
from ..data.mfdatautil import ListTemplateGenerator
diff --git a/flopy/mf6/modflow/mfgwfgwf.py b/flopy/mf6/modflow/mfgwfgwf.py
index ef2ba60b1..e0f63d978 100644
--- a/flopy/mf6/modflow/mfgwfgwf.py
+++ b/flopy/mf6/modflow/mfgwfgwf.py
@@ -1,6 +1,6 @@
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
# mf6/utils/createpackages.py
-# FILE created on June 29, 2023 01:58:47 UTC
+# FILE created on June 29, 2023 14:20:38 UTC
from .. import mfpackage
from ..data.mfdatautil import ListTemplateGenerator
diff --git a/flopy/mf6/modflow/mfgwfgwt.py b/flopy/mf6/modflow/mfgwfgwt.py
index b74b93149..e7ca2d372 100644
--- a/flopy/mf6/modflow/mfgwfgwt.py
+++ b/flopy/mf6/modflow/mfgwfgwt.py
@@ -1,6 +1,6 @@
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
# mf6/utils/createpackages.py
-# FILE created on June 29, 2023 01:58:48 UTC
+# FILE created on June 29, 2023 14:20:38 UTC
from .. import mfpackage
diff --git a/flopy/mf6/modflow/mfgwfhfb.py b/flopy/mf6/modflow/mfgwfhfb.py
index afbd17ad9..b86f4561d 100644
--- a/flopy/mf6/modflow/mfgwfhfb.py
+++ b/flopy/mf6/modflow/mfgwfhfb.py
@@ -1,6 +1,6 @@
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
# mf6/utils/createpackages.py
-# FILE created on June 29, 2023 01:58:48 UTC
+# FILE created on June 29, 2023 14:20:38 UTC
from .. import mfpackage
from ..data.mfdatautil import ListTemplateGenerator
diff --git a/flopy/mf6/modflow/mfgwfic.py b/flopy/mf6/modflow/mfgwfic.py
index 7be5cbaa5..5c6a562a5 100644
--- a/flopy/mf6/modflow/mfgwfic.py
+++ b/flopy/mf6/modflow/mfgwfic.py
@@ -1,6 +1,6 @@
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
# mf6/utils/createpackages.py
-# FILE created on June 29, 2023 01:58:48 UTC
+# FILE created on June 29, 2023 14:20:38 UTC
from .. import mfpackage
from ..data.mfdatautil import ArrayTemplateGenerator
diff --git a/flopy/mf6/modflow/mfgwflak.py b/flopy/mf6/modflow/mfgwflak.py
index 40e838d4d..24570d2c0 100644
--- a/flopy/mf6/modflow/mfgwflak.py
+++ b/flopy/mf6/modflow/mfgwflak.py
@@ -1,6 +1,6 @@
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
# mf6/utils/createpackages.py
-# FILE created on June 29, 2023 01:58:48 UTC
+# FILE created on June 29, 2023 14:20:38 UTC
from .. import mfpackage
from ..data.mfdatautil import ListTemplateGenerator
diff --git a/flopy/mf6/modflow/mfgwfmaw.py b/flopy/mf6/modflow/mfgwfmaw.py
index 279f596db..0f11efbe9 100644
--- a/flopy/mf6/modflow/mfgwfmaw.py
+++ b/flopy/mf6/modflow/mfgwfmaw.py
@@ -1,6 +1,6 @@
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
# mf6/utils/createpackages.py
-# FILE created on June 29, 2023 01:58:48 UTC
+# FILE created on June 29, 2023 14:20:38 UTC
from .. import mfpackage
from ..data.mfdatautil import ListTemplateGenerator
diff --git a/flopy/mf6/modflow/mfgwfmvr.py b/flopy/mf6/modflow/mfgwfmvr.py
index c0a8033b0..7b9892565 100644
--- a/flopy/mf6/modflow/mfgwfmvr.py
+++ b/flopy/mf6/modflow/mfgwfmvr.py
@@ -1,6 +1,6 @@
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
# mf6/utils/createpackages.py
-# FILE created on June 29, 2023 01:58:48 UTC
+# FILE created on June 29, 2023 14:20:38 UTC
from .. import mfpackage
from ..data.mfdatautil import ListTemplateGenerator
diff --git a/flopy/mf6/modflow/mfgwfnam.py b/flopy/mf6/modflow/mfgwfnam.py
index d32de56eb..060d0fc9b 100644
--- a/flopy/mf6/modflow/mfgwfnam.py
+++ b/flopy/mf6/modflow/mfgwfnam.py
@@ -1,6 +1,6 @@
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
# mf6/utils/createpackages.py
-# FILE created on June 29, 2023 01:58:48 UTC
+# FILE created on June 29, 2023 14:20:38 UTC
from .. import mfpackage
from ..data.mfdatautil import ListTemplateGenerator
diff --git a/flopy/mf6/modflow/mfgwfnpf.py b/flopy/mf6/modflow/mfgwfnpf.py
index 38e965138..e230e1322 100644
--- a/flopy/mf6/modflow/mfgwfnpf.py
+++ b/flopy/mf6/modflow/mfgwfnpf.py
@@ -1,6 +1,6 @@
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
# mf6/utils/createpackages.py
-# FILE created on June 29, 2023 01:58:48 UTC
+# FILE created on June 29, 2023 14:20:38 UTC
from .. import mfpackage
from ..data.mfdatautil import ArrayTemplateGenerator, ListTemplateGenerator
diff --git a/flopy/mf6/modflow/mfgwfoc.py b/flopy/mf6/modflow/mfgwfoc.py
index 13a57b59c..3586b9631 100644
--- a/flopy/mf6/modflow/mfgwfoc.py
+++ b/flopy/mf6/modflow/mfgwfoc.py
@@ -1,6 +1,6 @@
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
# mf6/utils/createpackages.py
-# FILE created on June 29, 2023 01:58:48 UTC
+# FILE created on June 29, 2023 14:20:38 UTC
from .. import mfpackage
from ..data.mfdatautil import ListTemplateGenerator
diff --git a/flopy/mf6/modflow/mfgwfrch.py b/flopy/mf6/modflow/mfgwfrch.py
index b6859d280..eeac8c571 100644
--- a/flopy/mf6/modflow/mfgwfrch.py
+++ b/flopy/mf6/modflow/mfgwfrch.py
@@ -1,6 +1,6 @@
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
# mf6/utils/createpackages.py
-# FILE created on June 29, 2023 01:58:48 UTC
+# FILE created on June 29, 2023 14:20:38 UTC
from .. import mfpackage
from ..data.mfdatautil import ListTemplateGenerator
diff --git a/flopy/mf6/modflow/mfgwfrcha.py b/flopy/mf6/modflow/mfgwfrcha.py
index 1645bf86f..35fc60d5f 100644
--- a/flopy/mf6/modflow/mfgwfrcha.py
+++ b/flopy/mf6/modflow/mfgwfrcha.py
@@ -1,6 +1,6 @@
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
# mf6/utils/createpackages.py
-# FILE created on June 29, 2023 01:58:48 UTC
+# FILE created on June 29, 2023 14:20:38 UTC
from .. import mfpackage
from ..data.mfdatautil import ArrayTemplateGenerator, ListTemplateGenerator
diff --git a/flopy/mf6/modflow/mfgwfriv.py b/flopy/mf6/modflow/mfgwfriv.py
index f204c5107..56389249b 100644
--- a/flopy/mf6/modflow/mfgwfriv.py
+++ b/flopy/mf6/modflow/mfgwfriv.py
@@ -1,6 +1,6 @@
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
# mf6/utils/createpackages.py
-# FILE created on June 29, 2023 01:58:48 UTC
+# FILE created on June 29, 2023 14:20:38 UTC
from .. import mfpackage
from ..data.mfdatautil import ListTemplateGenerator
diff --git a/flopy/mf6/modflow/mfgwfsfr.py b/flopy/mf6/modflow/mfgwfsfr.py
index b354d34c8..0ff6e66df 100644
--- a/flopy/mf6/modflow/mfgwfsfr.py
+++ b/flopy/mf6/modflow/mfgwfsfr.py
@@ -1,6 +1,6 @@
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
# mf6/utils/createpackages.py
-# FILE created on June 29, 2023 01:58:48 UTC
+# FILE created on June 29, 2023 14:20:38 UTC
from .. import mfpackage
from ..data.mfdatautil import ListTemplateGenerator
diff --git a/flopy/mf6/modflow/mfgwfsto.py b/flopy/mf6/modflow/mfgwfsto.py
index e3563bab4..306ce7dbf 100644
--- a/flopy/mf6/modflow/mfgwfsto.py
+++ b/flopy/mf6/modflow/mfgwfsto.py
@@ -1,6 +1,6 @@
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
# mf6/utils/createpackages.py
-# FILE created on June 29, 2023 01:58:48 UTC
+# FILE created on June 29, 2023 14:20:38 UTC
from .. import mfpackage
from ..data.mfdatautil import ArrayTemplateGenerator, ListTemplateGenerator
diff --git a/flopy/mf6/modflow/mfgwfuzf.py b/flopy/mf6/modflow/mfgwfuzf.py
index c03a13464..085daefd3 100644
--- a/flopy/mf6/modflow/mfgwfuzf.py
+++ b/flopy/mf6/modflow/mfgwfuzf.py
@@ -1,6 +1,6 @@
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
# mf6/utils/createpackages.py
-# FILE created on June 29, 2023 01:58:48 UTC
+# FILE created on June 29, 2023 14:20:38 UTC
from .. import mfpackage
from ..data.mfdatautil import ListTemplateGenerator
diff --git a/flopy/mf6/modflow/mfgwfvsc.py b/flopy/mf6/modflow/mfgwfvsc.py
index 868c381c1..5c14ea448 100644
--- a/flopy/mf6/modflow/mfgwfvsc.py
+++ b/flopy/mf6/modflow/mfgwfvsc.py
@@ -1,6 +1,6 @@
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
# mf6/utils/createpackages.py
-# FILE created on June 29, 2023 01:58:48 UTC
+# FILE created on June 29, 2023 14:20:38 UTC
from .. import mfpackage
from ..data.mfdatautil import ListTemplateGenerator
diff --git a/flopy/mf6/modflow/mfgwfwel.py b/flopy/mf6/modflow/mfgwfwel.py
index 7b76716e1..6dee2f174 100644
--- a/flopy/mf6/modflow/mfgwfwel.py
+++ b/flopy/mf6/modflow/mfgwfwel.py
@@ -1,6 +1,6 @@
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
# mf6/utils/createpackages.py
-# FILE created on June 29, 2023 01:58:48 UTC
+# FILE created on June 29, 2023 14:20:38 UTC
from .. import mfpackage
from ..data.mfdatautil import ListTemplateGenerator
diff --git a/flopy/mf6/modflow/mfgwt.py b/flopy/mf6/modflow/mfgwt.py
index 07434dc33..afd4d7f9c 100644
--- a/flopy/mf6/modflow/mfgwt.py
+++ b/flopy/mf6/modflow/mfgwt.py
@@ -1,6 +1,6 @@
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
# mf6/utils/createpackages.py
-# FILE created on June 29, 2023 01:58:48 UTC
+# FILE created on June 29, 2023 14:20:38 UTC
from .. import mfmodel
from ..data.mfdatautil import ArrayTemplateGenerator, ListTemplateGenerator
diff --git a/flopy/mf6/modflow/mfgwtadv.py b/flopy/mf6/modflow/mfgwtadv.py
index 8c9922a21..e0e3a1820 100644
--- a/flopy/mf6/modflow/mfgwtadv.py
+++ b/flopy/mf6/modflow/mfgwtadv.py
@@ -1,6 +1,6 @@
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
# mf6/utils/createpackages.py
-# FILE created on June 29, 2023 01:58:48 UTC
+# FILE created on June 29, 2023 14:20:38 UTC
from .. import mfpackage
diff --git a/flopy/mf6/modflow/mfgwtapi.py b/flopy/mf6/modflow/mfgwtapi.py
index eb79674f5..36425a383 100644
--- a/flopy/mf6/modflow/mfgwtapi.py
+++ b/flopy/mf6/modflow/mfgwtapi.py
@@ -1,6 +1,6 @@
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
# mf6/utils/createpackages.py
-# FILE created on June 29, 2023 01:58:48 UTC
+# FILE created on June 29, 2023 14:20:38 UTC
from .. import mfpackage
from ..data.mfdatautil import ListTemplateGenerator
diff --git a/flopy/mf6/modflow/mfgwtcnc.py b/flopy/mf6/modflow/mfgwtcnc.py
index 78cc353ec..313750b07 100644
--- a/flopy/mf6/modflow/mfgwtcnc.py
+++ b/flopy/mf6/modflow/mfgwtcnc.py
@@ -1,6 +1,6 @@
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
# mf6/utils/createpackages.py
-# FILE created on June 29, 2023 01:58:48 UTC
+# FILE created on June 29, 2023 14:20:38 UTC
from .. import mfpackage
from ..data.mfdatautil import ListTemplateGenerator
diff --git a/flopy/mf6/modflow/mfgwtdis.py b/flopy/mf6/modflow/mfgwtdis.py
index 5236a9733..d12d8a6aa 100644
--- a/flopy/mf6/modflow/mfgwtdis.py
+++ b/flopy/mf6/modflow/mfgwtdis.py
@@ -1,6 +1,6 @@
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
# mf6/utils/createpackages.py
-# FILE created on June 29, 2023 01:58:48 UTC
+# FILE created on June 29, 2023 14:20:38 UTC
from .. import mfpackage
from ..data.mfdatautil import ArrayTemplateGenerator
diff --git a/flopy/mf6/modflow/mfgwtdisu.py b/flopy/mf6/modflow/mfgwtdisu.py
index 86ee1677f..f965cf1c3 100644
--- a/flopy/mf6/modflow/mfgwtdisu.py
+++ b/flopy/mf6/modflow/mfgwtdisu.py
@@ -1,6 +1,6 @@
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
# mf6/utils/createpackages.py
-# FILE created on June 29, 2023 01:58:48 UTC
+# FILE created on June 29, 2023 14:20:38 UTC
from .. import mfpackage
from ..data.mfdatautil import ArrayTemplateGenerator, ListTemplateGenerator
diff --git a/flopy/mf6/modflow/mfgwtdisv.py b/flopy/mf6/modflow/mfgwtdisv.py
index a9f373e39..f6d234bc7 100644
--- a/flopy/mf6/modflow/mfgwtdisv.py
+++ b/flopy/mf6/modflow/mfgwtdisv.py
@@ -1,6 +1,6 @@
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
# mf6/utils/createpackages.py
-# FILE created on June 29, 2023 01:58:48 UTC
+# FILE created on June 29, 2023 14:20:38 UTC
from .. import mfpackage
from ..data.mfdatautil import ArrayTemplateGenerator, ListTemplateGenerator
diff --git a/flopy/mf6/modflow/mfgwtdsp.py b/flopy/mf6/modflow/mfgwtdsp.py
index 640a8e130..364f770a9 100644
--- a/flopy/mf6/modflow/mfgwtdsp.py
+++ b/flopy/mf6/modflow/mfgwtdsp.py
@@ -1,6 +1,6 @@
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
# mf6/utils/createpackages.py
-# FILE created on June 29, 2023 01:58:48 UTC
+# FILE created on June 29, 2023 14:20:38 UTC
from .. import mfpackage
from ..data.mfdatautil import ArrayTemplateGenerator
diff --git a/flopy/mf6/modflow/mfgwtfmi.py b/flopy/mf6/modflow/mfgwtfmi.py
index 7b718082a..9e9fc0ca9 100644
--- a/flopy/mf6/modflow/mfgwtfmi.py
+++ b/flopy/mf6/modflow/mfgwtfmi.py
@@ -1,6 +1,6 @@
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
# mf6/utils/createpackages.py
-# FILE created on June 29, 2023 01:58:48 UTC
+# FILE created on June 29, 2023 14:20:38 UTC
from .. import mfpackage
from ..data.mfdatautil import ListTemplateGenerator
diff --git a/flopy/mf6/modflow/mfgwtgwt.py b/flopy/mf6/modflow/mfgwtgwt.py
index 17c6575f5..bc8402ed8 100644
--- a/flopy/mf6/modflow/mfgwtgwt.py
+++ b/flopy/mf6/modflow/mfgwtgwt.py
@@ -1,6 +1,6 @@
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
# mf6/utils/createpackages.py
-# FILE created on June 29, 2023 01:58:48 UTC
+# FILE created on June 29, 2023 14:20:38 UTC
from .. import mfpackage
from ..data.mfdatautil import ListTemplateGenerator
diff --git a/flopy/mf6/modflow/mfgwtic.py b/flopy/mf6/modflow/mfgwtic.py
index 160f5e9b8..1bd48dae1 100644
--- a/flopy/mf6/modflow/mfgwtic.py
+++ b/flopy/mf6/modflow/mfgwtic.py
@@ -1,6 +1,6 @@
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
# mf6/utils/createpackages.py
-# FILE created on June 29, 2023 01:58:48 UTC
+# FILE created on June 29, 2023 14:20:38 UTC
from .. import mfpackage
from ..data.mfdatautil import ArrayTemplateGenerator
diff --git a/flopy/mf6/modflow/mfgwtist.py b/flopy/mf6/modflow/mfgwtist.py
index 7c4da7410..316944314 100644
--- a/flopy/mf6/modflow/mfgwtist.py
+++ b/flopy/mf6/modflow/mfgwtist.py
@@ -1,6 +1,6 @@
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
# mf6/utils/createpackages.py
-# FILE created on June 29, 2023 01:58:48 UTC
+# FILE created on June 29, 2023 14:20:38 UTC
from .. import mfpackage
from ..data.mfdatautil import ArrayTemplateGenerator, ListTemplateGenerator
diff --git a/flopy/mf6/modflow/mfgwtlkt.py b/flopy/mf6/modflow/mfgwtlkt.py
index 566f3ded0..80c3abec1 100644
--- a/flopy/mf6/modflow/mfgwtlkt.py
+++ b/flopy/mf6/modflow/mfgwtlkt.py
@@ -1,6 +1,6 @@
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
# mf6/utils/createpackages.py
-# FILE created on June 29, 2023 01:58:48 UTC
+# FILE created on June 29, 2023 14:20:38 UTC
from .. import mfpackage
from ..data.mfdatautil import ListTemplateGenerator
diff --git a/flopy/mf6/modflow/mfgwtmst.py b/flopy/mf6/modflow/mfgwtmst.py
index f8ecbca84..0036946c6 100644
--- a/flopy/mf6/modflow/mfgwtmst.py
+++ b/flopy/mf6/modflow/mfgwtmst.py
@@ -1,6 +1,6 @@
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
# mf6/utils/createpackages.py
-# FILE created on June 29, 2023 01:58:48 UTC
+# FILE created on June 29, 2023 14:20:38 UTC
from .. import mfpackage
from ..data.mfdatautil import ArrayTemplateGenerator
diff --git a/flopy/mf6/modflow/mfgwtmvt.py b/flopy/mf6/modflow/mfgwtmvt.py
index 987ad602f..eb13fd9fe 100644
--- a/flopy/mf6/modflow/mfgwtmvt.py
+++ b/flopy/mf6/modflow/mfgwtmvt.py
@@ -1,6 +1,6 @@
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
# mf6/utils/createpackages.py
-# FILE created on June 29, 2023 01:58:48 UTC
+# FILE created on June 29, 2023 14:20:38 UTC
from .. import mfpackage
from ..data.mfdatautil import ListTemplateGenerator
diff --git a/flopy/mf6/modflow/mfgwtmwt.py b/flopy/mf6/modflow/mfgwtmwt.py
index a4ab642b6..45cbfb2b6 100644
--- a/flopy/mf6/modflow/mfgwtmwt.py
+++ b/flopy/mf6/modflow/mfgwtmwt.py
@@ -1,6 +1,6 @@
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
# mf6/utils/createpackages.py
-# FILE created on June 29, 2023 01:58:48 UTC
+# FILE created on June 29, 2023 14:20:38 UTC
from .. import mfpackage
from ..data.mfdatautil import ListTemplateGenerator
diff --git a/flopy/mf6/modflow/mfgwtnam.py b/flopy/mf6/modflow/mfgwtnam.py
index 318501fd4..86355bdd2 100644
--- a/flopy/mf6/modflow/mfgwtnam.py
+++ b/flopy/mf6/modflow/mfgwtnam.py
@@ -1,6 +1,6 @@
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
# mf6/utils/createpackages.py
-# FILE created on June 29, 2023 01:58:48 UTC
+# FILE created on June 29, 2023 14:20:38 UTC
from .. import mfpackage
from ..data.mfdatautil import ListTemplateGenerator
diff --git a/flopy/mf6/modflow/mfgwtoc.py b/flopy/mf6/modflow/mfgwtoc.py
index 86aa84b87..fbf5be264 100644
--- a/flopy/mf6/modflow/mfgwtoc.py
+++ b/flopy/mf6/modflow/mfgwtoc.py
@@ -1,6 +1,6 @@
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
# mf6/utils/createpackages.py
-# FILE created on June 29, 2023 01:58:48 UTC
+# FILE created on June 29, 2023 14:20:38 UTC
from .. import mfpackage
from ..data.mfdatautil import ListTemplateGenerator
diff --git a/flopy/mf6/modflow/mfgwtsft.py b/flopy/mf6/modflow/mfgwtsft.py
index 405faec67..9b8f50b00 100644
--- a/flopy/mf6/modflow/mfgwtsft.py
+++ b/flopy/mf6/modflow/mfgwtsft.py
@@ -1,6 +1,6 @@
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
# mf6/utils/createpackages.py
-# FILE created on June 29, 2023 01:58:48 UTC
+# FILE created on June 29, 2023 14:20:38 UTC
from .. import mfpackage
from ..data.mfdatautil import ListTemplateGenerator
diff --git a/flopy/mf6/modflow/mfgwtsrc.py b/flopy/mf6/modflow/mfgwtsrc.py
index 0b0d96a62..0b2f22d22 100644
--- a/flopy/mf6/modflow/mfgwtsrc.py
+++ b/flopy/mf6/modflow/mfgwtsrc.py
@@ -1,6 +1,6 @@
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
# mf6/utils/createpackages.py
-# FILE created on June 29, 2023 01:58:48 UTC
+# FILE created on June 29, 2023 14:20:38 UTC
from .. import mfpackage
from ..data.mfdatautil import ListTemplateGenerator
diff --git a/flopy/mf6/modflow/mfgwtssm.py b/flopy/mf6/modflow/mfgwtssm.py
index 81f7fadc5..66c4d8234 100644
--- a/flopy/mf6/modflow/mfgwtssm.py
+++ b/flopy/mf6/modflow/mfgwtssm.py
@@ -1,6 +1,6 @@
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
# mf6/utils/createpackages.py
-# FILE created on June 29, 2023 01:58:48 UTC
+# FILE created on June 29, 2023 14:20:38 UTC
from .. import mfpackage
from ..data.mfdatautil import ListTemplateGenerator
diff --git a/flopy/mf6/modflow/mfgwtuzt.py b/flopy/mf6/modflow/mfgwtuzt.py
index 36db14ba2..4ef9ff325 100644
--- a/flopy/mf6/modflow/mfgwtuzt.py
+++ b/flopy/mf6/modflow/mfgwtuzt.py
@@ -1,6 +1,6 @@
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
# mf6/utils/createpackages.py
-# FILE created on June 29, 2023 01:58:48 UTC
+# FILE created on June 29, 2023 14:20:38 UTC
from .. import mfpackage
from ..data.mfdatautil import ListTemplateGenerator
diff --git a/flopy/mf6/modflow/mfims.py b/flopy/mf6/modflow/mfims.py
index 4e54b42f3..68a25846e 100644
--- a/flopy/mf6/modflow/mfims.py
+++ b/flopy/mf6/modflow/mfims.py
@@ -1,6 +1,6 @@
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
# mf6/utils/createpackages.py
-# FILE created on June 29, 2023 01:58:47 UTC
+# FILE created on June 29, 2023 14:20:38 UTC
from .. import mfpackage
from ..data.mfdatautil import ListTemplateGenerator
diff --git a/flopy/mf6/modflow/mfmvr.py b/flopy/mf6/modflow/mfmvr.py
index 13375f853..e8312bb99 100644
--- a/flopy/mf6/modflow/mfmvr.py
+++ b/flopy/mf6/modflow/mfmvr.py
@@ -1,6 +1,6 @@
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
# mf6/utils/createpackages.py
-# FILE created on June 29, 2023 01:58:47 UTC
+# FILE created on June 29, 2023 14:20:38 UTC
from .. import mfpackage
from ..data.mfdatautil import ListTemplateGenerator
diff --git a/flopy/mf6/modflow/mfmvt.py b/flopy/mf6/modflow/mfmvt.py
index c2f420bc7..25a980f26 100644
--- a/flopy/mf6/modflow/mfmvt.py
+++ b/flopy/mf6/modflow/mfmvt.py
@@ -1,6 +1,6 @@
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
# mf6/utils/createpackages.py
-# FILE created on June 29, 2023 01:58:48 UTC
+# FILE created on June 29, 2023 14:20:38 UTC
from .. import mfpackage
from ..data.mfdatautil import ListTemplateGenerator
diff --git a/flopy/mf6/modflow/mfnam.py b/flopy/mf6/modflow/mfnam.py
index 84ee1c5bc..6b8e71ae1 100644
--- a/flopy/mf6/modflow/mfnam.py
+++ b/flopy/mf6/modflow/mfnam.py
@@ -1,6 +1,6 @@
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
# mf6/utils/createpackages.py
-# FILE created on June 29, 2023 01:58:47 UTC
+# FILE created on June 29, 2023 14:20:38 UTC
from .. import mfpackage
from ..data.mfdatautil import ListTemplateGenerator
diff --git a/flopy/mf6/modflow/mftdis.py b/flopy/mf6/modflow/mftdis.py
index b01717956..a03fd63fc 100644
--- a/flopy/mf6/modflow/mftdis.py
+++ b/flopy/mf6/modflow/mftdis.py
@@ -1,6 +1,6 @@
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
# mf6/utils/createpackages.py
-# FILE created on June 29, 2023 01:58:47 UTC
+# FILE created on June 29, 2023 14:20:38 UTC
from .. import mfpackage
from ..data.mfdatautil import ListTemplateGenerator
diff --git a/flopy/mf6/modflow/mfutlats.py b/flopy/mf6/modflow/mfutlats.py
index e08265b0b..b7eafcd11 100644
--- a/flopy/mf6/modflow/mfutlats.py
+++ b/flopy/mf6/modflow/mfutlats.py
@@ -1,6 +1,6 @@
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
# mf6/utils/createpackages.py
-# FILE created on June 29, 2023 01:58:48 UTC
+# FILE created on June 29, 2023 14:20:38 UTC
from .. import mfpackage
from ..data.mfdatautil import ListTemplateGenerator
diff --git a/flopy/mf6/modflow/mfutllaktab.py b/flopy/mf6/modflow/mfutllaktab.py
index 9f98abda8..835a21952 100644
--- a/flopy/mf6/modflow/mfutllaktab.py
+++ b/flopy/mf6/modflow/mfutllaktab.py
@@ -1,6 +1,6 @@
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
# mf6/utils/createpackages.py
-# FILE created on June 29, 2023 01:58:48 UTC
+# FILE created on June 29, 2023 14:20:38 UTC
from .. import mfpackage
from ..data.mfdatautil import ListTemplateGenerator
diff --git a/flopy/mf6/modflow/mfutlobs.py b/flopy/mf6/modflow/mfutlobs.py
index aa40e559f..1ecc6bd51 100644
--- a/flopy/mf6/modflow/mfutlobs.py
+++ b/flopy/mf6/modflow/mfutlobs.py
@@ -1,6 +1,6 @@
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
# mf6/utils/createpackages.py
-# FILE created on June 29, 2023 01:58:48 UTC
+# FILE created on June 29, 2023 14:20:38 UTC
from .. import mfpackage
from ..data.mfdatautil import ListTemplateGenerator
diff --git a/flopy/mf6/modflow/mfutlsfrtab.py b/flopy/mf6/modflow/mfutlsfrtab.py
index aec70b114..5bed96975 100644
--- a/flopy/mf6/modflow/mfutlsfrtab.py
+++ b/flopy/mf6/modflow/mfutlsfrtab.py
@@ -1,6 +1,6 @@
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
# mf6/utils/createpackages.py
-# FILE created on June 29, 2023 01:58:48 UTC
+# FILE created on June 29, 2023 14:20:38 UTC
from .. import mfpackage
from ..data.mfdatautil import ListTemplateGenerator
diff --git a/flopy/mf6/modflow/mfutlspc.py b/flopy/mf6/modflow/mfutlspc.py
index 69d301197..e67d6ca1f 100644
--- a/flopy/mf6/modflow/mfutlspc.py
+++ b/flopy/mf6/modflow/mfutlspc.py
@@ -1,6 +1,6 @@
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
# mf6/utils/createpackages.py
-# FILE created on June 29, 2023 01:58:48 UTC
+# FILE created on June 29, 2023 14:20:38 UTC
from .. import mfpackage
from ..data.mfdatautil import ListTemplateGenerator
diff --git a/flopy/mf6/modflow/mfutlspca.py b/flopy/mf6/modflow/mfutlspca.py
index 4feb8b5c1..4c76020f7 100644
--- a/flopy/mf6/modflow/mfutlspca.py
+++ b/flopy/mf6/modflow/mfutlspca.py
@@ -1,6 +1,6 @@
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
# mf6/utils/createpackages.py
-# FILE created on June 29, 2023 01:58:48 UTC
+# FILE created on June 29, 2023 14:20:38 UTC
from .. import mfpackage
from ..data.mfdatautil import ArrayTemplateGenerator, ListTemplateGenerator
diff --git a/flopy/mf6/modflow/mfutltas.py b/flopy/mf6/modflow/mfutltas.py
index 3817dea70..f32d2ce72 100644
--- a/flopy/mf6/modflow/mfutltas.py
+++ b/flopy/mf6/modflow/mfutltas.py
@@ -1,6 +1,6 @@
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
# mf6/utils/createpackages.py
-# FILE created on June 29, 2023 01:58:48 UTC
+# FILE created on June 29, 2023 14:20:38 UTC
from .. import mfpackage
from ..data.mfdatautil import ArrayTemplateGenerator, ListTemplateGenerator
diff --git a/flopy/mf6/modflow/mfutlts.py b/flopy/mf6/modflow/mfutlts.py
index 519e98507..748fe40a5 100644
--- a/flopy/mf6/modflow/mfutlts.py
+++ b/flopy/mf6/modflow/mfutlts.py
@@ -1,6 +1,6 @@
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
# mf6/utils/createpackages.py
-# FILE created on June 29, 2023 01:58:48 UTC
+# FILE created on June 29, 2023 14:20:38 UTC
from .. import mfpackage
from ..data.mfdatautil import ListTemplateGenerator
diff --git a/flopy/mf6/modflow/mfutltvk.py b/flopy/mf6/modflow/mfutltvk.py
index 7f383aa56..1246e42b0 100644
--- a/flopy/mf6/modflow/mfutltvk.py
+++ b/flopy/mf6/modflow/mfutltvk.py
@@ -1,6 +1,6 @@
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
# mf6/utils/createpackages.py
-# FILE created on June 29, 2023 01:58:48 UTC
+# FILE created on June 29, 2023 14:20:38 UTC
from .. import mfpackage
from ..data.mfdatautil import ListTemplateGenerator
diff --git a/flopy/mf6/modflow/mfutltvs.py b/flopy/mf6/modflow/mfutltvs.py
index b56500fc2..668ea596b 100644
--- a/flopy/mf6/modflow/mfutltvs.py
+++ b/flopy/mf6/modflow/mfutltvs.py
@@ -1,6 +1,6 @@
# DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY
# mf6/utils/createpackages.py
-# FILE created on June 29, 2023 01:58:48 UTC
+# FILE created on June 29, 2023 14:20:38 UTC
from .. import mfpackage
from ..data.mfdatautil import ListTemplateGenerator
diff --git a/flopy/utils/get_modflow.py b/flopy/utils/get_modflow.py
index 60442e350..2c979e163 100755
--- a/flopy/utils/get_modflow.py
+++ b/flopy/utils/get_modflow.py
@@ -396,18 +396,14 @@ def run_main(
release = get_release(repo, release_id, quiet)
assets = release.get("assets", [])
- # Windows 64-bit asset in modflow6 repo release has no OS tag
- if repo == "modflow6" and ostag == "win64":
- asset = list(sorted(assets, key=lambda a: len(a["name"])))[0]
+ for asset in assets:
+ if ostag in asset["name"]:
+ break
else:
- for asset in assets:
- if ostag in asset["name"]:
- break
- else:
- raise ValueError(
- f"could not find ostag {ostag!r} from release {release['tag_name']!r}; "
- f"see available assets here:\n{release['html_url']}"
- )
+ raise ValueError(
+ f"could not find ostag {ostag!r} from release {release['tag_name']!r}; "
+ f"see available assets here:\n{release['html_url']}"
+ )
asset_name = asset["name"]
download_url = asset["browser_download_url"]
if repo == "modflow6":
diff --git a/flopy/version.py b/flopy/version.py
index 0ca2462d3..82c1fc0dd 100644
--- a/flopy/version.py
+++ b/flopy/version.py
@@ -1,11 +1,3 @@
-# flopy version file automatically created using update_version.py on June 29, 2023 01:58:44
+# flopy version file automatically created using update_version.py on June 29, 2023 14:20:34
-# created on...June 29, 2023 01:58:44
-
-major = 3
-minor = 4
-micro = 0
-label = ""
-__version__ = "{:d}.{:d}.{:d}".format(major, minor, micro)
-if label:
- __version__ += "{}{}".format(__version__, label)
+__version__ = "3.4.1"
diff --git a/pyproject.toml b/pyproject.toml
index 0dd8c2cd2..8eb30c8ef 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -56,6 +56,7 @@ test = [
"pytest-dotenv",
"pytest-virtualenv",
"pytest-xdist",
+ "virtualenv"
]
optional = [
"affine",
diff --git a/scripts/update_version.py b/scripts/update_version.py
index 781e17d6d..8a1e11335 100644
--- a/scripts/update_version.py
+++ b/scripts/update_version.py
@@ -11,6 +11,7 @@
import yaml
from filelock import FileLock
+from packaging.version import Version, parse
_project_name = "flopy"
_project_root_path = Path(__file__).parent.parent
@@ -59,42 +60,8 @@ def split_nonnumeric(s):
return [s[: match.start()], s[match.start() :]] if match else s
-class Version(NamedTuple):
- """Semantic version number, optionally with a short label.
- The label may contain numbers but must not begin with a number."""
-
- major: int = 0
- minor: int = 0
- patch: int = 0
- label: Optional[str] = None
-
- def __repr__(self):
- s = f"{self.major}.{self.minor}.{self.patch}"
- if self.label is not None and self.label != "":
- s += self.label
- return s
-
- @classmethod
- def from_string(cls, version: str) -> "Version":
- t = version.split(".")
- assert len(t) > 2
- vmajor = int(t[0])
- vminor = int(t[1])
- tt = split_nonnumeric(t[2])
- vpatch = int(tt[0])
- vlabel = tt[1] if len(tt) > 1 else None
- return cls(major=vmajor, minor=vminor, patch=vpatch, label=vlabel)
-
- @classmethod
- def from_file(cls, path: PathLike) -> "Version":
- path = Path(path).expanduser().absolute()
- lines = [line.rstrip("\n") for line in open(Path(path), "r")]
- assert len(lines) == 1
- return Version.from_string(lines[0])
-
-
-_initial_version = Version(0, 0, 1)
-_current_version = Version.from_file(_version_txt_path)
+_initial_version = Version("0.0.1")
+_current_version = Version(_version_txt_path.read_text().strip())
def get_disclaimer(approved: bool = False):
@@ -113,21 +80,7 @@ def update_version_py(timestamp: datetime, version: Version):
f"# {_project_name} version file automatically created using "
f"{Path(__file__).name} on {timestamp:%B %d, %Y %H:%M:%S}\n\n"
)
- f.write(
- "# created on..." + f"{timestamp.strftime('%B %d, %Y %H:%M:%S')}\n"
- )
- f.write("\n")
- f.write(f"major = {version.major}\n")
- f.write(f"minor = {version.minor}\n")
- f.write(f"micro = {version.patch}\n")
- f.write(
- "label = "
- + (("'" + version.label + "'") if version.label else "''")
- + "\n"
- )
- f.write("__version__ = '{:d}.{:d}.{:d}'.format(major, minor, micro)\n")
- f.write("if label:\n")
- f.write("\t__version__ += '{}{}'.format(__version__, label)")
+ f.write(f"__version__ = '{version}'\n")
f.close()
print(f"Updated {_version_py_path} to version {version}")
@@ -317,11 +270,11 @@ def update_version(
lock_path = Path(_version_txt_path.name + ".lock")
try:
lock = FileLock(lock_path)
- previous = Version.from_file(_version_txt_path)
+ previous = Version(_version_txt_path.read_text().strip())
version = (
version
if version
- else Version(previous.major, previous.minor, previous.patch)
+ else Version(previous.major, previous.minor, previous.micro)
)
with lock:
@@ -375,11 +328,13 @@ def update_version(
args = parser.parse_args()
if args.get:
- print(Version.from_file(_project_root_path / "version.txt"))
+ print(
+ Version((_project_root_path / "version.txt").read_text().strip())
+ )
else:
update_version(
timestamp=datetime.now(),
- version=Version.from_string(args.version)
+ version=Version(args.version)
if args.version
else _current_version,
approved=args.approve,
diff --git a/version.txt b/version.txt
index fbcbf7380..8cf6caf56 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-3.4.0
\ No newline at end of file
+3.4.1
\ No newline at end of file