Merge pull request #1248 from YakDriver/0.20.1

Releases watchmaker version 0.20.1
plus3it · May 19, 2020 · 69292ec · 69292ec
2 parents 7134a85 + 753300c
commit 69292ec
Show file tree

Hide file tree

Showing 15 changed files with 25 additions and 15 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.20.0
+current_version = 0.20.1
 commit = False
 tag = False
 tag_name = {new_version}

diff --git a/.mergify.yml b/.mergify.yml
@@ -4,8 +4,6 @@ pull_request_rules:
       - author~=dependabot\[bot\]|dependabot-preview\[bot\]
       - status-success=continuous-integration/travis-ci/pr
       - status-success=continuous-integration/appveyor/pr
-      - status-success=codecov/project
-      - status-success=codecov/patch
     actions:
       review:
         type: APPROVE

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,16 @@
 ## Changelog
 
+### 0.20.1
+
+**Commit Delta**: [Change from 0.20.0 release](https://github.com/plus3it/watchmaker/compare/0.20.0...0.20.1)
+
+**Released**: 2020.05.19
+
+**Summary**:
+
+*   ash-linux-formula
+    - Fixes issue with Postfix occasionally failing to start
+
 ### 0.20.0
 
 **Commit Delta**: [Change from 0.19.0 release](https://github.com/plus3it/watchmaker/compare/0.19.0...0.20.0)

diff --git a/requirements/basics.txt b/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==46.1.3;python_version>"3.4"
+setuptools==46.4.0;python_version>"3.4"
 virtualenv==15.2.0;python_version<="2.6"
 virtualenv==20.0.20;python_version>="2.7"
 wheel==0.29.0;python_version<="2.6"

diff --git a/requirements/build.txt b/requirements/build.txt
@@ -1 +1 @@
-gravitybee==0.1.41
+gravitybee==0.1.42
diff --git a/requirements/check.txt b/requirements/check.txt
@@ -1,9 +1,9 @@
 -r docs-check.txt
 
 check-manifest==0.42
-flake8==3.7.9
+flake8==3.8.1
 flake8-bugbear==20.1.4
-flake8-builtins==1.5.2
+flake8-builtins==1.5.3
 flake8-docstrings==1.5.0
 flake8-isort==3.0.0
 flake8-future-import==0.4.6

diff --git a/requirements/docs.txt b/requirements/docs.txt
@@ -1,6 +1,6 @@
 -r docs-check.txt
 
 recommonmark==0.6.0
-setuptools==46.1.3
+setuptools==46.4.0
 sphinx==3.0.3
 sphinx-rtd-theme==0.4.3
diff --git a/requirements/pip.txt b/requirements/pip.txt
@@ -1,3 +1,3 @@
 pip==9.0.3;python_version<="2.6"
 pip==19.1;python_version<="3.4" and python_version>="2.7"
-pip==20.1;python_version>"3.4"
+pip==20.1.1;python_version>"3.4"
diff --git a/requirements/report.txt b/requirements/report.txt
@@ -1,4 +1,4 @@
 argparse==1.4.0
 codecov<=2.0.5;platform_system=="Windows"  # pyup: ==2.0.5 # see https://github.com/codecov/support/issues/402
 codecov==2.0.15;platform_system!="Windows" and python_version<="2.6"
-codecov==2.0.22;platform_system!="Windows" and python_version>"2.6"
+codecov==2.1.0;platform_system!="Windows" and python_version>"2.6"
diff --git a/requirements/test.txt b/requirements/test.txt
@@ -3,7 +3,7 @@ mock==3.0.5;python_version<"3.6" and python_version>="2.7" # pyup: ==3.0.5
 mock==4.0.2;python_version>="3.6"
 pytest==3.2.5;python_version<"2.7" or python_version=="3.3"  # pyup: ==3.2.5
 pytest==4.6.3;python_version<"3.5" and python_version>="2.7" # pyup: ==4.6.3
-pytest==5.4.1;python_version>="3.5"
+pytest==5.4.2;python_version>="3.5"
 pytest-travis-fold==1.3.0
 pytest-catchlog==1.2.2;python_version<"2.7"
 pytest-cov==2.5.1;python_version<"2.7"  # pyup: ==2.5.1

diff --git a/setup.cfg b/setup.cfg
@@ -3,7 +3,7 @@
 [metadata]
 name = watchmaker
 description = Applied Configuration Management
-version = 0.20.0
+version = 0.20.1
 long_description = file: README.md, CHANGELOG.md
 long_description_content_type = text/markdown
 author = Plus3IT Maintainers of Watchmaker

diff --git a/src/vendor/pypa/get-pip b/src/vendor/pypa/get-pip
diff --git a/src/watchmaker/static/salt/formulas/ash-linux-formula b/src/watchmaker/static/salt/formulas/ash-linux-formula
diff --git a/src/watchmaker/static/salt/formulas/join-domain-formula b/src/watchmaker/static/salt/formulas/join-domain-formula
diff --git a/tests/test_saltworker.py b/tests/test_saltworker.py
@@ -319,6 +319,7 @@ def test_linux_salt_debug_log_none(mock_safe, mock_makedirs, mock_codec):
     assert saltworker_lx.salt_debug_logfile == os.sep.join(
         (system_params["logdir"], 'salt_call.debug.log'))
 
+
 @pytest.mark.skipif(sys.version_info < (3, 4),
                     reason="Not supported in this Python version.")
 @patch("codecs.open", autospec=True)