Merge tag '3.0.0' into develop

3.0.0
WikiWatershed · Jul 12, 2024 · 1b4d33b · 1b4d33b
2 parents ff99b5c + 99a7051
commit 1b4d33b
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 3.0.0
+
+- Change base image to TauDEM 5.3.8-xenial, to be built on Ubuntu 16.04 instead
+  of 14.04. Also update to latest supported Python 2.7.
+
 ## 2.0.0
 - Instead of returning a geojson FeatureCollection with
   a single Feature for the watershed and input_pt output,

diff --git a/README.md b/README.md
@@ -2,10 +2,15 @@
 
 A docker image and fork of @nazmussazib's [Rapid Watershed Delineation](https://github.com/nazmussazib/RapidWatersheDelineation) project, for use in [Model My Watershed](https://github.com/WikiWatershed/model-my-watershed).
 
-[![Travis CI](https://api.travis-ci.org/WikiWatershed/rapid-watershed-delineation.svg "Build Status on Travis CI")](https://travis-ci.org/WikiWatershed/rapid-watershed-delineation/)
-[![Docker Repository on Quay.io](https://quay.io/repository/wikiwatershed/rwd/status "Docker Repository on Quay.io")](https://quay.io/repository/wikiwatershed/rwd)
+[![Docker Repository on GitHub Container Registry](https://ghcr-badge.egpl.dev/WikiWatershed/rwd/latest_tag?color=%2344cc11&ignore=sha256*&label=version)](https://github.com/WikiWatershed/rapid-watershed-delineation/pkgs/container/rwd)
 [![Apache V2 License](https://img.shields.io/badge/license-Apache%20V2-blue.svg)](https://github.com/wikiwatershed/rapid-watershed-delineation/blob/develop/LICENSE)
 
+### Quick Start
+
+```
+docker run --rm -ti ghcr.io/wikiwatershed/rwd
+```
+
 ### Getting started
 * Define environment variables (see below)
 * Run `./scripts/update.sh`
@@ -69,12 +74,8 @@ To create a new release, use the following git commands:
 $ git flow release start 0.1.0
 $ vim CHANGELOG.md
 $ vim setup.py
-$ vim src/api/main.py
-$ git add CHANGELOG.md setup.py src/api/main.py
 $ git commit -m "0.1.0"
-$ git flow release publish 0.1.0
-$ git flow release finish 0.1.0
-$ git push --tags
+$ git flow release finish -p 0.1.0
 ```
 
 Afterward, push your `develop` and `master` branches to remote using:

diff --git a/setup.py b/setup.py
@@ -13,7 +13,7 @@
 
 setup(
     name='rapid_watershed_delineation',
-    version='2.0.0',
+    version='3.0.0',
     description='A Python implementation of Rapid Watershed Delineation.',
     long_description=long_description,
     url='https://github.com/WikiWatershed/rapid-watershed-delineation',