From 9302fd8b4d91ffb15f1dd1f26b9de81707a11003 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 15 May 2024 16:44:57 +0000 Subject: [PATCH 1/3] ci(release): set version to 1.5.0, update changelog --- HISTORY.md | 12 ++++++++++++ docs/conf.py | 2 +- modflow_devtools/__init__.py | 4 ++-- version.txt | 2 +- version.txt.lock | 0 5 files changed, 16 insertions(+), 4 deletions(-) create mode 100644 version.txt.lock diff --git a/HISTORY.md b/HISTORY.md index 5ee3c8e..4f87fb5 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,3 +1,15 @@ +### Version 1.5.0 + +#### New features + +* [feat(markers)](https://github.com/MODFLOW-USGS/modflow-devtools/commit/1f358de2bc721c1000c3d0823b9440776432e3b0): Add no_parallel marker, support differing pkg/module names (#148). Committed by wpbonelli on 2024-04-12. +* [feat(snapshots)](https://github.com/MODFLOW-USGS/modflow-devtools/commit/c9e445dd1544413f3729c7a78c2a77038db80050): Add snapshot fixtures, remove pandas fixture (#151). Committed by wpbonelli on 2024-05-13. + +#### Refactoring + +* [refactor(latex)](https://github.com/MODFLOW-USGS/modflow-devtools/commit/827b5ec63ebe0b9ea833957637d6b60fdc2f3198): Support path-like, add docstrings (#142). Committed by wpbonelli on 2024-02-25. +* [refactor(snapshots)](https://github.com/MODFLOW-USGS/modflow-devtools/commit/d96089e512fbb79408e4fb58c89ee63da60dc727): Move to separate module (#152). Committed by wpbonelli on 2024-05-13. + ### Version 1.4.0 #### New features diff --git a/docs/conf.py b/docs/conf.py index 9fd38eb..63390be 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -8,7 +8,7 @@ project = "modflow-devtools" author = "MODFLOW Team" -release = "1.5.0.dev0" +release = '1.5.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 f8f2600..7614347 100644 --- a/modflow_devtools/__init__.py +++ b/modflow_devtools/__init__.py @@ -1,6 +1,6 @@ __author__ = "Joseph D. Hughes" -__date__ = "Feb 19, 2024" -__version__ = "1.5.0.dev0" +__date__ = "May 15, 2024" +__version__ = "1.5.0" __maintainer__ = "Joseph D. Hughes" __email__ = "jdhughes@usgs.gov" __status__ = "Production" diff --git a/version.txt b/version.txt index 47ed95f..3e1ad72 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -1.5.0.dev0 \ No newline at end of file +1.5.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 c278a2a36ba3ca3ee79be1f15699086bc95dbc0d Mon Sep 17 00:00:00 2001 From: w-bonelli Date: Wed, 15 May 2024 14:08:28 -0400 Subject: [PATCH 2/3] ci(release): update to development version 1.6.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 63390be..df200b0 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -8,7 +8,7 @@ project = "modflow-devtools" author = "MODFLOW Team" -release = '1.5.0' +release = '1.6.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 7614347..1a79d68 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.5.0" +__version__ = "1.6.0.dev0" __maintainer__ = "Joseph D. Hughes" __email__ = "jdhughes@usgs.gov" __status__ = "Production" diff --git a/version.txt b/version.txt index 3e1ad72..24e787f 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -1.5.0 \ No newline at end of file +1.6.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 From 553e5770459c5fc57e66a70d3d0c23768ea4d941 Mon Sep 17 00:00:00 2001 From: w-bonelli Date: Wed, 15 May 2024 14:09:34 -0400 Subject: [PATCH 3/3] ruff --- autotest/test_snapshots.py | 2 +- docs/conf.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/autotest/test_snapshots.py b/autotest/test_snapshots.py index 04cabc9..0c81aba 100644 --- a/autotest/test_snapshots.py +++ b/autotest/test_snapshots.py @@ -5,7 +5,7 @@ proj_root = Path(__file__).parents[1] module_path = Path(inspect.getmodulename(__file__)) -pytest_plugins = [ "modflow_devtools.snapshots" ] # activate snapshot fixtures +pytest_plugins = ["modflow_devtools.snapshots"] # activate snapshot fixtures snapshot_array = np.array([1.1, 2.2, 3.3]) snapshots_path = proj_root / "autotest" / "__snapshots__" diff --git a/docs/conf.py b/docs/conf.py index df200b0..e29d7e2 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.dev0" # -- General configuration --------------------------------------------------- # https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration