Merge branch 'master' into port-50742

.ci/docs

@@ -1,4 +1,4 @@
-@Library('salt@master-1.6') _
+@Library('salt@master-1.7') _
 
 runDocs(
     env: env)

.ci/kitchen-amazon2-py3

@@ -1,4 +1,4 @@
-@Library('salt@master-1.6') _
+@Library('salt@master-1.7') _
 
 runTestSuite(
     concurrent_builds: 1,

.ci/kitchen-archlts-py3

@@ -1,4 +1,4 @@
-@Library('salt@master-1.6') _
+@Library('salt@master-1.7') _
 
 runTestSuite(
     concurrent_builds: 1,

.ci/kitchen-centos7-py3

@@ -1,4 +1,4 @@
-@Library('salt@master-1.6') _
+@Library('salt@master-1.7') _
 
 runTestSuite(
     concurrent_builds: 1,

.ci/kitchen-centos7-py3-cloud

@@ -1,4 +1,4 @@
-@Library('salt@master-1.6') _
+@Library('salt@master-1.7') _
 
 runTestSuite(
     concurrent_builds: 0,

.ci/kitchen-centos7-py3-m2crypto

@@ -1,4 +1,4 @@
-@Library('salt@master-1.6') _
+@Library('salt@master-1.7') _
 
 runTestSuite(
     concurrent_builds: 1,

.ci/kitchen-centos7-py3-proxy

@@ -1,4 +1,4 @@
-@Library('salt@master-1.6') _
+@Library('salt@master-1.7') _
 
 runTestSuite(
     concurrent_builds: 1,

.ci/kitchen-centos7-py3-pycryptodomex

@@ -1,4 +1,4 @@
-@Library('salt@master-1.6') _
+@Library('salt@master-1.7') _
 
 runTestSuite(
     concurrent_builds: 1,

.ci/kitchen-centos7-py3-tcp

@@ -1,4 +1,4 @@
-@Library('salt@master-1.6') _
+@Library('salt@master-1.7') _
 
 runTestSuite(
     concurrent_builds: 1,

.ci/kitchen-centos8-py3

@@ -1,4 +1,4 @@
-@Library('salt@master-1.6') _
+@Library('salt@master-1.7') _
 
 runTestSuite(
     concurrent_builds: 1,

.ci/kitchen-debian10-py3

@@ -1,4 +1,4 @@
-@Library('salt@master-1.6') _
+@Library('salt@master-1.7') _
 
 runTestSuite(
     concurrent_builds: 1,

.ci/kitchen-debian9-py3

@@ -1,4 +1,4 @@
-@Library('salt@master-1.6') _
+@Library('salt@master-1.7') _
 
 runTestSuite(
     concurrent_builds: 1,

.ci/kitchen-fedora30-py3

@@ -1,4 +1,4 @@
-@Library('salt@master-1.6') _
+@Library('salt@master-1.7') _
 
 runTestSuite(
     concurrent_builds: 1,

.ci/kitchen-fedora31-py3

@@ -1,4 +1,4 @@
-@Library('salt@master-1.6') _
+@Library('salt@master-1.7') _
 
 runTestSuite(
     concurrent_builds: 1,

.ci/kitchen-macosxhighsierra-py3

@@ -1,4 +1,4 @@
-@Library('salt@master-1.6') _
+@Library('salt@master-1.7') _
 
 // Pre-nox pipeline
 runTestSuite(

.ci/kitchen-macosxmojave-py3

@@ -1,4 +1,4 @@
-@Library('salt@master-1.6') _
+@Library('salt@master-1.7') _
 
 // Pre-nox pipeline
 runTestSuite(

.ci/kitchen-macosxsierra-py3

@@ -1,4 +1,4 @@
-@Library('salt@master-1.6') _
+@Library('salt@master-1.7') _
 
 // Pre-nox pipeline
 runTestSuite(

.ci/kitchen-opensuse15-py3

@@ -1,4 +1,4 @@
-@Library('salt@master-1.6') _
+@Library('salt@master-1.7') _
 
 runTestSuite(
     concurrent_builds: 1,

.ci/kitchen-ubuntu1604-py3

@@ -1,4 +1,4 @@
-@Library('salt@master-1.6') _
+@Library('salt@master-1.7') _
 
 runTestSuite(
     concurrent_builds: 1,

.ci/kitchen-ubuntu1604-py3-m2crypto

@@ -1,4 +1,4 @@
-@Library('salt@master-1.6') _
+@Library('salt@master-1.7') _
 
 runTestSuite(
     concurrent_builds: 1,

.ci/kitchen-ubuntu1604-py3-proxy

@@ -1,4 +1,4 @@
-@Library('salt@master-1.6') _
+@Library('salt@master-1.7') _
 
 runTestSuite(
     concurrent_builds: 1,

.ci/kitchen-ubuntu1604-py3-pycryptodomex

@@ -1,4 +1,4 @@
-@Library('salt@master-1.6') _
+@Library('salt@master-1.7') _
 
 runTestSuite(
     concurrent_builds: 1,

.ci/kitchen-ubuntu1604-py3-tcp

@@ -1,4 +1,4 @@
-@Library('salt@master-1.6') _
+@Library('salt@master-1.7') _
 
 runTestSuite(
     concurrent_builds: 1,

.ci/kitchen-ubuntu1804-py3

@@ -1,4 +1,4 @@
-@Library('salt@master-1.6') _
+@Library('salt@master-1.7') _
 
 runTestSuite(
     concurrent_builds: 1,

.ci/kitchen-windows2016-py3

@@ -1,4 +1,4 @@
-@Library('salt@master-1.6') _
+@Library('salt@master-1.7') _
 
 runTestSuite(
     concurrent_builds: 1,

.ci/kitchen-windows2019-py3

@@ -1,4 +1,4 @@
-@Library('salt@master-1.6') _
+@Library('salt@master-1.7') _
 
 runTestSuite(
     concurrent_builds: 1,

.ci/lint

@@ -1,4 +1,4 @@
-@Library('salt@master-1.6') _
+@Library('salt@master-1.7') _
 
 runLint(
     env: env)

.ci/pre-commit

@@ -0,0 +1,6 @@
+@Library('[email protected]') _
+
+runPreCommit(
+    env: env)
+
+// vim: ft=groovy

.codecov.yml

@@ -2,21 +2,24 @@ codecov:
   ci:
     - drone.saltstack.com
     - jenkinsci.saltstack.com
+#  max_report_age: 24           # The age you want coverage reports to expire at, or if you
+#                               # want to disable this check. Expired reports will not be processed by codecov.
+#  require_ci_to_pass: yes      # Less spammy. Only notify on passing builds.
 
-  branch: master
 
+  notify: off                    # Disable Notifications
 #  notify:
-#    require_ci_to_pass: yes      # Less spammy. Only notify on passing builds.
 #    after_n_builds: 46           # Only notify after N builds
 #                                 # This value is the output of:
 #                                 #    sh -c 'echo "$(ls .ci/ | grep kitchen | wc -l)"'
+#    wait_for_ci: yes             # Should Codecov wait for all CI statuses to complete before sending ours.
+#                                 # Note: Codecov considers all non-codecov statues to be CI statuses
 
-# Disable Notifications
-  notify: off
 
 ignore:
   - ^*.py$                       # python files at the repo root, ie, setup.py
   - doc/.*                       # ignore any code under doc/
+  - salt/ext/.*                  # ignore any code under salt/ext
 
 coverage:
   round: up
@@ -27,7 +30,7 @@ coverage:
       project:                   # measuring the overall project coverage
         default: false           # disable the default status that measures entire project
         salt:                    # declare a new status context "salt"
-          enabled: yes           # must be yes|true to enable this status
+          enabled: no            # must be yes|true to enable this status
           paths: "!tests/"       # remove all files in "tests/"
           target: auto           # will use the coverage from the base commit (pull request base or parent commit) coverage to compare against.
           base: auto             # will use the pull request base if the commit is on a pull request. If not, the parent commit will be used.
@@ -36,7 +39,7 @@ coverage:
           if_not_found: success  # if parent is not found report status as success, error, or failure
           if_ci_failed: error    # if ci fails report status as success, error, or failure
         tests:                   # declare a new status context "tests"
-          enabled: yes           # must be yes|true to enable this status
+          enabled: no            # must be yes|true to enable this status
           #target: 100%          # we always want 100% coverage here
           target: auto           # auto while we get this going
           base: auto             # will use the pull request base if the commit is on a pull request. If not, the parent commit will be used.
@@ -50,7 +53,7 @@ coverage:
                                  # entire pull requests Coverage Diff. Checking if the lines
                                  # adjusted are covered at least X%.
         default:
-          enabled: yes           # must be yes|true to enable this status
+          enabled: no            # must be yes|true to enable this status
           target: 100%           # Newly added lines must have 100% coverage
           if_no_uploads: error   # will post commit status of "error" if no coverage reports were uploaded
                                  # options: success, error, failure
@@ -59,7 +62,7 @@ coverage:
 
       changes:                   # if there are any unexpected changes in coverage
         default:
-          enabled: yes           # must be yes|true to enable this status
+          enabled: no            # must be yes|true to enable this status
           if_no_uploads: error
           if_not_found: success
           if_ci_failed: error
@@ -68,9 +71,11 @@ flags:
   salt:
     paths:
       - salt/
+    carryforward: true           # https://docs.codecov.io/docs/carryforward-flags
   tests:
     paths:
       - tests/
+    carryforward: true
 
 #comment:
 #  layout: "reach, diff, flags, files"

.git-blame-ignore-revs

@@ -0,0 +1,2 @@
+# Blacken Salt
+0b2a5613b345f17339cb90e60b407199b3d26980

.isort.cfg

@@ -0,0 +1,8 @@
+[settings]
+multi_line_output=3
+include_trailing_comma=True
+force_grid_wrap=0
+line_length=88
+ensure_newline_before_comments=True
+use_parentheses=True
+skip=salt/ext/,tests/kitchen/tests/

.pre-commit-config.yaml

@@ -416,6 +416,16 @@ repos:
           - --py-version=3.7
           - --platform=linux
 
+  - repo: https://github.com/timothycrosley/isort
+    rev: '1e78a9acf3110e1f9721feb591f89a451fc9876a'
+    hooks:
+      - id: isort
+
+  - repo: https://github.com/psf/black
+    rev: stable
+    hooks:
+      - id: black
+        language_version: python3.7
 
   - repo: https://github.com/saltstack/salt-nox-pre-commit
     rev: master

.pylintrc

@@ -8,11 +8,11 @@ extension-pkg-whitelist=
 # Add files or directories to the blacklist. They should be base names, not
 # paths.
 ignore=CVS,
-       ext
+       ext,
 
 # Add files or directories matching the regex patterns to the blacklist. The
 # regex matches against base names, not paths.
-ignore-patterns=
+ignore-patterns=salt.ext.*
 
 # Python code to execute, usually for sys.path manipulation such as
 # pygtk.require().
@@ -77,6 +77,7 @@ disable=R,
   no-member,
   unsubscriptable-object,
   un-indexed-curly-braces-error,
+  whitespace-before-colon,
   indentation-is-not-a-multiple-of-four-comment,
   blacklisted-name,
   invalid-name,
@@ -126,6 +127,7 @@ disable=R,
   str-format-in-logging,
   import-outside-toplevel,
   deprecated-method,
+  repr-flag-used-in-string,
   keyword-arg-before-vararg
 
 # Enable the message, report, category or checker with the given id(s). You can
@@ -396,6 +398,7 @@ init-import=no
 # List of qualified module names which can have objects that can redefine
 # builtins.
 redefining-builtins-modules=six.moves,
+  salt.ext.six.moves,
   past.builtins,
   future.builtins,
   builtins,
@@ -472,7 +475,9 @@ ignored-classes=SQLObject
 # (useful for modules/projects where namespaces are manipulated during runtime
 # and thus existing member attributes cannot be deduced by static analysis). It
 # supports qualified module names, as well as Unix pattern matching.
-ignored-modules=
+ignored-modules=salt.ext.six.moves,
+    six.moves,
+    _MovedItems,
 
 # Show a hint with possible names when a member name was not found. The aspect
 # of finding the hint is based on edit distance.
@@ -511,7 +516,7 @@ min-similarity-lines=4
 fileperms-default=0644
 
 # File paths to ignore file permission. Glob patterns allowed.
-fileperms-ignore-paths=setup.py,noxfile.py,tests/runtests.py,tests/jenkins*.py,tests/saltsh.py,tests/buildpackage.py
+fileperms-ignore-paths=setup.py,noxfile.py,tests/runtests.py,tests/jenkins*.py,tests/saltsh.py,tests/buildpackage.py,tests/unit/files/rosters/ansible/roster.py
 
 
 [MODERNIZE]