Merge branch 'master' into patch-5

Author: sagetherage

.bandit

@@ -0,0 +1,3 @@
+[bandit]
+exclude: salt/ext/tornado/*,tests/minionswarm.py
+skip: B701

.git-blame-ignore-revs

@@ -1,4 +1,4 @@
 # Blacken Salt
 0b2a5613b345f17339cb90e60b407199b3d26980
 # Blacken Docs
-f335a40f71446876969f53fbedc18a958ddb2890
+5e72e192f9713719ef5ec066c7b6c96302327ec6

.github/CONTRIBUTING.md

@@ -2,7 +2,7 @@
 name: Bug report
 about: Create a report to help us improve
 title: "[BUG]"
-labels: Bug
+labels: Bug, needs-triage
 assignees: ''
 
 ---

.github/ISSUE_TEMPLATE/bug_report.md

@@ -6,8 +6,8 @@ contact_links:
   - name: Salt-Users Forum
     url: https://groups.google.com/forum/#!forum/salt-users
     about: Please ask and answer questions here.
-  - name: Salt on Freenode
-    url: http://webchat.freenode.net/?channels=salt&uio=Mj10cnVlJjk9dHJ1ZSYxMD10cnVl83
+  - name: Salt on LiberaChat
+    url: https://web.libera.chat/#salt
     about: Please ask and answer questions here.
   - name: Security vulnerabilities
     email: security@saltstack.com

.github/ISSUE_TEMPLATE/config.yml

@@ -2,7 +2,7 @@
 name: Docs
 about: Issue related to Salt Documentation
 title: "[DOCS]"
-labels: Documentation
+labels: Documentation, needs-triage
 assignees: ''
 
 ---

.github/ISSUE_TEMPLATE/docs.md

@@ -2,7 +2,7 @@
 name: Feature request
 about: Suggest an idea for this project
 title: "[FEATURE REQUEST]"
-labels: Feature
+labels: Feature, needs-triage
 assignees: ''
 
 ---

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,10 @@
+---
+name: Test Failure
+about: Jenkins Test Failure issues
+title: "[TEST FAILURE]"
+labels: Test Failure
+assignees: ''
+
+---
+
+Please paste the link from the specific build where the failure first started:

.github/ISSUE_TEMPLATE/test-failure.md

@@ -12,17 +12,17 @@ newIssueWelcomeComment: >
   resources including:
 
     - [Community Wiki](https://github.com/saltstack/community/wiki)
-    - [Salt’s Contributor Guide](https://docs.saltstack.com/en/latest/topics/development/contributing.html)
-    - [Join our Community Slack](https://saltstackcommunity.herokuapp.com/)
-    - [IRC on Freenode](https://webchat.freenode.net/#salt)
-    - [SaltStack YouTube channel](https://www.youtube.com/user/SaltStack)
-    - [SaltStackInc Twitch channel](https://www.twitch.tv/saltstackinc)
+    - [Salt’s Contributor Guide](https://docs.saltproject.io/en/master/topics/development/contributing.html)
+    - [Join our Community Slack](https://join.slack.com/t/saltstackcommunity/shared_invite/zt-3av8jjyf-oBQ2M0vhXOhJpNpRkPWBvg)
+    - [IRC on LiberaChat](https://web.libera.chat/#salt)
+    - [Salt Project YouTube channel](https://www.youtube.com/channel/UCpveTIucFx9ljGelW63-BWg)
+    - [Salt Project Twitch channel](https://www.twitch.tv/saltprojectoss)
 
   There are lots of ways to get involved in our community. Every month, there are around a dozen
   opportunities to meet with other contributors and the Salt Core team and collaborate in real
   time. The best way to keep track is by subscribing to the Salt Community Events Calendar.
 
-  If you have additional questions, email us at core@saltstack.com. We’re glad
+  If you have additional questions, email us at saltproject@vmware.com. We’re glad
   you’ve joined our community and look forward to doing awesome things with
   you!
 
@@ -38,17 +38,17 @@ newPRWelcomeComment: >
   resources including:
 
     - [Community Wiki](https://github.com/saltstack/community/wiki)
-    - [Salt’s Contributor Guide](https://docs.saltstack.com/en/latest/topics/development/contributing.html)
-    - [Join our Community Slack](https://saltstackcommunity.herokuapp.com/)
-    - [IRC on Freenode](https://webchat.freenode.net/#salt)
-    - [SaltStack YouTube channel](https://www.youtube.com/user/SaltStack)
-    - [SaltStackInc Twitch channel](https://www.twitch.tv/saltstackinc)
+    - [Salt’s Contributor Guide](https://docs.saltproject.io/en/master/topics/development/contributing.html)
+    - [Join our Community Slack](https://join.slack.com/t/saltstackcommunity/shared_invite/zt-3av8jjyf-oBQ2M0vhXOhJpNpRkPWBvg)
+    - [IRC on LiberaChat](https://web.libera.chat/#salt)
+    - [Salt Project YouTube channel](https://www.youtube.com/channel/UCpveTIucFx9ljGelW63-BWg)
+    - [Salt Project Twitch channel](https://www.twitch.tv/saltprojectoss)
 
   There are lots of ways to get involved in our community. Every month, there are around a dozen
   opportunities to meet with other contributors and the Salt Core team and collaborate in real
   time. The best way to keep track is by subscribing to the Salt Community Events Calendar.
 
-  If you have additional questions, email us at core@saltstack.com. We’re glad
+  If you have additional questions, email us at saltproject@vmware.com. We’re glad
   you’ve joined our community and look forward to doing awesome things with
   you!
 

.github/config.yml

@@ -14,8 +14,10 @@ jobs:
 
     - name: Install System Deps
       run: |
+        echo "deb http://deb.debian.org/debian buster-backports main" >> /etc/apt/sources.list
         apt-get update
-        apt-get install -y enchant git gcc make zlib1g-dev libc-dev libffi-dev g++ libxml2 libxml2-dev libxslt-dev libcurl4-openssl-dev libssl-dev libgnutls28-dev xz-utils
+        apt-get install -y enchant git gcc imagemagick make zlib1g-dev libc-dev libffi-dev g++ libxml2 libxml2-dev libxslt-dev libcurl4-openssl-dev libssl-dev libgnutls28-dev xz-utils
+        apt-get install -y git/buster-backports
 
     - uses: actions/checkout@v2
 
@@ -36,7 +38,7 @@ jobs:
         list-files: json
         filters: |
           docs:
-            - docs/**
+            - doc/**
 
     - name: Set Docs Python Cache Key
       run: echo "PY=$(python --version --version | sha256sum | cut -d' ' -f1)" >> $GITHUB_ENV
@@ -49,7 +51,7 @@ jobs:
 
     - name: Install Python Requirements
       env:
-        PIP_EXTRA_INDEX_URL: https://artifactory.saltstack.net/artifactory/api/pypi/pypi-open/simple/
+        PIP_EXTRA_INDEX_URL: https://pypi-proxy.saltstack.net/root/local/+simple/
       run:
         nox --install-only --forcecolor -e 'docs-html(compress=False, clean=True)'
 
@@ -76,8 +78,10 @@ jobs:
 
     - name: Install System Deps
       run: |
+        echo "deb http://deb.debian.org/debian buster-backports main" >> /etc/apt/sources.list
         apt-get update
-        apt-get install -y enchant git gcc make zlib1g-dev libc-dev libffi-dev g++ libxml2 libxml2-dev libxslt-dev libcurl4-openssl-dev libssl-dev libgnutls28-dev
+        apt-get install -y enchant git gcc imagemagick make zlib1g-dev libc-dev libffi-dev g++ libxml2 libxml2-dev libxslt-dev libcurl4-openssl-dev libssl-dev libgnutls28-dev
+        apt-get install -y git/buster-backports
 
     - uses: actions/checkout@v2
 
@@ -89,7 +93,7 @@ jobs:
         list-files: json
         filters: |
           docs:
-            - docs/**
+            - doc/**
 
     - name: Set Python Version Env Var
       if: github.event_name == 'push' || steps.changed-files.outputs.docs == 'true'
@@ -116,7 +120,7 @@ jobs:
     - name: Install Python Requirements
       if: github.event_name == 'push' || steps.changed-files.outputs.docs == 'true'
       env:
-        PIP_EXTRA_INDEX_URL: https://artifactory.saltstack.net/artifactory/api/pypi/pypi-open/simple/
+        PIP_EXTRA_INDEX_URL: https://pypi-proxy.saltstack.net/root/local/+simple/
       run:
         nox --install-only --forcecolor -e 'docs-man(compress=False, update=False, clean=True)'