Merge pull request #1330 from lorengordon/0.20.4

Author: lorengordon

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.20.3
+current_version = 0.20.4
 commit = False
 tag = False
 tag_name = {new_version}

CHANGELOG.md

@@ -1,5 +1,16 @@
 ## Changelog
 
+### 0.20.4
+
+**Commit Delta**: [Change from 0.20.3 release](https://github.com/plus3it/watchmaker/compare/0.20.3...0.20.4)
+
+**Released**: 2020.07.15
+
+**Summary**:
+
+*   splunkforwarder-formula
+    - (Windows) Patches splunkforwarder state to work with salt 2019.2.5
+
 ### 0.20.3
 
 **Commit Delta**: [Change from 0.20.2 release](https://github.com/plus3it/watchmaker/compare/0.20.2...0.20.3)

requirements/basics.txt

@@ -1,6 +1,6 @@
 setuptools==36.8.0;python_version<="2.6"
 setuptools==43.0.0;python_version<="3.4" and python_version>="2.7"
-setuptools==49.1.0;python_version>"3.4"
+setuptools==49.2.0;python_version>"3.4"
 virtualenv==15.2.0;python_version<="2.6"
 virtualenv==20.0.26;python_version>="2.7"
 wheel==0.29.0;python_version<="2.6"

requirements/check.txt

@@ -5,7 +5,7 @@ flake8==3.8.3
 flake8-bugbear==20.1.4
 flake8-builtins==1.5.3
 flake8-docstrings==1.5.0
-flake8-isort==3.0.0
+flake8-isort==3.0.1
 flake8-future-import==0.4.6
 flake8-print==3.1.4
 isort==4.3.21

requirements/docs.txt

@@ -1,6 +1,6 @@
 -r docs-check.txt
 
 recommonmark==0.6.0
-setuptools==49.1.0
+setuptools==49.2.0
 sphinx==3.1.2
 sphinx-rtd-theme==0.5.0

requirements/test.txt

@@ -11,5 +11,5 @@ pytest-cov==2.8.1;python_version<"3.5" and python_version>="2.7"
 pytest-cov==2.10.0;python_version>="3.5"
 pytest-mock==1.6.3;python_version<"2.7"
 pytest-mock==2.0.0;python_version<"3.5" and python_version>="2.7"
-pytest-mock==3.1.1;python_version>="3.5"
+pytest-mock==3.2.0;python_version>="3.5"
 wheel==0.29.0;python_version<="2.6"

requirements/tox.txt

@@ -2,4 +2,4 @@
 
 tox==2.9.1;python_version<="2.6"
 tox==3.14.0;python_version<="3.4" and python_version>="2.7"
-tox==3.16.1;python_version>"3.4"
+tox==3.17.0;python_version>"3.4"

setup.cfg

@@ -3,7 +3,7 @@
 [metadata]
 name = watchmaker
 description = Applied Configuration Management
-version = 0.20.3
+version = 0.20.4
 long_description = file: README.md, CHANGELOG.md
 long_description_content_type = text/markdown
 author = Plus3IT Maintainers of Watchmaker