Release 2.6.1

brunns · Feb 1, 2021 · 1210b97 · 1210b97
1 parent db807dc
commit 1210b97
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,9 +1,14 @@
 # Change Log
 
-## 2.5.2
+## 2.6.1
 
 * Bugfix - Stub.from_structure() decodes logically combinable predicates. (Thanks, @SShatun)
 
+## 2.6
+
+* Add support for PARCH HTTP verb. (Thanks to [@garry-jeromson](https://github.com/garry-jeromson).)
+* Add NotPredicate.
+
 ## 2.5.1
 
 * Bugfix - Ensure imposter host matches server host

diff --git a/README.md b/README.md
@@ -113,4 +113,6 @@ make precommit && git commit -am"Release $version" && git push --set-upstream or
 hub release create "V$version" -t"release-$version" -m"Version $version"
 python setup.py sdist bdist_wheel
 twine upload dist/*$version*
+git checkout master
+git merge "release-$version"
 ```
diff --git a/setup.py b/setup.py
@@ -49,7 +49,7 @@
 setup(
     name="mbtest",
     zip_safe=False,
-    version="2.5.2",
+    version="2.6.1",
     description="Python wrapper & utils for the Mountebank over the wire test double tool.",
     long_description=long_description,
     long_description_content_type="text/markdown",