Release 3.3.0

.gitignore

@@ -61,16 +61,14 @@ flopy/.idea
 
 examples/Notebooks/data
 examples/Notebooks/temp
-examples/Notebooks/.ipynb_checkpoints
 examples/FAQ/temp
-examples/FAQ/.ipynb_checkpoints
 examples/Testing/.idea
 examples/Testing/data
-examples/Testing/.ipynb_checkpoints
 examples/scripts/data
 examples/groundwater_paper/Notebooks/temp
-examples/groundwater_paper/Notebooks/.ipynb_checkpoints
 
+# ignore all .ipynb_checkpoints
+.ipynb_checkpoints
 
 autotest/*.bin
 autotest/*.dat

.travis.yml

@@ -6,21 +6,19 @@ services:
 - xvfb
 matrix:
   include:
-  - env: RUN_TYPE=test
-    python: 2.7
+  - env: RUN_TYPE=misc
+    python: 3.7
   - env: RUN_TYPE=test
     python: 3.5
   - env: RUN_TYPE=test
     python: 3.6
   - env: RUN_TYPE=test
     python: 3.7
-  - env: RUN_TYPE=misc
-    python: 3.7
-# - env: RUN_TYPE=test
-#   python: 3.8-dev
+  - env: RUN_TYPE=test
+    python: 3.8
 # allow_failures:
 # - env: RUN_TYPE=test
-#   python: 3.8-dev
+#   python: 3.8
 cache:
   pip: true
   directories:

CONTRIBUTING.md

@@ -49,7 +49,7 @@ We want to fix all the issues as soon as possible, but before fixing a bug we ne
 - version of FloPy used
 - and most importantly - a use-case that fails (ideally an example that uses flopy to generate FloPy input files - see `t0**_test.py` python scripts in the `autotest/` directory)
 
-We will be insisting on a minimal minimal, complete, and verifiable example in order to save maintainers time and ultimately be able to fix more bugs. We understand that sometimes it might be hard to extract essentials bits of code from a larger code-base but we really need to isolate the problem before we can fix it.
+We will be insisting on a minimal, complete, and verifiable example in order to save maintainers time and ultimately be able to fix more bugs. We understand that sometimes it might be hard to extract essentials bits of code from a larger code-base but we really need to isolate the problem before we can fix it.
 
 Unfortunately, we are not able to investigate / fix bugs without a minimal, complete, and verifiable example, so if we don't hear back from you we are going to close an issue that doesn't have enough info to be reproduced.
 
@@ -76,7 +76,7 @@ Before you submit your Pull Request (PR) consider the following guidelines:
     nosetests -v t*_test.py
     ```
    Note: the FloPy test suite requires the [nosetests](https://pypi.org/project/nose/) and [pymake](https://github.com/modflowpy/pymake) python packages.
-   
+
 1. Commit your changes using a descriptive commit message that follows our
   [commit message conventions](#commit). Adherence to these conventions
   is necessary because release notes are automatically generated from these messages.
@@ -195,6 +195,7 @@ The scope should be the name of the FloPy module/class affected (as perceived by
 
 There are currently a few exceptions to the "use module/class name" rule:
 
+* **release**: used when updating files prior to a release
 * **releasenotes**: used for updating the release notes
 * **readme**: used for updating the release notes in README.md
 * **changelog**: used for updating the release notes in CHANGELOG.md

README.md

@@ -1,12 +1,12 @@
 
 <img src="https://raw.githubusercontent.com/modflowpy/flopy/master/examples/images/flopy3.png" alt="flopy3" style="width:50;height:20">
 
-### Version 3.2.13
+### Version 3.3.0
 [![Build Status](https://travis-ci.org/modflowpy/flopy.svg?branch=master)](https://travis-ci.org/modflowpy/flopy)
 [![PyPI Version](https://img.shields.io/pypi/v/flopy.png)](https://pypi.python.org/pypi/flopy)
 [![Coverage Status](https://coveralls.io/repos/github/modflowpy/flopy/badge.svg?branch=master)](https://coveralls.io/github/modflowpy/flopy?branch=master)
-[![Codacy Badge](https://api.codacy.com/project/badge/Grade/b23a5edd021b4aa19e947545ab49e577)](https://www.codacy.com/app/jdhughes-usgs/flopy?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=modflowpy/flopy&amp;utm_campaign=Badge_Grade)[![Binder](https://aws-uswest2-binder.pangeo.io/badge_logo.svg)](https://aws-uswest2-binder.pangeo.io/v2/gh/modflowpy/flopy.git/master)
-
+[![Codacy Badge](https://api.codacy.com/project/badge/Grade/b23a5edd021b4aa19e947545ab49e577)](https://www.codacy.com/app/jdhughes-usgs/flopy?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=modflowpy/flopy&amp;utm_campaign=Badge_Grade)
+[![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/modflowpy/flopy.git/master)
 
 Introduction
 -----------------------------------------------
@@ -112,12 +112,12 @@ Installation
 
 **Python versions:**
 
-FloPy requires **Python** 2.7 or **Python** 3.5 (or higher). **<span style="color:red" style="text-decoration:underline">Support for Python versions < 3.5 will be dropped in the next version of FloPy (version 3.3.0)</span>**
+FloPy requires **Python** 3.5 (or higher).
 
 
 **Dependencies:**
 
-FloPy requires **NumPy** 1.9 (or higher) and **enum34** for **Python** 2.7 or **Python** 3.3.
+FloPy requires **NumPy** 1.9 (or higher).
 
 
 **For base and Anaconda Python distributions:**
@@ -216,7 +216,7 @@ How to Cite
 
 ##### ***Software/Code citation for FloPy:***
 
-[Bakker, M., Post, V., Langevin, C.D., Hughes, J.D., White, J.T., Starn, J.J., and Fienen, M.N., 2019, FloPy v3.2.13: U.S. Geological Survey Software Release, 17 November 2019, http://dx.doi.org/10.5066/F7BK19FH](http://dx.doi.org/10.5066/F7BK19FH)
+[Bakker, M., Post, V., Langevin, C. D., Hughes, J. D., White, J. T., Leaf, A. T., Paulinski, S. R., Larsen, J. D., Toews, M. W., Morway, E. D., Bellino, J. C., Starn, J. J., and Fienen, M. N., 2019, FloPy v3.3.0: U.S. Geological Survey Software Release, 14 December 2019, http://dx.doi.org/10.5066/F7BK19FH](http://dx.doi.org/10.5066/F7BK19FH)
 
 
 MODFLOW Resources

autotest/build_exes.py

@@ -11,7 +11,7 @@
 
 os.environ["TRAVIS"] = "1"
 
-download_version = '2.0'
+download_version = '3.0'
 
 # path where downloaded executables will be extracted
 exe_pth = 'exe_download'

autotest/t003_test.py

@@ -44,6 +44,20 @@ def test_loadtwrip():
     assert ml.load_fail is False
 
     return
+
+
+def test_loadtwrip_upw():
+    cwd = os.getcwd()
+    pth = os.path.join('..', 'examples', 'data', 'parameters')
+    assert (os.path.isdir(pth))
+    os.chdir(pth)
+    namefile = 'twrip_upw.nam'
+    ml = flopy.modflow.Modflow.load(namefile, verbose=True)
+    os.chdir(cwd)
+    assert isinstance(ml, flopy.modflow.Modflow)
+    assert ml.load_fail is False
+
+    return
 
 
 def test_loadoc():
@@ -116,3 +130,4 @@ def test_load_nam_mt_nonexistant_file():
     test_loadfreyberg()
     test_loadoahu()
     test_loadtwrip()
+    test_loadtwrip_upw()