Merge branch 'master' into develop

# Conflicts: # README.md # pymake/config.py # version.txt
modflowpy · Dec 20, 2024 · e4197a9 · e4197a9
2 parents 036620c + b19d878
commit e4197a9
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 Python package for building MODFLOW-based programs from source files.
 
-### Version 1.2.11.dev0
+### Version 1.3.0
 
 [![PyPI Version](https://img.shields.io/pypi/v/mfpymake.png)](https://pypi.python.org/pypi/mfpymake)
 [![Anaconda Version](https://anaconda.org/conda-forge/mfpymake/badges/version.svg)](https://anaconda.org/conda-forge/mfpymake)  

diff --git a/pymake/config.py b/pymake/config.py
@@ -1,6 +1,6 @@
 __author__ = "Joseph D. Hughes"
-__date__ = "June 17, 2024"
-__version__ = "1.2.11.dev0"
+__date__ = "December 20, 2024"
+__version__ = "1.3.0"
 __maintainer__ = "Joseph D. Hughes"
 __email__ = "[email protected]"
 __status__ = "Production"

diff --git a/version.txt b/version.txt
@@ -1 +1 @@
-1.2.11.dev0
+1.3.0