From 0183bcf9575c7d8e86dc5f1a34503a2cca3a9130 Mon Sep 17 00:00:00 2001 From: Dirk Avery Date: Tue, 24 Sep 2019 11:44:58 -0400 Subject: [PATCH 01/53] Fix condition so release jobs trigger on tags --- azure-pipelines.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index e99ab0be4..8ff90f94a 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -129,7 +129,7 @@ jobs: sourceFolder: $(deployStage)\standalone\dist\ - task: S3Upload@1 displayName: upload standalone binaries to s3 (release) - condition: eq(variables['build.sourceBranch'], 'refs/tags/*') + condition: startsWith(variables['build.sourceBranch'], 'refs/tags/') inputs: awsCredentials: dev-lab targetFolder: $(keyPrefix) @@ -145,4 +145,4 @@ jobs: python -m pip install -r $(deployStage)\$(deployArtifactName)\deploy.txt satsuki displayName: deploy to github with satsuki - condition: eq(variables['build.sourceBranch'], 'refs/tags/*') + condition: startsWith(variables['build.sourceBranch'], 'refs/tags/') From 47521f436677916fc691776c96a513714571f565 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 25 Sep 2019 11:55:59 +0000 Subject: [PATCH 02/53] Bump pylint from 2.3.1 to 2.4.1 Bumps [pylint](https://github.com/PyCQA/pylint) from 2.3.1 to 2.4.1. - [Release notes](https://github.com/PyCQA/pylint/releases) - [Changelog](https://github.com/PyCQA/pylint/blob/master/ChangeLog) - [Commits](https://github.com/PyCQA/pylint/compare/pylint-2.3.1...pylint-2.4.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 dcae453b2..3b1cd8ac6 100644 --- a/requirements/check.txt +++ b/requirements/check.txt @@ -11,5 +11,5 @@ m2r==0.2.1 pep8-naming==0.8.2 pydocstyle==4.0.1 pygments==2.4.2 -pylint==2.3.1 +pylint==2.4.1 readme-renderer==24.0 From d695e02503e73aa03a966862fc2346b002bd6112 Mon Sep 17 00:00:00 2001 From: Dirk Avery Date: Thu, 26 Sep 2019 16:26:36 -0400 Subject: [PATCH 03/53] Fix linting issue --- src/watchmaker/managers/platform.py | 4 ++-- src/watchmaker/managers/worker_manager.py | 4 ++-- src/watchmaker/workers/base.py | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/watchmaker/managers/platform.py b/src/watchmaker/managers/platform.py index 905f77133..2d9a7aaab 100644 --- a/src/watchmaker/managers/platform.py +++ b/src/watchmaker/managers/platform.py @@ -56,8 +56,8 @@ def __init__(self, system_params, *args, **kwargs): ) self.system_params = system_params self.working_dir = None - args = args - kwargs = kwargs + PlatformManagerBase.args = args + PlatformManagerBase.kwargs = kwargs def retrieve_file(self, url, filename): """ diff --git a/src/watchmaker/managers/worker_manager.py b/src/watchmaker/managers/worker_manager.py index 3ae7bf0d4..6085a746e 100644 --- a/src/watchmaker/managers/worker_manager.py +++ b/src/watchmaker/managers/worker_manager.py @@ -31,8 +31,8 @@ class WorkersManagerBase(object): def __init__(self, system_params, workers, *args, **kwargs): self.system_params = system_params self.workers = workers - args = args - kwargs = kwargs + WorkersManagerBase.args = args + WorkersManagerBase.kwargs = kwargs @abc.abstractmethod def _worker_execution(self): diff --git a/src/watchmaker/workers/base.py b/src/watchmaker/workers/base.py index 1180fb7e5..0038d083c 100644 --- a/src/watchmaker/workers/base.py +++ b/src/watchmaker/workers/base.py @@ -16,8 +16,8 @@ def __init__(self, system_params, *args, **kwargs): ) self.system_params = system_params - args = args - kwargs = kwargs + WorkerBase.args = args + WorkerBase.kwargs = kwargs @abc.abstractmethod def before_install(self): From e637b1607e3c7a483fa7c3f4ea3403e5e35b731d Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Sat, 28 Sep 2019 19:06:34 +0000 Subject: [PATCH 04/53] Bump pytest-mock from 1.10.4 to 1.11.0 Bumps [pytest-mock](https://github.com/pytest-dev/pytest-mock) from 1.10.4 to 1.11.0. - [Release notes](https://github.com/pytest-dev/pytest-mock/releases) - [Changelog](https://github.com/pytest-dev/pytest-mock/blob/master/CHANGELOG.rst) - [Commits](https://github.com/pytest-dev/pytest-mock/compare/1.10.4...v1.11.0) 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 aa93ceeb8..c491fc593 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -8,5 +8,5 @@ pytest-catchlog==1.2.2;python_version<"2.7" pytest-cov==2.5.1;python_version<"2.7" # pyup: ==2.5.1 pytest-cov==2.7.1;python_version>="2.7" pytest-mock==1.6.3;python_version<"2.7" # pyup: ==1.6.3 -pytest-mock==1.10.4;python_version>="2.7" +pytest-mock==1.11.0;python_version>="2.7" wheel==0.29.0;python_version<="2.6" # pyup: ==0.29.0 From 43bd27ff1a7f7a7733a7a84c05ae471b08309dec Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Sun, 29 Sep 2019 13:20:14 +0000 Subject: [PATCH 05/53] Bump pytest from 5.1.3 to 5.2.0 Bumps [pytest](https://github.com/pytest-dev/pytest) from 5.1.3 to 5.2.0. - [Release notes](https://github.com/pytest-dev/pytest/releases) - [Changelog](https://github.com/pytest-dev/pytest/blob/5.2.0/CHANGELOG.rst) - [Commits](https://github.com/pytest-dev/pytest/compare/5.1.3...5.2.0) 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 aa93ceeb8..7320789f8 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -2,7 +2,7 @@ mock==2.0.0;python_version<"2.7" # pyup: ==2.0.0 mock==3.0.5;python_version>="2.7" 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.1.3;python_version>="3.5" +pytest==5.2.0;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 23216012917ea1526909be9277aeb6bb2afd8038 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 30 Sep 2019 16:41:08 +0000 Subject: [PATCH 06/53] Bump pylint from 2.4.1 to 2.4.2 Bumps [pylint](https://github.com/PyCQA/pylint) from 2.4.1 to 2.4.2. - [Release notes](https://github.com/PyCQA/pylint/releases) - [Changelog](https://github.com/PyCQA/pylint/blob/master/ChangeLog) - [Commits](https://github.com/PyCQA/pylint/compare/pylint-2.4.1...pylint-2.4.2) 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 3b1cd8ac6..e3115d7e2 100644 --- a/requirements/check.txt +++ b/requirements/check.txt @@ -11,5 +11,5 @@ m2r==0.2.1 pep8-naming==0.8.2 pydocstyle==4.0.1 pygments==2.4.2 -pylint==2.4.1 +pylint==2.4.2 readme-renderer==24.0 From 865010943286bd20016e0bd61c47a1e3585244d1 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 1 Oct 2019 01:08:53 +0000 Subject: [PATCH 07/53] Bump flake8-docstrings from 1.4.0 to 1.5.0 Bumps [flake8-docstrings](https://gitlab.com/pycqa/flake8-docstrings) from 1.4.0 to 1.5.0. - [Release notes](https://gitlab.com/pycqa/flake8-docstrings/tags) - [Changelog](https://gitlab.com/pycqa/flake8-docstrings/blob/master/HISTORY.rst) - [Commits](https://gitlab.com/pycqa/flake8-docstrings/compare/1.4.0...1.5.0) 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 3b1cd8ac6..94daf7a14 100644 --- a/requirements/check.txt +++ b/requirements/check.txt @@ -2,7 +2,7 @@ check-manifest==0.39 flake8==3.7.8 flake8-bugbear==19.8.0 flake8-builtins==1.4.1 -flake8-docstrings==1.4.0 +flake8-docstrings==1.5.0 flake8-isort==2.7.0 flake8-future-import==0.4.6 flake8-print==3.1.0 From 22c865d9674444038afe3e9efead207d7f41b55e Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 2 Oct 2019 06:29:42 +0000 Subject: [PATCH 08/53] 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 `d75020e` to `2edf64c`. - [Release notes](https://github.com/plus3it/join-domain-formula/releases) - [Commits](https://github.com/plus3it/join-domain-formula/compare/d75020e6048b529e67b253e7b9d63d9ca7b7c73c...2edf64c0ffe5f678e09f5d7c062502b895a74d37) 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 d75020e60..2edf64c0f 160000 --- a/src/watchmaker/static/salt/formulas/join-domain-formula +++ b/src/watchmaker/static/salt/formulas/join-domain-formula @@ -1 +1 @@ -Subproject commit d75020e6048b529e67b253e7b9d63d9ca7b7c73c +Subproject commit 2edf64c0ffe5f678e09f5d7c062502b895a74d37 From 925359e103577536027d5b8deb63ae962efcf8b7 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 4 Oct 2019 20:41:28 +0000 Subject: [PATCH 09/53] Bump pytest-cov from 2.7.1 to 2.8.0 Bumps [pytest-cov](https://github.com/pytest-dev/pytest-cov) from 2.7.1 to 2.8.0. - [Release notes](https://github.com/pytest-dev/pytest-cov/releases) - [Changelog](https://github.com/pytest-dev/pytest-cov/blob/master/CHANGELOG.rst) - [Commits](https://github.com/pytest-dev/pytest-cov/compare/v2.7.1...v2.8.0) 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 e6689a173..5a9f5f5ad 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -6,7 +6,7 @@ pytest==5.2.0;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 -pytest-cov==2.7.1;python_version>="2.7" +pytest-cov==2.8.0;python_version>="2.7" pytest-mock==1.6.3;python_version<"2.7" # pyup: ==1.6.3 pytest-mock==1.11.0;python_version>="2.7" wheel==0.29.0;python_version<="2.6" # pyup: ==0.29.0 From 5009cc48bb610064edc0e16d0124b24dbf41f60e Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Sat, 5 Oct 2019 00:58:34 +0000 Subject: [PATCH 10/53] Bump pytest-mock from 1.11.0 to 1.11.1 Bumps [pytest-mock](https://github.com/pytest-dev/pytest-mock) from 1.11.0 to 1.11.1. - [Release notes](https://github.com/pytest-dev/pytest-mock/releases) - [Changelog](https://github.com/pytest-dev/pytest-mock/blob/master/CHANGELOG.rst) - [Commits](https://github.com/pytest-dev/pytest-mock/compare/v1.11.0...v1.11.1) 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 5a9f5f5ad..fa75451f0 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -8,5 +8,5 @@ pytest-catchlog==1.2.2;python_version<"2.7" pytest-cov==2.5.1;python_version<"2.7" # pyup: ==2.5.1 pytest-cov==2.8.0;python_version>="2.7" pytest-mock==1.6.3;python_version<"2.7" # pyup: ==1.6.3 -pytest-mock==1.11.0;python_version>="2.7" +pytest-mock==1.11.1;python_version>="2.7" wheel==0.29.0;python_version<="2.6" # pyup: ==0.29.0 From 7d70c59a026f6cabe5c71c11ff807edc6b0b3d01 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 7 Oct 2019 01:47:47 +0000 Subject: [PATCH 11/53] Bump setuptools from 41.2.0 to 41.4.0 Bumps [setuptools](https://github.com/pypa/setuptools) from 41.2.0 to 41.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/v41.2.0...v41.4.0) Signed-off-by: dependabot-preview[bot] --- requirements/docs.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/docs.txt b/requirements/docs.txt index 2f42e476c..8dc8f1ecd 100644 --- a/requirements/docs.txt +++ b/requirements/docs.txt @@ -1,4 +1,4 @@ m2r==0.2.1 -setuptools==41.2.0 +setuptools==41.4.0 sphinx==2.2.0 sphinx-rtd-theme==0.4.3 From 1fafaf76357905361a9214be988270a3a109c0ee Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 7 Oct 2019 15:20:09 +0000 Subject: [PATCH 12/53] Bump pytest-cov from 2.8.0 to 2.8.1 Bumps [pytest-cov](https://github.com/pytest-dev/pytest-cov) from 2.8.0 to 2.8.1. - [Release notes](https://github.com/pytest-dev/pytest-cov/releases) - [Changelog](https://github.com/pytest-dev/pytest-cov/blob/master/CHANGELOG.rst) - [Commits](https://github.com/pytest-dev/pytest-cov/compare/v2.8.0...v2.8.1) 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 fa75451f0..08262d410 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -6,7 +6,7 @@ pytest==5.2.0;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 -pytest-cov==2.8.0;python_version>="2.7" +pytest-cov==2.8.1;python_version>="2.7" pytest-mock==1.6.3;python_version<"2.7" # pyup: ==1.6.3 pytest-mock==1.11.1;python_version>="2.7" wheel==0.29.0;python_version<="2.6" # pyup: ==0.29.0 From 7468c38c7422543a4c070351a3b8423ab604fc16 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 7 Oct 2019 16:40:56 +0000 Subject: [PATCH 13/53] Bump pytest from 5.2.0 to 5.2.1 Bumps [pytest](https://github.com/pytest-dev/pytest) from 5.2.0 to 5.2.1. - [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.2.0...5.2.1) 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 08262d410..6f5446a15 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -2,7 +2,7 @@ mock==2.0.0;python_version<"2.7" # pyup: ==2.0.0 mock==3.0.5;python_version>="2.7" 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.2.0;python_version>="3.5" +pytest==5.2.1;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 6b4de4c5009cc39afe148fead3d59ddbf976a4b5 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Sat, 12 Oct 2019 17:49:22 +0000 Subject: [PATCH 14/53] Bump flake8-print from 3.1.0 to 3.1.1 Bumps [flake8-print](https://github.com/jbkahn/flake8-print) from 3.1.0 to 3.1.1. - [Release notes](https://github.com/jbkahn/flake8-print/releases) - [Commits](https://github.com/jbkahn/flake8-print/compare/3.1.0...3.1.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 979db3503..dd28ab9b6 100644 --- a/requirements/check.txt +++ b/requirements/check.txt @@ -5,7 +5,7 @@ flake8-builtins==1.4.1 flake8-docstrings==1.5.0 flake8-isort==2.7.0 flake8-future-import==0.4.6 -flake8-print==3.1.0 +flake8-print==3.1.1 isort==4.3.21 m2r==0.2.1 pep8-naming==0.8.2 From dd9e23cae44efd119dd7a02cf6008e33c87ef8b2 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 15 Oct 2019 04:39:05 +0000 Subject: [PATCH 15/53] Bump pip from 19.2.3 to 19.3 Bumps [pip](https://github.com/pypa/pip) from 19.2.3 to 19.3. - [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/19.2.3...19.3) 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 0a682e28e..7d6357c0e 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -1 +1 @@ -pip==19.2.3 +pip==19.3 From 906bb2d827bd4ee35809d0d2c0eec16b66c00d81 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 15 Oct 2019 12:47:45 +0000 Subject: [PATCH 16/53] Bump check-manifest from 0.39 to 0.40 Bumps [check-manifest](https://github.com/mgedmin/check-manifest) from 0.39 to 0.40. - [Release notes](https://github.com/mgedmin/check-manifest/releases) - [Changelog](https://github.com/mgedmin/check-manifest/blob/master/CHANGES.rst) - [Commits](https://github.com/mgedmin/check-manifest/compare/0.39...0.40) 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 979db3503..216e423f5 100644 --- a/requirements/check.txt +++ b/requirements/check.txt @@ -1,4 +1,4 @@ -check-manifest==0.39 +check-manifest==0.40 flake8==3.7.8 flake8-bugbear==19.8.0 flake8-builtins==1.4.1 From 4fa1228edf927c069450000d831f75299c8e4916 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 18 Oct 2019 08:34:55 +0000 Subject: [PATCH 17/53] Bump pip from 19.3 to 19.3.1 Bumps [pip](https://github.com/pypa/pip) from 19.3 to 19.3.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/19.3...19.3.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 7d6357c0e..3877da207 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -1 +1 @@ -pip==19.3 +pip==19.3.1 From 727547f354e82d16ab7b82ffafdb94ca018fb0cc Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 18 Oct 2019 09:42:06 +0000 Subject: [PATCH 18/53] Bump pylint from 2.4.2 to 2.4.3 Bumps [pylint](https://github.com/PyCQA/pylint) from 2.4.2 to 2.4.3. - [Release notes](https://github.com/PyCQA/pylint/releases) - [Changelog](https://github.com/PyCQA/pylint/blob/master/ChangeLog) - [Commits](https://github.com/PyCQA/pylint/compare/pylint-2.4.2...pylint-2.4.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 46aa62ff0..208176e3b 100644 --- a/requirements/check.txt +++ b/requirements/check.txt @@ -11,5 +11,5 @@ m2r==0.2.1 pep8-naming==0.8.2 pydocstyle==4.0.1 pygments==2.4.2 -pylint==2.4.2 +pylint==2.4.3 readme-renderer==24.0 From 5971f2a04cf5222cfdc366f3b86cc6ee9a5f7c13 Mon Sep 17 00:00:00 2001 From: Triet Le Date: Thu, 17 Oct 2019 14:20:10 -0400 Subject: [PATCH 19/53] Adds ability to auto approve and merge Dependabot PRs --- .mergify.yml | 40 ++++++++++++++++++++++++++++++++++++++++ MANIFEST.in | 1 + 2 files changed, 41 insertions(+) create mode 100644 .mergify.yml diff --git a/.mergify.yml b/.mergify.yml new file mode 100644 index 000000000..1d8bfa24d --- /dev/null +++ b/.mergify.yml @@ -0,0 +1,40 @@ +pull_request_rules: + - name: automatic approve dependabot pull requests + conditions: + - 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 + # For salt-formula updates, trigger codebuild, merge on codebuild status + - name: write issue comment to start codebuild job + conditions: + - author~=dependabot\[bot\]|dependabot-preview\[bot\] + - label=submodules + - "#approved-reviews-by>=1" + actions: + comment: + message: go codebuild go + + - name: automatic merge for dependabot pull requests + conditions: + - author~=dependabot\[bot\]|dependabot-preview\[bot\] + - label=submodules + - status-success=codebuild/pr + - "#approved-reviews-by>=1" + actions: + merge: + method: merge + + # For regular dependabot pr, automatically merge on approve + - name: automatic merge for dependabot pull requests + conditions: + - author~=dependabot\[bot\]|dependabot-preview\[bot\] + - "#approved-reviews-by>=1" + - label!=submodules + actions: + merge: + method: merge diff --git a/MANIFEST.in b/MANIFEST.in index 606c65e3e..30e8bdbd0 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -9,6 +9,7 @@ include .coveragerc include .editorconfig include .gitmodules include .pylintrc +include .mergify.yml include AUTHORS.md include CHANGELOG.md From 9d5f34d040e286477dbb4802fa10a7367b1f3be7 Mon Sep 17 00:00:00 2001 From: Long C Lam <31355535+eemperor@users.noreply.github.com> Date: Tue, 22 Oct 2019 13:11:23 +0000 Subject: [PATCH 20/53] Restrict backoff version for Python 3.4 and older --- setup.cfg | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index 5cf56102b..9a03fe7ee 100644 --- a/setup.cfg +++ b/setup.cfg @@ -31,7 +31,8 @@ classifiers = [options] install_requires = - backoff;python_version>="2.7" + backoff;python_version>"3.4" + backoff<=1.8.0;python_version<="3.4" backoff<1.7;python_version<"2.7" click;python_version>="2.7" click<7;python_version<"2.7" From c4bd5b19d8c2fcda6f9aa538ad663a054c959b3b Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 23 Oct 2019 16:48:47 +0000 Subject: [PATCH 21/53] Bump pytest-mock from 1.11.1 to 1.11.2 Bumps [pytest-mock](https://github.com/pytest-dev/pytest-mock) from 1.11.1 to 1.11.2. - [Release notes](https://github.com/pytest-dev/pytest-mock/releases) - [Changelog](https://github.com/pytest-dev/pytest-mock/blob/master/CHANGELOG.rst) - [Commits](https://github.com/pytest-dev/pytest-mock/compare/v1.11.1...v1.11.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 6f5446a15..052d9cb4a 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -8,5 +8,5 @@ pytest-catchlog==1.2.2;python_version<"2.7" pytest-cov==2.5.1;python_version<"2.7" # pyup: ==2.5.1 pytest-cov==2.8.1;python_version>="2.7" pytest-mock==1.6.3;python_version<"2.7" # pyup: ==1.6.3 -pytest-mock==1.11.1;python_version>="2.7" +pytest-mock==1.11.2;python_version>="2.7" wheel==0.29.0;python_version<="2.6" # pyup: ==0.29.0 From ebb3c8c90fca49b615aec08657222c9d26130ef7 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 25 Oct 2019 00:21:41 +0000 Subject: [PATCH 22/53] Bump pytest from 5.2.1 to 5.2.2 Bumps [pytest](https://github.com/pytest-dev/pytest) from 5.2.1 to 5.2.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.2.1...5.2.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 052d9cb4a..92c173fc7 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -2,7 +2,7 @@ mock==2.0.0;python_version<"2.7" # pyup: ==2.0.0 mock==3.0.5;python_version>="2.7" 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.2.1;python_version>="3.5" +pytest==5.2.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 3533e1948fc0151b84a8b4a2af027e3ed445775f Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Sat, 26 Oct 2019 09:15:04 +0000 Subject: [PATCH 23/53] Bump sphinx from 2.2.0 to 2.2.1 Bumps [sphinx](https://github.com/sphinx-doc/sphinx) from 2.2.0 to 2.2.1. - [Release notes](https://github.com/sphinx-doc/sphinx/releases) - [Changelog](https://github.com/sphinx-doc/sphinx/blob/master/CHANGES) - [Commits](https://github.com/sphinx-doc/sphinx/compare/v2.2.0...v2.2.1) Signed-off-by: dependabot-preview[bot] --- requirements/docs.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/docs.txt b/requirements/docs.txt index 8dc8f1ecd..68a8ec4ae 100644 --- a/requirements/docs.txt +++ b/requirements/docs.txt @@ -1,4 +1,4 @@ m2r==0.2.1 setuptools==41.4.0 -sphinx==2.2.0 +sphinx==2.2.1 sphinx-rtd-theme==0.4.3 From 245ea2bdeb782ec611da0e476367d5f99a409c26 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Sun, 27 Oct 2019 23:02:43 +0000 Subject: [PATCH 24/53] Bump setuptools from 41.4.0 to 41.5.0 Bumps [setuptools](https://github.com/pypa/setuptools) from 41.4.0 to 41.5.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/v41.4.0...v41.5.0) Signed-off-by: dependabot-preview[bot] --- requirements/docs.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/docs.txt b/requirements/docs.txt index 68a8ec4ae..3dde85534 100644 --- a/requirements/docs.txt +++ b/requirements/docs.txt @@ -1,4 +1,4 @@ m2r==0.2.1 -setuptools==41.4.0 +setuptools==41.5.0 sphinx==2.2.1 sphinx-rtd-theme==0.4.3 From 6322be1f2b09a29867db04e3759a060b1ebe43f9 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 28 Oct 2019 17:49:52 +0000 Subject: [PATCH 25/53] Bump flake8 from 3.7.8 to 3.7.9 Bumps [flake8](https://gitlab.com/pycqa/flake8) from 3.7.8 to 3.7.9. - [Release notes](https://gitlab.com/pycqa/flake8/tags) - [Commits](https://gitlab.com/pycqa/flake8/compare/3.7.8...3.7.9) 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 208176e3b..5ef07ce14 100644 --- a/requirements/check.txt +++ b/requirements/check.txt @@ -1,5 +1,5 @@ check-manifest==0.40 -flake8==3.7.8 +flake8==3.7.9 flake8-bugbear==19.8.0 flake8-builtins==1.4.1 flake8-docstrings==1.5.0 From e988aae95c5ad9a679ff882a507a7abfd4ef5e47 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 28 Oct 2019 18:39:50 +0000 Subject: [PATCH 26/53] Bump setuptools from 41.5.0 to 41.5.1 Bumps [setuptools](https://github.com/pypa/setuptools) from 41.5.0 to 41.5.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/v41.5.0...v41.5.1) Signed-off-by: dependabot-preview[bot] --- requirements/docs.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/docs.txt b/requirements/docs.txt index 3dde85534..11469bbea 100644 --- a/requirements/docs.txt +++ b/requirements/docs.txt @@ -1,4 +1,4 @@ m2r==0.2.1 -setuptools==41.5.0 +setuptools==41.5.1 sphinx==2.2.1 sphinx-rtd-theme==0.4.3 From ea397a5949dffcaac001a1fc7207bb06d6285b15 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 29 Oct 2019 15:41:33 +0000 Subject: [PATCH 27/53] Bump setuptools from 41.5.1 to 41.6.0 Bumps [setuptools](https://github.com/pypa/setuptools) from 41.5.1 to 41.6.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/v41.5.1...v41.6.0) Signed-off-by: dependabot-preview[bot] --- requirements/docs.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/docs.txt b/requirements/docs.txt index 11469bbea..e839f7769 100644 --- a/requirements/docs.txt +++ b/requirements/docs.txt @@ -1,4 +1,4 @@ m2r==0.2.1 -setuptools==41.5.1 +setuptools==41.6.0 sphinx==2.2.1 sphinx-rtd-theme==0.4.3 From 63e33d345f24db0446b6e2f79a927267dc884188 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 31 Oct 2019 12:37:20 +0000 Subject: [PATCH 28/53] 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 `2edf64c` to `a787290`. - [Release notes](https://github.com/plus3it/join-domain-formula/releases) - [Commits](https://github.com/plus3it/join-domain-formula/compare/2edf64c0ffe5f678e09f5d7c062502b895a74d37...a787290fb23ad61d9072505a19dd7a02d4bdff1c) 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 2edf64c0f..a787290fb 160000 --- a/src/watchmaker/static/salt/formulas/join-domain-formula +++ b/src/watchmaker/static/salt/formulas/join-domain-formula @@ -1 +1 @@ -Subproject commit 2edf64c0ffe5f678e09f5d7c062502b895a74d37 +Subproject commit a787290fb23ad61d9072505a19dd7a02d4bdff1c From ee398916db81659be53d25e86f90ebb30e7a285a Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 1 Nov 2019 01:41:56 +0000 Subject: [PATCH 29/53] Bump flake8-print from 3.1.1 to 3.1.3 Bumps [flake8-print](https://github.com/jbkahn/flake8-print) from 3.1.1 to 3.1.3. - [Release notes](https://github.com/jbkahn/flake8-print/releases) - [Commits](https://github.com/jbkahn/flake8-print/compare/3.1.1...3.1.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 5ef07ce14..cbf54a843 100644 --- a/requirements/check.txt +++ b/requirements/check.txt @@ -5,7 +5,7 @@ flake8-builtins==1.4.1 flake8-docstrings==1.5.0 flake8-isort==2.7.0 flake8-future-import==0.4.6 -flake8-print==3.1.1 +flake8-print==3.1.3 isort==4.3.21 m2r==0.2.1 pep8-naming==0.8.2 From 3c10cc51970345ce63128e486bc0e631be25f40f Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 1 Nov 2019 14:51:58 +0000 Subject: [PATCH 30/53] Bump flake8-print from 3.1.3 to 3.1.4 Bumps [flake8-print](https://github.com/jbkahn/flake8-print) from 3.1.3 to 3.1.4. - [Release notes](https://github.com/jbkahn/flake8-print/releases) - [Commits](https://github.com/jbkahn/flake8-print/compare/3.1.3...3.1.4) 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 cbf54a843..fa1622b53 100644 --- a/requirements/check.txt +++ b/requirements/check.txt @@ -5,7 +5,7 @@ flake8-builtins==1.4.1 flake8-docstrings==1.5.0 flake8-isort==2.7.0 flake8-future-import==0.4.6 -flake8-print==3.1.3 +flake8-print==3.1.4 isort==4.3.21 m2r==0.2.1 pep8-naming==0.8.2 From 949cc8ad86c600ddc5d242a11d4a639c53ba031c Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 6 Nov 2019 18:19:03 +0000 Subject: [PATCH 31/53] Bump pep8-naming from 0.8.2 to 0.9.0 Bumps [pep8-naming](https://github.com/PyCQA/pep8-naming) from 0.8.2 to 0.9.0. - [Release notes](https://github.com/PyCQA/pep8-naming/releases) - [Changelog](https://github.com/PyCQA/pep8-naming/blob/master/CHANGELOG.rst) - [Commits](https://github.com/PyCQA/pep8-naming/compare/0.8.2...0.9.0) 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 fa1622b53..251a559ef 100644 --- a/requirements/check.txt +++ b/requirements/check.txt @@ -8,7 +8,7 @@ flake8-future-import==0.4.6 flake8-print==3.1.4 isort==4.3.21 m2r==0.2.1 -pep8-naming==0.8.2 +pep8-naming==0.9.0 pydocstyle==4.0.1 pygments==2.4.2 pylint==2.4.3 From c63d3cf264c0269e5d24cb1525150164f085d7b0 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 14 Nov 2019 05:23:25 +0000 Subject: [PATCH 32/53] 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 `a787290` to `9845a8e`. - [Release notes](https://github.com/plus3it/join-domain-formula/releases) - [Commits](https://github.com/plus3it/join-domain-formula/compare/a787290fb23ad61d9072505a19dd7a02d4bdff1c...9845a8efaf4ab0dc79aaeb22e66b7c169fe270d1) 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 a787290fb..9845a8efa 160000 --- a/src/watchmaker/static/salt/formulas/join-domain-formula +++ b/src/watchmaker/static/salt/formulas/join-domain-formula @@ -1 +1 @@ -Subproject commit a787290fb23ad61d9072505a19dd7a02d4bdff1c +Subproject commit 9845a8efaf4ab0dc79aaeb22e66b7c169fe270d1 From 763ad4d1bca5428fec73a058acaab4f2bd319e48 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 14 Nov 2019 09:24:49 +0000 Subject: [PATCH 33/53] Bump pylint from 2.4.3 to 2.4.4 Bumps [pylint](https://github.com/PyCQA/pylint) from 2.4.3 to 2.4.4. - [Release notes](https://github.com/PyCQA/pylint/releases) - [Changelog](https://github.com/PyCQA/pylint/blob/master/ChangeLog) - [Commits](https://github.com/PyCQA/pylint/compare/pylint-2.4.3...pylint-2.4.4) 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 251a559ef..0aab010b7 100644 --- a/requirements/check.txt +++ b/requirements/check.txt @@ -11,5 +11,5 @@ m2r==0.2.1 pep8-naming==0.9.0 pydocstyle==4.0.1 pygments==2.4.2 -pylint==2.4.3 +pylint==2.4.4 readme-renderer==24.0 From e5f04d73a56115e248312400ccef10c3474e3f49 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 14 Nov 2019 18:12:21 +0000 Subject: [PATCH 34/53] Bump pep8-naming from 0.9.0 to 0.9.1 Bumps [pep8-naming](https://github.com/PyCQA/pep8-naming) from 0.9.0 to 0.9.1. - [Release notes](https://github.com/PyCQA/pep8-naming/releases) - [Changelog](https://github.com/PyCQA/pep8-naming/blob/master/CHANGELOG.rst) - [Commits](https://github.com/PyCQA/pep8-naming/compare/0.9.0...0.9.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 0aab010b7..aead88462 100644 --- a/requirements/check.txt +++ b/requirements/check.txt @@ -8,7 +8,7 @@ flake8-future-import==0.4.6 flake8-print==3.1.4 isort==4.3.21 m2r==0.2.1 -pep8-naming==0.9.0 +pep8-naming==0.9.1 pydocstyle==4.0.1 pygments==2.4.2 pylint==2.4.4 From 51c215efe02e1e49f775f5bfd7b150fc04545526 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 14 Nov 2019 21:28:15 +0000 Subject: [PATCH 35/53] Bump pytest from 5.2.2 to 5.2.3 Bumps [pytest](https://github.com/pytest-dev/pytest) from 5.2.2 to 5.2.3. - [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.2.2...5.2.3) 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 92c173fc7..f1638b3cd 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -2,7 +2,7 @@ mock==2.0.0;python_version<"2.7" # pyup: ==2.0.0 mock==3.0.5;python_version>="2.7" 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.2.2;python_version>="3.5" +pytest==5.2.3;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 0d23387fefc8ab1c14a6f23ac81029d13aa8d04c Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 15 Nov 2019 23:04:30 +0000 Subject: [PATCH 36/53] Bump pytest from 5.2.3 to 5.2.4 Bumps [pytest](https://github.com/pytest-dev/pytest) from 5.2.3 to 5.2.4. - [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.2.3...5.2.4) 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 f1638b3cd..59e40bf56 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -2,7 +2,7 @@ mock==2.0.0;python_version<"2.7" # pyup: ==2.0.0 mock==3.0.5;python_version>="2.7" 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.2.3;python_version>="3.5" +pytest==5.2.4;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 8200fd447f95fad2d30ef50d198280ccbd1940ff Mon Sep 17 00:00:00 2001 From: Loren Gordon Date: Mon, 18 Nov 2019 15:46:48 -0500 Subject: [PATCH 37/53] Streamlines gitlab-ci to assume os pkgs are provided in image --- .gitlab-ci.yml | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b195d05e3..23a0fb5dd 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,14 +1,10 @@ image: ${IMAGE} -before_script: - - sudo yum -y install python36 python36-libs python36-setuptools - - sudo python3.6 -m ensurepip --upgrade - - test -f /usr/bin/pip3 || sudo ln -sf /usr/local/bin/pip3 /usr/bin/pip3 - - sudo pip3 install --upgrade -r requirements/docs.txt - - sudo pip3 install -e . - pages: stage: deploy + before_script: + - pip3 install --upgrade -r requirements/docs.txt + - pip3 install -e . script: - sphinx-build -a -E -b html docs public artifacts: From 50f5feea1c5fcec5269ca46a7e8214ac0b8778cb Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 19 Nov 2019 12:59:19 +0000 Subject: [PATCH 38/53] Bump pytest-mock from 1.11.2 to 1.12.0 Bumps [pytest-mock](https://github.com/pytest-dev/pytest-mock) from 1.11.2 to 1.12.0. - [Release notes](https://github.com/pytest-dev/pytest-mock/releases) - [Changelog](https://github.com/pytest-dev/pytest-mock/blob/master/CHANGELOG.rst) - [Commits](https://github.com/pytest-dev/pytest-mock/compare/v1.11.2...v1.12.0) 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 59e40bf56..8b72b5a1d 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -8,5 +8,5 @@ pytest-catchlog==1.2.2;python_version<"2.7" pytest-cov==2.5.1;python_version<"2.7" # pyup: ==2.5.1 pytest-cov==2.8.1;python_version>="2.7" pytest-mock==1.6.3;python_version<"2.7" # pyup: ==1.6.3 -pytest-mock==1.11.2;python_version>="2.7" +pytest-mock==1.12.0;python_version>="2.7" wheel==0.29.0;python_version<="2.6" # pyup: ==0.29.0 From 7cbe786c25c0ef95c94664efa06dd47939262a20 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 19 Nov 2019 22:02:27 +0000 Subject: [PATCH 39/53] Bump pytest from 5.2.4 to 5.3.0 Bumps [pytest](https://github.com/pytest-dev/pytest) from 5.2.4 to 5.3.0. - [Release notes](https://github.com/pytest-dev/pytest/releases) - [Changelog](https://github.com/pytest-dev/pytest/blob/5.3.0/CHANGELOG.rst) - [Commits](https://github.com/pytest-dev/pytest/compare/5.2.4...5.3.0) 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 8b72b5a1d..ecf869ba4 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -2,7 +2,7 @@ mock==2.0.0;python_version<"2.7" # pyup: ==2.0.0 mock==3.0.5;python_version>="2.7" 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.2.4;python_version>="3.5" +pytest==5.3.0;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 597bd0cc8011b48a8863407240e3f994ffa53ae5 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 20 Nov 2019 22:19:48 +0000 Subject: [PATCH 40/53] Bump pytest-mock from 1.12.0 to 1.12.1 Bumps [pytest-mock](https://github.com/pytest-dev/pytest-mock) from 1.12.0 to 1.12.1. - [Release notes](https://github.com/pytest-dev/pytest-mock/releases) - [Changelog](https://github.com/pytest-dev/pytest-mock/blob/master/CHANGELOG.rst) - [Commits](https://github.com/pytest-dev/pytest-mock/compare/v1.12.0...v1.12.1) 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 ecf869ba4..3d7b2df3e 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -8,5 +8,5 @@ pytest-catchlog==1.2.2;python_version<"2.7" pytest-cov==2.5.1;python_version<"2.7" # pyup: ==2.5.1 pytest-cov==2.8.1;python_version>="2.7" pytest-mock==1.6.3;python_version<"2.7" # pyup: ==1.6.3 -pytest-mock==1.12.0;python_version>="2.7" +pytest-mock==1.12.1;python_version>="2.7" wheel==0.29.0;python_version<="2.6" # pyup: ==0.29.0 From 95949aa88d270d2b206300efaefb7cac1d45539e Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Sat, 23 Nov 2019 20:05:58 +0000 Subject: [PATCH 41/53] Bump setuptools from 41.6.0 to 42.0.0 Bumps [setuptools](https://github.com/pypa/setuptools) from 41.6.0 to 42.0.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/v41.6.0...v42.0.0) Signed-off-by: dependabot-preview[bot] --- requirements/docs.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/docs.txt b/requirements/docs.txt index e839f7769..8c97aaea4 100644 --- a/requirements/docs.txt +++ b/requirements/docs.txt @@ -1,4 +1,4 @@ m2r==0.2.1 -setuptools==41.6.0 +setuptools==42.0.0 sphinx==2.2.1 sphinx-rtd-theme==0.4.3 From 526a7ec7f78fcffc4bec602ed62887515c1a0012 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 25 Nov 2019 11:35:58 +0000 Subject: [PATCH 42/53] Bump setuptools from 42.0.0 to 42.0.1 Bumps [setuptools](https://github.com/pypa/setuptools) from 42.0.0 to 42.0.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/v42.0.0...v42.0.1) Signed-off-by: dependabot-preview[bot] --- requirements/docs.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/docs.txt b/requirements/docs.txt index 8c97aaea4..b81a786d8 100644 --- a/requirements/docs.txt +++ b/requirements/docs.txt @@ -1,4 +1,4 @@ m2r==0.2.1 -setuptools==42.0.0 +setuptools==42.0.1 sphinx==2.2.1 sphinx-rtd-theme==0.4.3 From 9dd2ae5e9efca625f107382b7316f5638766aa89 Mon Sep 17 00:00:00 2001 From: Loren Gordon Date: Fri, 29 Nov 2019 10:16:19 -0800 Subject: [PATCH 43/53] Uses cdn urls instead of direct s3 or doc references --- CHANGELOG.md | 2 +- README.md | 2 +- docs/conf.py | 2 +- docs/configuration.md | 10 +++++----- docs/installation.md | 16 ++++++++-------- src/watchmaker/static/config.yaml | 8 ++++---- 6 files changed, 20 insertions(+), 20 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c6501ad2d..8c2455e7f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -298,7 +298,7 @@ * Provides standalone packages that bundle the Python runtime together with Watchmaker and its dependencies - - See + - See * ash-linux-formula - (el7) Ensures packages are up-to-date - (el7) Ensures firewalld is installed and running diff --git a/README.md b/README.md index 478805ce6..189a4c3cb 100644 --- a/README.md +++ b/README.md @@ -23,4 +23,4 @@ services. ## Documentation For more information on installing and using Watchmaker, go to -. +. diff --git a/docs/conf.py b/docs/conf.py index 54f65fe43..91cc95fb6 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -365,6 +365,6 @@ linkcheck_ignore = [ r'https://github.com/plus3it/watchmaker/compare/(\d+\.){3}\.(\.\d+){3}', r'https://github.com/plus3it/watchmaker/compare/(\d+\.){3}\.(\.x){3}', - r'https://s3.amazonaws.com/watchmaker/releases/(.*)$', + r'https://watchmaker.cloudarmor.io/releases/(.*)$', r'https://docs\.saltstack\.com/en/latest/ref/modules/all/[a-z\.]*#[a-z\.]*' ] diff --git a/docs/configuration.md b/docs/configuration.md index 2122f7033..49527404e 100644 --- a/docs/configuration.md +++ b/docs/configuration.md @@ -156,7 +156,7 @@ all: computer_name: None environment: None ou_path: None - salt_content: https://s3.amazonaws.com/watchmaker/salt-content.zip + salt_content: None salt_states: Highstate user_formulas: # To add extra formulas, specify them as a map of @@ -177,16 +177,16 @@ linux: - redhat - centos el_version: 6 - url: https://s3.amazonaws.com/watchmaker/yum.defs/saltstack/salt/2016.11.9/salt-reposync-el6.repo + url: https://watchmaker.cloudarmor.io/yum.defs/saltstack/salt/2016.11.9/salt-reposync-el6.repo - dist: amazon el_version: 6 - url: https://s3.amazonaws.com/watchmaker/yum.defs/saltstack/salt/2016.11.9/salt-reposync-amzn.repo + url: https://watchmaker.cloudarmor.io/yum.defs/saltstack/salt/2016.11.9/salt-reposync-amzn.repo #SaltEL7: - dist: - redhat - centos el_version: 7 - url: https://s3.amazonaws.com/watchmaker/yum.defs/saltstack/salt/2016.11.9/salt-reposync-el7.repo + url: https://watchmaker.cloudarmor.io/yum.defs/saltstack/salt/2016.11.9/salt-reposync-el7.repo - salt: salt_debug_log: None install_method: yum @@ -197,7 +197,7 @@ linux: windows: - salt: salt_debug_log: None - installer_url: https://s3.amazonaws.com/watchmaker/repo/saltstack/salt/windows/Salt-Minion-2016.11.6-AMD64-Setup.exe + installer_url: https://watchmaker.cloudarmor.io/repo/saltstack/salt/windows/Salt-Minion-2016.11.6-AMD64-Setup.exe ``` [0]: https://yaml.org/spec/1.2/spec.html diff --git a/docs/installation.md b/docs/installation.md index 057bf8ab8..6eb4ff2d9 100644 --- a/docs/installation.md +++ b/docs/installation.md @@ -81,21 +81,21 @@ Linux. and corresponding SHA256 hashes. To access versions on S3, construct a URL using these examples for version 0.9.7: - * https://s3.amazonaws.com/watchmaker/releases/0.9.7/watchmaker-0.9.7-standalone-linux-x86_64 - * https://s3.amazonaws.com/watchmaker/releases/0.9.7/watchmaker-0.9.7-standalone-windows-amd64.exe + * https://watchmaker.cloudarmor.io/releases/0.9.7/watchmaker-0.9.7-standalone-linux-x86_64 + * https://watchmaker.cloudarmor.io/releases/0.9.7/watchmaker-0.9.7-standalone-windows-amd64.exe * Links to the latest versions of Watchmaker and SHA hashes on S3 are: - * https://s3.amazonaws.com/watchmaker/releases/latest/watchmaker-latest-standalone-linux-x86_64 - * https://s3.amazonaws.com/watchmaker/releases/latest/watchmaker-latest-sha256-linux-x86_64.json - * https://s3.amazonaws.com/watchmaker/releases/latest/watchmaker-latest-standalone-windows-amd64.exe - * https://s3.amazonaws.com/watchmaker/releases/latest/watchmaker-latest-sha256-windows-amd64.json + * https://watchmaker.cloudarmor.io/releases/latest/watchmaker-latest-standalone-linux-x86_64 + * https://watchmaker.cloudarmor.io/releases/latest/watchmaker-latest-sha256-linux-x86_64.json + * https://watchmaker.cloudarmor.io/releases/latest/watchmaker-latest-standalone-windows-amd64.exe + * https://watchmaker.cloudarmor.io/releases/latest/watchmaker-latest-sha256-windows-amd64.json * From PowerShell, the Windows package can be downloaded as follows: ```ps1con - PS C:\wam> $url = "https://s3.amazonaws.com/watchmaker/releases/latest/watchmaker-latest-standalone-windows-amd64.exe" + PS C:\wam> $url = "https://watchmaker.cloudarmor.io/releases/latest/watchmaker-latest-standalone-windows-amd64.exe" PS C:\wam> (New-Object System.Net.WebClient).DownloadFile($url, "watchmaker.exe") ``` @@ -103,7 +103,7 @@ Linux. as follows: ```console - # curl -so watchmaker https://s3.amazonaws.com/watchmaker/releases/latest/watchmaker-latest-standalone-linux-x86_64 + # curl -so watchmaker https://watchmaker.cloudarmor.io/releases/latest/watchmaker-latest-standalone-linux-x86_64 ``` * For the latest package, the version of Watchmaker can be determined by diff --git a/src/watchmaker/static/config.yaml b/src/watchmaker/static/config.yaml index 0df10e13e..807dc7174 100644 --- a/src/watchmaker/static/config.yaml +++ b/src/watchmaker/static/config.yaml @@ -26,16 +26,16 @@ linux: - redhat - centos el_version: 6 - url: https://s3.amazonaws.com/watchmaker/yum.defs/saltstack/salt/2018.3.3/salt-reposync-el6.repo + url: https://watchmaker.cloudarmor.io/yum.defs/saltstack/salt/2018.3.3/salt-reposync-el6.repo - dist: amazon el_version: 6 - url: https://s3.amazonaws.com/watchmaker/yum.defs/saltstack/salt/2018.3.3/salt-reposync-amzn.repo + url: https://watchmaker.cloudarmor.io/yum.defs/saltstack/salt/2018.3.3/salt-reposync-amzn.repo #SaltEL7: - dist: - redhat - centos el_version: 7 - url: https://s3.amazonaws.com/watchmaker/yum.defs/saltstack/salt/2018.3.3/salt-reposync-el7.repo + url: https://watchmaker.cloudarmor.io/yum.defs/saltstack/salt/2018.3.3/salt-reposync-el7.repo - salt: salt_debug_log: None install_method: yum @@ -46,4 +46,4 @@ linux: windows: - salt: salt_debug_log: None - installer_url: https://s3.amazonaws.com/watchmaker/repo/saltstack/salt/windows/Salt-Minion-2018.3.3-Py2-AMD64-Setup.exe + installer_url: https://watchmaker.cloudarmor.io/repo/saltstack/salt/windows/Salt-Minion-2018.3.3-Py2-AMD64-Setup.exe From 7970b31b06594321929818505968252b475ad926 Mon Sep 17 00:00:00 2001 From: Loren Gordon Date: Fri, 29 Nov 2019 11:01:22 -0800 Subject: [PATCH 44/53] Pin pygments in both docs and check builds --- requirements/check.txt | 3 ++- requirements/docs-check.txt | 1 + requirements/docs.txt | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 requirements/docs-check.txt diff --git a/requirements/check.txt b/requirements/check.txt index aead88462..7791db7e2 100644 --- a/requirements/check.txt +++ b/requirements/check.txt @@ -1,3 +1,5 @@ +-r docs-check.txt + check-manifest==0.40 flake8==3.7.9 flake8-bugbear==19.8.0 @@ -10,6 +12,5 @@ isort==4.3.21 m2r==0.2.1 pep8-naming==0.9.1 pydocstyle==4.0.1 -pygments==2.4.2 pylint==2.4.4 readme-renderer==24.0 diff --git a/requirements/docs-check.txt b/requirements/docs-check.txt new file mode 100644 index 000000000..5e8a0a2b8 --- /dev/null +++ b/requirements/docs-check.txt @@ -0,0 +1 @@ +pygments==2.4.2 diff --git a/requirements/docs.txt b/requirements/docs.txt index b81a786d8..6a0dca34a 100644 --- a/requirements/docs.txt +++ b/requirements/docs.txt @@ -1,3 +1,5 @@ +-r docs-check.txt + m2r==0.2.1 setuptools==42.0.1 sphinx==2.2.1 From ff3c15576204eee59ae0d039f46c4257ef697a39 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 2 Dec 2019 16:43:49 +0000 Subject: [PATCH 45/53] Bump sphinx from 2.2.1 to 2.2.2 Bumps [sphinx](https://github.com/sphinx-doc/sphinx) from 2.2.1 to 2.2.2. - [Release notes](https://github.com/sphinx-doc/sphinx/releases) - [Changelog](https://github.com/sphinx-doc/sphinx/blob/master/CHANGES) - [Commits](https://github.com/sphinx-doc/sphinx/compare/v2.2.1...v2.2.2) Signed-off-by: dependabot-preview[bot] --- requirements/docs.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/docs.txt b/requirements/docs.txt index 6a0dca34a..594b119cc 100644 --- a/requirements/docs.txt +++ b/requirements/docs.txt @@ -2,5 +2,5 @@ m2r==0.2.1 setuptools==42.0.1 -sphinx==2.2.1 +sphinx==2.2.2 sphinx-rtd-theme==0.4.3 From 2e1ac766884aead8ab9d6aadf38953cf23ba88fd Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 2 Dec 2019 16:43:49 +0000 Subject: [PATCH 46/53] Bump pygments from 2.4.2 to 2.5.2 Bumps [pygments](https://github.com/pygments/pygments) from 2.4.2 to 2.5.2. - [Release notes](https://github.com/pygments/pygments/releases) - [Changelog](https://github.com/pygments/pygments/blob/master/CHANGES) - [Commits](https://github.com/pygments/pygments/compare/2.4.2...2.5.2) Signed-off-by: dependabot-preview[bot] --- requirements/docs-check.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/docs-check.txt b/requirements/docs-check.txt index 5e8a0a2b8..df8fdd895 100644 --- a/requirements/docs-check.txt +++ b/requirements/docs-check.txt @@ -1 +1 @@ -pygments==2.4.2 +pygments==2.5.2 From 7ca090f442a4184b6cf4f9a7c723e070c9acbcf3 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 2 Dec 2019 16:44:23 +0000 Subject: [PATCH 47/53] Bump pytest from 5.3.0 to 5.3.1 Bumps [pytest](https://github.com/pytest-dev/pytest) from 5.3.0 to 5.3.1. - [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.3.0...5.3.1) 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 3d7b2df3e..dbfb0bbdb 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -2,7 +2,7 @@ mock==2.0.0;python_version<"2.7" # pyup: ==2.0.0 mock==3.0.5;python_version>="2.7" 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.3.0;python_version>="3.5" +pytest==5.3.1;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 9a27cad907fd1117c2f5143c8d45191b929eff0b Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 2 Dec 2019 16:45:28 +0000 Subject: [PATCH 48/53] Bump src/watchmaker/static/salt/formulas/ash-windows-formula Bumps [src/watchmaker/static/salt/formulas/ash-windows-formula](https://github.com/plus3it/ash-windows-formula) from `b023c13` to `4db1b9b`. - [Release notes](https://github.com/plus3it/ash-windows-formula/releases) - [Commits](https://github.com/plus3it/ash-windows-formula/compare/b023c13c3b25960a1278857c2e958ae603cb7dab...4db1b9baec41a7c6c1d7c3796d2fef0523d9a7c7) Signed-off-by: dependabot-preview[bot] --- src/watchmaker/static/salt/formulas/ash-windows-formula | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/watchmaker/static/salt/formulas/ash-windows-formula b/src/watchmaker/static/salt/formulas/ash-windows-formula index b023c13c3..4db1b9bae 160000 --- a/src/watchmaker/static/salt/formulas/ash-windows-formula +++ b/src/watchmaker/static/salt/formulas/ash-windows-formula @@ -1 +1 @@ -Subproject commit b023c13c3b25960a1278857c2e958ae603cb7dab +Subproject commit 4db1b9baec41a7c6c1d7c3796d2fef0523d9a7c7 From 9ae6ecf9835e01f695e1a11664c731d41b822eab Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 2 Dec 2019 18:11:33 +0000 Subject: [PATCH 49/53] Bump setuptools from 42.0.1 to 42.0.2 Bumps [setuptools](https://github.com/pypa/setuptools) from 42.0.1 to 42.0.2. - [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/v42.0.1...v42.0.2) Signed-off-by: dependabot-preview[bot] --- requirements/docs.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/docs.txt b/requirements/docs.txt index 594b119cc..71d3b25b6 100644 --- a/requirements/docs.txt +++ b/requirements/docs.txt @@ -1,6 +1,6 @@ -r docs-check.txt m2r==0.2.1 -setuptools==42.0.1 +setuptools==42.0.2 sphinx==2.2.2 sphinx-rtd-theme==0.4.3 From 8b0f3c93d2b1efe7d0bcd46ceafbc5bcaddaca4a Mon Sep 17 00:00:00 2001 From: Loren Gordon Date: Mon, 2 Dec 2019 21:03:10 -0800 Subject: [PATCH 50/53] Adds explicit literal block lexer to avoid sphinx error --- docs/faq.md | 6 +++--- docs/findings/el7.md | 32 ++++++++++++++++---------------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/docs/faq.md b/docs/faq.md index 1a47961ec..fcfadf139 100644 --- a/docs/faq.md +++ b/docs/faq.md @@ -70,7 +70,7 @@ present, the value is passed directly to the `exclude` option of the To use this option with watchmaker from the command line, pass the argument `--exclude-states `. For example: -``` +```shell # Exclude the state "foo" with an exact match watchmaker --exclude-states foo @@ -91,7 +91,7 @@ using the `-c|--config-dir` argument: For example: -``` +```shell # -c|--config-dir salt-call -c /opt/watchmaker/salt state.show_top ``` @@ -131,7 +131,7 @@ In order to install pip in Python 2.6, you can get it from: Once a Python 2.6-compatible ``pip`` version is installed, you can install compatible versions of the other packages like this: -``` +```shell pip install --upgrade "pip<10" "wheel<0.30.0" "setuptools<37" ``` diff --git a/docs/findings/el7.md b/docs/findings/el7.md index 7ca14fb0c..c7f7cc22b 100644 --- a/docs/findings/el7.md +++ b/docs/findings/el7.md @@ -13,7 +13,7 @@ The "stock" `/etc/ssh/sshd_config` file typically contains a commented-out line for the `LogLevel` parameter similar to the following: -~~~ +```shell [...elided...] #SyslogFacility AUTH @@ -23,11 +23,11 @@ SyslogFacility AUTHPRIV # Authentication: [...elided...] -~~~ +``` When the vendor includes a commented-out parameter-value in the configuration-file, it signifies that the paramter is set to the value shown on the commented out line. This can be further confirmed by consulting the associated manual page (see: |sshdconfig|_): -~~~ +```shell LogLevel Gives the verbosity level that is used when logging messages from sshd(8). The possible values are: QUIET, FATAL, ERROR, INFO, @@ -35,7 +35,7 @@ When the vendor includes a commented-out parameter-value in the configuration-fi DEBUG and DEBUG1 are equivalent. DEBUG2 and DEBUG3 each specify higher levels of debugging output. Logging with a DEBUG level violates the privacy of users and is not recommended. -~~~ +``` Note: _If it is desired to alter from the default_, it is typically recommended to change to `VERBOSE` — particularly if key-based logins are in use. This setting will cause the SSH daemon to record the fingerprints of presented-keys. @@ -64,17 +64,17 @@ Some scanners implement an "intentional fail" for this audit-item. This is desig This automation has the underlying assumption that all RPM-managed SUID files — be it by the OS vendor or the provider of the software _hosted by_ the OS — is implicitly authorized. A way to quickly-verify compliance with this assumption is to execute: -~~~bash +```bash for SUID in $( find / -user root -perm -4000 -print 2> /dev/null ) do printf "%s: " "${SUID}" rpm --qf '%{name}\t%{vendor}\n' -qf "$SUID" done | awk '{printf("%-40s\t%-12s\t%s\n",$1,$2,$3)}' -~~~ +``` Executing the above will output a list similar to: -~~~ +```bash /usr/bin/passwd: passwd CentOS /usr/bin/pkexec: polkit CentOS /usr/bin/crontab: cronie CentOS @@ -92,7 +92,7 @@ Executing the above will output a list similar to: /usr/sbin/unix_chkpwd: pam CentOS /usr/lib/polkit-1/polkit-agent-helper-1: polkit CentOS /usr/libexec/dbus-1/dbus-daemon-launch-helper: dbus CentOS -~~~ +``` If any listed files are not displayed as being from the OS-vendor (typically "CentOS" or "RedHat") or the vendor of the hosted application, investigate further to determine if the file meets site-specific authorization-criteria. @@ -106,10 +106,10 @@ Third-party security scanners will frequently call out missing filesystem mount This is a scan error — most likely due to an improperly-formatted search-expression. The watchmaker utilities set the `noexec` Option for `/dev/shm` Pseudo-Filesystem in the `/etc/fstab` configuration file. This can be verified with the following commands. -~~~ +```bash grep -E '\s\/dev\/shm\s.*noexec' /proc/mounts grep -E '\s\/dev\/shm\s.*noexec' /etc/fstab -~~~ +``` The above verifies that the mounted `/dev/shm` has the desired mount-option set and that the setting will persist after a reboot. @@ -121,10 +121,10 @@ Because scanners typically assume that `/tmp` will be a standard, disk-based fil To properly verify that Watchmaker has applied the required mount-option to the systemd-managed `/tmp` mount: -~~~ +```bash grep -E '\s\/tmp\s.*nodev' /proc/mounts grep nodev /etc/systemd/system/tmp.mount.d/options.conf -~~~ +``` The above verifies that the mounted `/tmp` has the desired mount-option set and that the setting will persist after a reboot. @@ -136,10 +136,10 @@ Because scanners typically assume that `/tmp` will be a standard, disk-based fil To properly verify that Watchmaker has applied the required mount-option to the systemd-managed `/tmp` mount: -~~~ +```bash grep -E '\s\/tmp\s.*noexec' /proc/mounts grep noexec /etc/systemd/system/tmp.mount.d/options.conf -~~~ +``` The above verifies that the mounted `/tmp` has the desired mount-option set and that the setting will persist after a reboot. @@ -151,10 +151,10 @@ Because scanners typically assume that `/tmp` will be a standard, disk-based fil To properly verify that Watchmaker has applied the required mount-option to the systemd-managed `/tmp` mount: -~~~ +```bash grep -E '\s\/tmp\s.*nosuid' /proc/mounts grep nosuid /etc/systemd/system/tmp.mount.d/options.conf -~~~ +``` The above verifies that the mounted `/tmp` has the desired mount-option set and that the setting will persist after a reboot. From ba8e3bfd868b1a128069454e7fcf062781280311 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 3 Dec 2019 05:23:49 +0000 Subject: [PATCH 51/53] Bump src/watchmaker/static/salt/content from `5d75c68` to `af75f0c` Bumps [src/watchmaker/static/salt/content](https://github.com/plus3it/watchmaker-salt-content) from `5d75c68` to `af75f0c`. - [Release notes](https://github.com/plus3it/watchmaker-salt-content/releases) - [Commits](https://github.com/plus3it/watchmaker-salt-content/compare/5d75c68d26c642bd028121c0ce0f0341cbe76f20...af75f0c2688effcc60b2464541eaf7951cc700eb) Signed-off-by: dependabot-preview[bot] --- src/watchmaker/static/salt/content | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/watchmaker/static/salt/content b/src/watchmaker/static/salt/content index 5d75c68d2..af75f0c26 160000 --- a/src/watchmaker/static/salt/content +++ b/src/watchmaker/static/salt/content @@ -1 +1 @@ -Subproject commit 5d75c68d26c642bd028121c0ce0f0341cbe76f20 +Subproject commit af75f0c2688effcc60b2464541eaf7951cc700eb From c315a4d9b72c3c82507595f0eeb41e201a6b65d9 Mon Sep 17 00:00:00 2001 From: Loren Gordon Date: Mon, 2 Dec 2019 21:11:57 -0800 Subject: [PATCH 52/53] Updates travis-ci to avoid very slow steps --- .travis.yml | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2f4b552a6..80184795c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -39,11 +39,6 @@ before_script: after_failure: - more .tox/log/* | cat - more .tox/*/log/* | cat -before_cache: - - rm -rf $HOME/.cache/pip/log -cache: - directories: - - "$HOME/.cache/pip" notifications: email: on_success: never @@ -67,7 +62,7 @@ jobs: env: - TOXENV=docs - stage: deploy - if: branch = develop OR tag is present + if: type != pull_request AND (branch = develop OR tag is present) python: 2.7 install: pip install m2r script: echo "Deploying..." @@ -90,7 +85,7 @@ jobs: on: tags: true - stage: deploy - if: branch in (env(RELEASE_BRANCH), develop) OR tag is present + if: type != pull_request AND (branch in (master, develop) OR tag is present) python: 3.6 install: - echo "Install" @@ -110,7 +105,7 @@ jobs: script: satsuki skip_cleanup: true on: - branch: $RELEASE_BRANCH + branch: master - provider: s3 bucket: $RELEASE_BUCKET upload-dir: $S3_KEYFIX From f9b701ffae4f757df048667faa2c9f182b0af1e2 Mon Sep 17 00:00:00 2001 From: Loren Gordon Date: Wed, 4 Dec 2019 14:39:04 -0800 Subject: [PATCH 53/53] Prepares watchmaker 0.16.6 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 403d4fca7..b9fb3ed32 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.16.5 +current_version = 0.16.6 commit = False tag = False tag_name = {new_version} diff --git a/CHANGELOG.md b/CHANGELOG.md index 8c2455e7f..ab2d4cd31 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,16 @@ ## Changelog +### 0.16.6 + +**Commit Delta**: [Change from 0.16.5 release](https://github.com/plus3it/watchmaker/compare/0.16.5...0.16.6) + +**Released**: 2019.12.04 + +**Summary**: + +* Uses CDN URLs for watchmaker config and content, instead of direct S3 URLs +* Pins `backoff` dependency when running on Python 3.4 or earlier + ### 0.16.5 **Commit Delta**: [Change from 0.16.4 release](https://github.com/plus3it/watchmaker/compare/0.16.4...0.16.5) diff --git a/setup.cfg b/setup.cfg index 9a03fe7ee..7a9d32665 100644 --- a/setup.cfg +++ b/setup.cfg @@ -3,7 +3,7 @@ [metadata] name = watchmaker description = Applied Configuration Management -version = 0.16.5 +version = 0.16.6 author = Plus3IT Maintainers of Watchmaker author_email = projects@plus3it.com url = https://github.com/plus3it/watchmaker