Merge pull request #1375 from eemperor/0.21.0

eemperor · web-flow · commit 2c35b8bac78b · 2020-08-12T14:33:24.000-04:00
Releases watchmaker version 0.21.0
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.20.5
+current_version = 0.21.0
 commit = False
 tag = False
 tag_name = {new_version}
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,15 @@
+version: 2
+updates:
+- package-ecosystem: pip
+  directory: "/"
+  schedule:
+    interval: daily
+  open-pull-requests-limit: 10
+  allow:
+  - dependency-type: direct
+  - dependency-type: indirect
+- package-ecosystem: gitsubmodule
+  directory: "/"
+  schedule:
+    interval: daily
+  open-pull-requests-limit: 10
diff --git a/.mergify.yml b/.mergify.yml
@@ -21,7 +21,8 @@ pull_request_rules:
     conditions:
       - author~=dependabot\[bot\]|dependabot-preview\[bot\]
       - label=submodules
-      - status-success=codebuild/pr
+      - status-success=codebuild/custom/pr
+      - status-success=codebuild/default/pr
       - "#approved-reviews-by>=1"
     actions:
       merge:
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,15 @@
 ## Changelog
 
+### 0.21.0
+
+**Commit Delta**: [Change from 0.20.5 release](https://github.com/plus3it/watchmaker/compare/0.20.5...0.21.0)
+
+**Released**: 2020.08.12
+
+**Summary**:
+
+*   Updates default watchmaker config.yaml to use salt 2019.2.5
+
 ### 0.20.5
 
 **Commit Delta**: [Change from 0.20.4 release](https://github.com/plus3it/watchmaker/compare/0.20.4...0.20.5)
diff --git a/requirements/basics.txt b/requirements/basics.txt
@@ -1,8 +1,8 @@
 setuptools==36.8.0;python_version<="2.6"
 setuptools==43.0.0;python_version<="3.4" and python_version>="2.7"
-setuptools==49.2.0;python_version>"3.4"
+setuptools==49.3.1;python_version>"3.4"
 virtualenv==15.2.0;python_version<="2.6"
-virtualenv==20.0.26;python_version>="2.7"
+virtualenv==20.0.30;python_version>="2.7"
 wheel==0.29.0;python_version<="2.6"
 wheel==0.33.6;python_version<="3.4" and python_version>="2.7"
 wheel==0.34.2;python_version>"3.4"
diff --git a/requirements/build.txt b/requirements/build.txt
@@ -1 +1 @@
-gravitybee==0.1.49
+gravitybee==0.1.53
diff --git a/requirements/check.txt b/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.1
+flake8-isort==4.0.0
 flake8-future-import==0.4.6
 flake8-print==3.1.4
 isort==4.3.21
diff --git a/requirements/deploy.txt b/requirements/deploy.txt
@@ -1 +1 @@
-satsuki==0.1.24
+satsuki==0.1.25
diff --git a/requirements/docs.txt b/requirements/docs.txt
@@ -1,6 +1,6 @@
 -r docs-check.txt
 
 recommonmark==0.6.0
-setuptools==49.2.0
-sphinx==3.1.2
+setuptools==49.3.1
+sphinx==3.2.0
 sphinx-rtd-theme==0.5.0
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.1;python_version>"3.4"
+pip==20.2.2;python_version>"3.4"
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"
 mock==4.0.2;python_version>="3.6"
 pytest==3.2.5;python_version<"2.7" or python_version=="3.3"
 pytest==4.6.3;python_version<"3.5" and python_version>="2.7"
-pytest==5.4.3;python_version>="3.5"
+pytest==6.0.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"
diff --git a/requirements/tox.txt b/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.17.1;python_version>"3.4"
+tox==3.19.0;python_version>"3.4"
diff --git a/setup.cfg b/setup.cfg
@@ -3,7 +3,7 @@
 [metadata]
 name = watchmaker
 description = Applied Configuration Management
-version = 0.20.5
+version = 0.21.0
 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
@@ -1 +1 @@
-Subproject commit eff16c878c7fd6b688b9b4c4267695cf1a0bf01b
+Subproject commit 2739acb7ffe6814449fa80ffec68604ca48aa59d
diff --git a/src/watchmaker/static/config.yaml b/src/watchmaker/static/config.yaml
@@ -1,4 +1,4 @@
-watchmaker_version: ">= 0.17.0"
+watchmaker_version: ">= 0.20.5"
 all:
   - salt:
       admin_groups: null
@@ -27,16 +27,16 @@ linux:
             - redhat
             - centos
           el_version: 6
-          url: https://watchmaker.cloudarmor.io/yum.defs/saltstack/salt/2018.3.4/salt-reposync-el6.repo
+          url: https://watchmaker.cloudarmor.io/yum.defs/saltstack/salt/2019.2.5/salt-reposync-el6.repo
         - dist: amazon
           el_version: 6
-          url: https://watchmaker.cloudarmor.io/yum.defs/saltstack/salt/2018.3.4/salt-reposync-amzn.repo
+          url: https://watchmaker.cloudarmor.io/yum.defs/saltstack/salt/2019.2.5/salt-reposync-amzn.repo
         #SaltEL7:
         - dist:
             - redhat
             - centos
           el_version: 7
-          url: https://watchmaker.cloudarmor.io/yum.defs/saltstack/salt/2018.3.4/salt-reposync-el7.repo
+          url: https://watchmaker.cloudarmor.io/yum.defs/saltstack/salt/2019.2.5/salt-reposync-el7.repo
   - salt:
       salt_debug_log: null
       install_method: yum
@@ -47,4 +47,4 @@ linux:
 windows:
   - salt:
       salt_debug_log: null
-      installer_url: https://watchmaker.cloudarmor.io/repo/saltstack/salt/windows/Salt-Minion-2018.3.4-Py2-AMD64-Setup.exe
+      installer_url: https://watchmaker.cloudarmor.io/repo/saltstack/salt/windows/Salt-Minion-2019.2.5-Py2-AMD64-Setup.exe
diff --git a/src/watchmaker/static/salt/formulas/ash-linux-formula b/src/watchmaker/static/salt/formulas/ash-linux-formula
@@ -1 +1 @@
-Subproject commit 28e201c699bc39feefead9b6eea86fd53fab0819
+Subproject commit 905f52ad8f7ef8fb639ba925befb34369d347608
diff --git a/src/watchmaker/static/salt/formulas/join-domain-formula b/src/watchmaker/static/salt/formulas/join-domain-formula
@@ -1 +1 @@
-Subproject commit 14341aa418a9d1219699de47f7e1e51065949a3f
+Subproject commit 9aaba0d4b1c38fcceddd65d608e73c0ff9d34e53

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-gravitybee==0.1.49`
	`1`	`+gravitybee==0.1.53`