From cba20f04554c617a2dc943155e98f25a3397ffc7 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 7 May 2020 05:35:11 +0000 Subject: [PATCH 01/16] Bump src/watchmaker/static/salt/formulas/join-domain-formula Bumps [src/watchmaker/static/salt/formulas/join-domain-formula](https://github.com/plus3it/join-domain-formula) from `c935262` to `14b65b6`. - [Release notes](https://github.com/plus3it/join-domain-formula/releases) - [Commits](https://github.com/plus3it/join-domain-formula/compare/c9352629fc9128bd013b17ae99fbefe48a451fbf...14b65b62bcfcce66ecc251e394bb44c53f11fb0e) Signed-off-by: dependabot-preview[bot] --- src/watchmaker/static/salt/formulas/join-domain-formula | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/watchmaker/static/salt/formulas/join-domain-formula b/src/watchmaker/static/salt/formulas/join-domain-formula index c9352629f..14b65b62b 160000 --- a/src/watchmaker/static/salt/formulas/join-domain-formula +++ b/src/watchmaker/static/salt/formulas/join-domain-formula @@ -1 +1 @@ -Subproject commit c9352629fc9128bd013b17ae99fbefe48a451fbf +Subproject commit 14b65b62bcfcce66ecc251e394bb44c53f11fb0e From 0daa125c517de15f22c7644cbc4bc563a5ddf662 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 8 May 2020 12:10:00 +0000 Subject: [PATCH 02/16] Bump pytest from 5.4.1 to 5.4.2 Bumps [pytest](https://github.com/pytest-dev/pytest) from 5.4.1 to 5.4.2. - [Release notes](https://github.com/pytest-dev/pytest/releases) - [Changelog](https://github.com/pytest-dev/pytest/blob/master/CHANGELOG.rst) - [Commits](https://github.com/pytest-dev/pytest/compare/5.4.1...5.4.2) Signed-off-by: dependabot-preview[bot] --- requirements/test.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/test.txt b/requirements/test.txt index 398dcc43d..a30a868f1 100644 --- 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 From 12c701be997a9f67398886a08dcb0208e7e96824 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Sun, 10 May 2020 22:31:04 +0000 Subject: [PATCH 03/16] Bump setuptools from 46.1.3 to 46.2.0 Bumps [setuptools](https://github.com/pypa/setuptools) from 46.1.3 to 46.2.0. - [Release notes](https://github.com/pypa/setuptools/releases) - [Changelog](https://github.com/pypa/setuptools/blob/master/CHANGES.rst) - [Commits](https://github.com/pypa/setuptools/compare/v46.1.3...v46.2.0) Signed-off-by: dependabot-preview[bot] --- requirements/basics.txt | 2 +- requirements/docs.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements/basics.txt b/requirements/basics.txt index c08c3e03d..0aeb60440 100644 --- 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.2.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/docs.txt b/requirements/docs.txt index b4e586316..f9a6133f5 100644 --- 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.2.0 sphinx==3.0.3 sphinx-rtd-theme==0.4.3 From 4d7a2dcf4b78fe0cd5e72cc2e41e08ff0584aa5c Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 13 May 2020 16:15:44 +0000 Subject: [PATCH 04/16] Bump setuptools from 46.2.0 to 46.3.0 Bumps [setuptools](https://github.com/pypa/setuptools) from 46.2.0 to 46.3.0. - [Release notes](https://github.com/pypa/setuptools/releases) - [Changelog](https://github.com/pypa/setuptools/blob/master/CHANGES.rst) - [Commits](https://github.com/pypa/setuptools/compare/v46.2.0...v46.3.0) Signed-off-by: dependabot-preview[bot] --- requirements/basics.txt | 2 +- requirements/docs.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements/basics.txt b/requirements/basics.txt index 0aeb60440..ff3ea2d3a 100644 --- 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.2.0;python_version>"3.4" +setuptools==46.3.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/docs.txt b/requirements/docs.txt index f9a6133f5..ab71bef70 100644 --- a/requirements/docs.txt +++ b/requirements/docs.txt @@ -1,6 +1,6 @@ -r docs-check.txt recommonmark==0.6.0 -setuptools==46.2.0 +setuptools==46.3.0 sphinx==3.0.3 sphinx-rtd-theme==0.4.3 From 60526ec7d850a490ab0d94d31da1568572897059 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 14 May 2020 11:02:15 +0000 Subject: [PATCH 05/16] Bump flake8-builtins from 1.5.2 to 1.5.3 Bumps [flake8-builtins](https://github.com/gforcada/flake8-builtins) from 1.5.2 to 1.5.3. - [Release notes](https://github.com/gforcada/flake8-builtins/releases) - [Changelog](https://github.com/gforcada/flake8-builtins/blob/master/CHANGES.rst) - [Commits](https://github.com/gforcada/flake8-builtins/compare/1.5.2...1.5.3) Signed-off-by: dependabot-preview[bot] --- requirements/check.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/check.txt b/requirements/check.txt index e27d3f3b0..220053a2f 100644 --- a/requirements/check.txt +++ b/requirements/check.txt @@ -3,7 +3,7 @@ check-manifest==0.42 flake8==3.7.9 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 From ae32ad9eb22be7648eeeb0d4707f8ca40d2efd75 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 14 May 2020 11:24:07 +0000 Subject: [PATCH 06/16] Bump flake8 from 3.7.9 to 3.8.1 Bumps [flake8](https://gitlab.com/pycqa/flake8) from 3.7.9 to 3.8.1. - [Release notes](https://gitlab.com/pycqa/flake8/tags) - [Commits](https://gitlab.com/pycqa/flake8/compare/3.7.9...3.8.1) Signed-off-by: dependabot-preview[bot] --- requirements/check.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/check.txt b/requirements/check.txt index 220053a2f..df29188f0 100644 --- a/requirements/check.txt +++ b/requirements/check.txt @@ -1,7 +1,7 @@ -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.3 flake8-docstrings==1.5.0 From 446feeae2717d5b8efc251f8c1538376ff17b227 Mon Sep 17 00:00:00 2001 From: Dirk Avery Date: Thu, 14 May 2020 15:01:07 -0400 Subject: [PATCH 07/16] Fix flake8 complaint --- tests/test_saltworker.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/test_saltworker.py b/tests/test_saltworker.py index 8bd08aadb..fa8655c01 100644 --- 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) From fc5171836c800e04cbf959373d94943fdb7f0d13 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 14 May 2020 19:32:55 +0000 Subject: [PATCH 08/16] Bump gravitybee from 0.1.41 to 0.1.42 Bumps [gravitybee](https://github.com/plus3it/gravitybee) from 0.1.41 to 0.1.42. - [Release notes](https://github.com/plus3it/gravitybee/releases) - [Changelog](https://github.com/plus3it/gravitybee/blob/master/CHANGELOG.rst) - [Commits](https://github.com/plus3it/gravitybee/compare/0.1.41...0.1.42) Signed-off-by: dependabot-preview[bot] --- requirements/build.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/build.txt b/requirements/build.txt index f890e8d59..3f9771685 100644 --- a/requirements/build.txt +++ b/requirements/build.txt @@ -1 +1 @@ -gravitybee==0.1.41 +gravitybee==0.1.42 From 9d4c305c414f8350d1557657d09b00a7ca151d4c Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 15 May 2020 10:42:49 +0000 Subject: [PATCH 09/16] Bump setuptools from 46.3.0 to 46.3.1 Bumps [setuptools](https://github.com/pypa/setuptools) from 46.3.0 to 46.3.1. - [Release notes](https://github.com/pypa/setuptools/releases) - [Changelog](https://github.com/pypa/setuptools/blob/master/CHANGES.rst) - [Commits](https://github.com/pypa/setuptools/compare/v46.3.0...v46.3.1) Signed-off-by: dependabot-preview[bot] --- requirements/basics.txt | 2 +- requirements/docs.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements/basics.txt b/requirements/basics.txt index ff3ea2d3a..5b7cfb89b 100644 --- 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.3.0;python_version>"3.4" +setuptools==46.3.1;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/docs.txt b/requirements/docs.txt index ab71bef70..f34fb9880 100644 --- a/requirements/docs.txt +++ b/requirements/docs.txt @@ -1,6 +1,6 @@ -r docs-check.txt recommonmark==0.6.0 -setuptools==46.3.0 +setuptools==46.3.1 sphinx==3.0.3 sphinx-rtd-theme==0.4.3 From 1320212984d0d3cde7fda1e951447a0c1a2371cf Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Sun, 17 May 2020 02:42:26 +0000 Subject: [PATCH 10/16] Bump setuptools from 46.3.1 to 46.4.0 Bumps [setuptools](https://github.com/pypa/setuptools) from 46.3.1 to 46.4.0. - [Release notes](https://github.com/pypa/setuptools/releases) - [Changelog](https://github.com/pypa/setuptools/blob/master/CHANGES.rst) - [Commits](https://github.com/pypa/setuptools/compare/v46.3.1...v46.4.0) Signed-off-by: dependabot-preview[bot] --- requirements/basics.txt | 2 +- requirements/docs.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements/basics.txt b/requirements/basics.txt index 5b7cfb89b..38f78963d 100644 --- 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.3.1;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/docs.txt b/requirements/docs.txt index f34fb9880..ebaff5994 100644 --- a/requirements/docs.txt +++ b/requirements/docs.txt @@ -1,6 +1,6 @@ -r docs-check.txt recommonmark==0.6.0 -setuptools==46.3.1 +setuptools==46.4.0 sphinx==3.0.3 sphinx-rtd-theme==0.4.3 From d622af6748d2aadc7252eb07faecd20c5588bfc3 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 18 May 2020 13:36:30 +0000 Subject: [PATCH 11/16] Bump codecov from 2.0.22 to 2.1.0 Bumps [codecov](https://github.com/codecov/codecov-python) from 2.0.22 to 2.1.0. - [Release notes](https://github.com/codecov/codecov-python/releases) - [Changelog](https://github.com/codecov/codecov-python/blob/master/CHANGELOG.md) - [Commits](https://github.com/codecov/codecov-python/commits) Signed-off-by: dependabot-preview[bot] --- requirements/report.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/report.txt b/requirements/report.txt index baa401f1d..b426271b9 100644 --- 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" From 7737d44025eddf36d7bcbc5296218ade69a88d7c Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 18 May 2020 21:37:27 +0000 Subject: [PATCH 12/16] Bump src/watchmaker/static/salt/formulas/ash-linux-formula Bumps [src/watchmaker/static/salt/formulas/ash-linux-formula](https://github.com/plus3it/ash-linux-formula) from `115313f` to `28e201c`. - [Release notes](https://github.com/plus3it/ash-linux-formula/releases) - [Commits](https://github.com/plus3it/ash-linux-formula/compare/115313fa41a49a661dd0008aecb3e0671464ddb1...28e201c699bc39feefead9b6eea86fd53fab0819) Signed-off-by: dependabot-preview[bot] --- src/watchmaker/static/salt/formulas/ash-linux-formula | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/watchmaker/static/salt/formulas/ash-linux-formula b/src/watchmaker/static/salt/formulas/ash-linux-formula index 115313fa4..28e201c69 160000 --- a/src/watchmaker/static/salt/formulas/ash-linux-formula +++ b/src/watchmaker/static/salt/formulas/ash-linux-formula @@ -1 +1 @@ -Subproject commit 115313fa41a49a661dd0008aecb3e0671464ddb1 +Subproject commit 28e201c699bc39feefead9b6eea86fd53fab0819 From ae800f33beee8936b8684bf3620e07fe6d7f5dc0 Mon Sep 17 00:00:00 2001 From: Loren Gordon Date: Mon, 18 May 2020 15:56:56 -0700 Subject: [PATCH 13/16] Mergify: configuration update --- .mergify.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.mergify.yml b/.mergify.yml index 1d8bfa24d..93bc793ca 100644 --- 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 From 3d9f33339fd0095ff5ffb16596f3521f8055737d Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 19 May 2020 10:52:30 +0000 Subject: [PATCH 14/16] Bump pip from 20.1 to 20.1.1 Bumps [pip](https://github.com/pypa/pip) from 20.1 to 20.1.1. - [Release notes](https://github.com/pypa/pip/releases) - [Changelog](https://github.com/pypa/pip/blob/master/NEWS.rst) - [Commits](https://github.com/pypa/pip/compare/20.1...20.1.1) Signed-off-by: dependabot-preview[bot] --- requirements/pip.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/pip.txt b/requirements/pip.txt index dd4d9ec2f..2cdc80592 100644 --- 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" From df9b5b141de161707a53ae35fd23023e7316bd7e Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 19 May 2020 15:24:57 +0000 Subject: [PATCH 15/16] Bump src/vendor/pypa/get-pip from `1fe530e` to `eff16c8` Bumps [src/vendor/pypa/get-pip](https://github.com/pypa/get-pip) from `1fe530e` to `eff16c8`. - [Release notes](https://github.com/pypa/get-pip/releases) - [Commits](https://github.com/pypa/get-pip/compare/1fe530e9e3d800be94e04f6428460fc4fb94f5a9...eff16c878c7fd6b688b9b4c4267695cf1a0bf01b) Signed-off-by: dependabot-preview[bot] --- src/vendor/pypa/get-pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vendor/pypa/get-pip b/src/vendor/pypa/get-pip index 1fe530e9e..eff16c878 160000 --- a/src/vendor/pypa/get-pip +++ b/src/vendor/pypa/get-pip @@ -1 +1 @@ -Subproject commit 1fe530e9e3d800be94e04f6428460fc4fb94f5a9 +Subproject commit eff16c878c7fd6b688b9b4c4267695cf1a0bf01b From ef74f886ea1df30ff514098d959be8668d9817f2 Mon Sep 17 00:00:00 2001 From: Dirk Avery Date: Tue, 19 May 2020 12:17:36 -0400 Subject: [PATCH 16/16] Prepare watchmaker 0.20.1 release --- .bumpversion.cfg | 2 +- CHANGELOG.md | 11 +++++++++++ setup.cfg | 2 +- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index b454edbcb..39529c95f 100644 --- 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/CHANGELOG.md b/CHANGELOG.md index a72c05589..b2ad0e130 100644 --- 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/setup.cfg b/setup.cfg index 84301273b..ed927c118 100644 --- 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