From aa1bf71811dc4c688d124e8097d65e2455cba279 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 30 May 2024 19:07:57 +0000 Subject: [PATCH 1/2] ci(release): set version to 1.6.0, update changelog --- HISTORY.md | 10 ++++++++++ docs/conf.py | 2 +- modflow_devtools/__init__.py | 4 ++-- version.txt | 2 +- version.txt.lock | 0 5 files changed, 14 insertions(+), 4 deletions(-) create mode 100644 version.txt.lock diff --git a/HISTORY.md b/HISTORY.md index 4f87fb5..e9c7399 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,3 +1,13 @@ +### Version 1.6.0 + +#### New features + +* [feat(snapshots)](https://github.com/MODFLOW-USGS/modflow-devtools/commit/4e289ee4a13d13724c5cbcb7a1ee5328fc588c13): Add --snapshot-disable cli option (#157). Committed by wpbonelli on 2024-05-21. + +#### Bug fixes + +* [fix(get_model_paths)](https://github.com/MODFLOW-USGS/modflow-devtools/commit/0e3120a9d1cf53ecc98b861aeb05e3a8fa7afb71): Fix model order within scenario (#156). Committed by wpbonelli on 2024-05-21. + ### Version 1.5.0 #### New features diff --git a/docs/conf.py b/docs/conf.py index e29d7e2..81f36ec 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -8,7 +8,7 @@ project = "modflow-devtools" author = "MODFLOW Team" -release = "1.6.0.dev0" +release = '1.6.0' # -- General configuration --------------------------------------------------- # https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration diff --git a/modflow_devtools/__init__.py b/modflow_devtools/__init__.py index 1a79d68..84768a3 100644 --- a/modflow_devtools/__init__.py +++ b/modflow_devtools/__init__.py @@ -1,6 +1,6 @@ __author__ = "Joseph D. Hughes" -__date__ = "May 15, 2024" -__version__ = "1.6.0.dev0" +__date__ = "May 30, 2024" +__version__ = "1.6.0" __maintainer__ = "Joseph D. Hughes" __email__ = "jdhughes@usgs.gov" __status__ = "Production" diff --git a/version.txt b/version.txt index 24e787f..ce6a70b 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -1.6.0.dev0 \ No newline at end of file +1.6.0 \ No newline at end of file diff --git a/version.txt.lock b/version.txt.lock new file mode 100644 index 0000000..e69de29 From 79dbfdd185b3b77cb02bfd7bf02c4d254a720eca Mon Sep 17 00:00:00 2001 From: w-bonelli Date: Thu, 30 May 2024 15:14:03 -0400 Subject: [PATCH 2/2] ci(release): update to development version 1.7.0.dev0 --- docs/conf.py | 2 +- modflow_devtools/__init__.py | 2 +- version.txt | 2 +- version.txt.lock | 0 4 files changed, 3 insertions(+), 3 deletions(-) delete mode 100644 version.txt.lock diff --git a/docs/conf.py b/docs/conf.py index 81f36ec..94ce53d 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -8,7 +8,7 @@ project = "modflow-devtools" author = "MODFLOW Team" -release = '1.6.0' +release = "1.7.0.dev0" # -- General configuration --------------------------------------------------- # https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration diff --git a/modflow_devtools/__init__.py b/modflow_devtools/__init__.py index 84768a3..898cbd0 100644 --- a/modflow_devtools/__init__.py +++ b/modflow_devtools/__init__.py @@ -1,6 +1,6 @@ __author__ = "Joseph D. Hughes" __date__ = "May 30, 2024" -__version__ = "1.6.0" +__version__ = "1.7.0.dev0" __maintainer__ = "Joseph D. Hughes" __email__ = "jdhughes@usgs.gov" __status__ = "Production" diff --git a/version.txt b/version.txt index ce6a70b..b3a705f 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -1.6.0 \ No newline at end of file +1.7.0.dev0 \ No newline at end of file diff --git a/version.txt.lock b/version.txt.lock deleted file mode 100644 index e69de29..0000000