Skip to content

Commit

Permalink
Merge pull request #114 from MODFLOW-USGS/post-release-1.2.0-reset
Browse files Browse the repository at this point in the history
Reinitialize develop branch
  • Loading branch information
wpbonelli committed Sep 12, 2023
2 parents a41caa7 + acc56ba commit 8168826
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 4 deletions.
6 changes: 6 additions & 0 deletions HISTORY.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
### Version 1.2.0

#### New features

* [feat(fixtures)](https://github.com/MODFLOW-USGS/modflow-devtools/commit/a41caa75f8519780c7ee60daf61d8225b4380dd5): Add use_pandas pytest fixture and --pandas CLI arg (#112). Committed by wpbonelli on 2023-09-12.

### Version 1.1.0

#### Refactoring
Expand Down
2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

project = "modflow-devtools"
author = "MODFLOW Team"
release = "1.2.0.dev0"
release = "1.3.0.dev0"

# -- General configuration ---------------------------------------------------
# https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration
Expand Down
4 changes: 2 additions & 2 deletions modflow_devtools/__init__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
__author__ = "Joseph D. Hughes"
__date__ = "Aug 12, 2023"
__version__ = "1.2.0.dev0"
__date__ = "Sep 12, 2023"
__version__ = "1.3.0.dev0"
__maintainer__ = "Joseph D. Hughes"
__email__ = "[email protected]"
__status__ = "Production"
Expand Down
2 changes: 1 addition & 1 deletion version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.2.0.dev0
1.3.0.dev0

0 comments on commit 8168826

Please sign in to comment.