Merge branch 'release/0.25.0' into develop

getslash · Dec 1, 2020 · e87eebc · e87eebc
2 parents 7586326 + f82d23b
commit e87eebc
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -9,10 +9,9 @@
 1. Run the following:
 ```
 VERSION=...
-echo "__version__ = \"$VERSION\"" > scottypy/__version__.py
-git add scottypy/__version__.py
-git commit -m "Bump version to $VERSION"
 git flow release start "$VERSION"
+echo "__version__ = \"$VERSION\"" > scottypy/__version__.py
+git commit -am "Bump version to $VERSION"
 git push --set-upstream origin "release/$VERSION"
 git flow release finish "$VERSION"
 git push origin : --tags
@@ -21,6 +20,10 @@ git push origin : --tags
 
 ## ChangeLog
 
+### 0.25.0
+
+* Use combadge v2 by default (which supports windows hosts)
+
 ### 0.24.0
 
 * Add filtering by issue

diff --git a/scottypy/__version__.py b/scottypy/__version__.py
@@ -1 +1 @@
-__version__ = "0.24.0"
+__version__ = "0.25.0"