Merge branch '2019.2.1' of https://github.com/saltstack/salt into aix_docs

.ci/docs

@@ -27,8 +27,8 @@ pipeline {
                 sh '''
                 eval "$(pyenv init -)"
                 pyenv --version
-                pyenv install --skip-existing 2.7.15
-                pyenv shell 2.7.15
+                pyenv install --skip-existing 3.6.8
+                pyenv shell 3.6.8
                 python --version
                 pip install -U https://github.com/s0undt3ch/nox/archive/hotfix/py2.zip#egg=Nox==2018.10.17
                 nox --version
@@ -39,7 +39,7 @@ pipeline {
             steps {
                 sh '''
                 eval "$(pyenv init -)"
-                pyenv shell 2.7.15
+                pyenv shell 3.6.8
                 nox -e docs
                 '''
                 archiveArtifacts artifacts: 'doc/doc-archive.tar.gz'

.pre-commit-config.yaml

@@ -3,40 +3,6 @@ repos:
   - repo: https://github.com/saltstack/pip-tools-compile-impersonate
     rev: master
     hooks:
-      - id: pip-tools-compile
-        alias: compile-linux-py2.7-tcp-requirements
-        name: Linux Py2.7 TCP Requirements
-        files: ^requirements/((base|pytest)\.txt|static/(.*)\.in)$
-        exclude: ^requirements/static/(lint|cloud|docs|osx|windows|)\.in$
-        args:
-          - -v
-          - --py-version=2.7
-          - --platform=linux
-          - --out-prefix=tcp
-          - --include=requirements/base.txt
-          - --include=requirements/pytest.txt
-      - id: pip-tools-compile
-        alias: compile-osx-py2.7-tcp-requirements
-        name: OSX Py2.7 TCP Requirements
-        files: ^requirements/((base|pytest)\.txt|static/osx\.in)$
-        args:
-          - -v
-          - --py-version=2.7
-          - --platform=darwin
-          - --out-prefix=tcp
-          - --include=requirements/base.txt
-          - --include=requirements/pytest.txt
-      - id: pip-tools-compile
-        alias: compile-windows-py2.7-tcp-requirements
-        name: Windows Py2.7 TCP Requirements
-        files: ^requirements/((base|pytest)\.txt|static/windows\.in)$
-        args:
-          - -v
-          - --py-version=2.7
-          - --platform=windows
-          - --out-prefix=tcp
-          - --include=requirements/base.txt
-          - --include=requirements/pytest.txt
       - id: pip-tools-compile
         alias: compile-linux-py2.7-zmq-requirements
         name: Linux Py2.7 ZeroMQ Requirements
@@ -127,15 +93,6 @@ repos:
           - --py-version=2.7
           - --platform=linux
 
-      - id: pip-tools-compile
-        alias: compile-doc-requirements
-        name: Docs Py2.7 Requirements
-        files: ^requirements/((base|zeromq|pytest)\.txt|static/docs\.in)$
-        args:
-          - -v
-          - --py-version=2.7
-          - --platform=linux
-
       - id: pip-tools-compile
         alias: compile-cloud-py2.7-requirements
         name: Cloud Py2.7 Requirements
@@ -145,23 +102,11 @@ repos:
           - --py-version=2.7
 
 
-      - id: pip-tools-compile
-        alias: compile-linux-py3.4-tcp-requirements
-        name: Linux Py3.4 TCP Requirements
-        files: ^requirements/((base|pytest)\.txt|static/(.*)\.in)$
-        exclude: ^requirements/static/(centos-6|amzn-1|lint|cloud|docs|osx|windows)\.in$
-        args:
-          - -v
-          - --py-version=3.4
-          - --platform=linux
-          - --out-prefix=tcp
-          - --include=requirements/base.txt
-          - --include=requirements/pytest.txt
       - id: pip-tools-compile
         alias: compile-linux-py3.4-zmq-requirements
         name: Linux Py3.4 ZeroMQ Requirements
         files: ^requirements/((base|zeromq|pytest)\.txt|static/(.*)\.in)$
-        exclude: ^requirements/static/(centos-6|amzn-1|lint|cloud|docs|osx|windows)\.in$
+        exclude: ^requirements/static/(centos-6|amzn-2018\.03|lint|cloud|docs|osx|windows)\.in$
         args:
           - -v
           - --py-version=3.4
@@ -175,7 +120,7 @@ repos:
         alias: compile-linux-py3.4-raet-requirements
         name: Linux Py3.4 RAET Requirements
         files: ^requirements/((base|raet|pytest)\.txt|static/(.*)\.in)$
-        exclude: ^requirements/static/(centos-6|amzn-1|lint|cloud|docs|osx|windows)\.in$
+        exclude: ^requirements/static/(centos-6|amzn-2018\.03|lint|cloud|docs|osx|windows)\.in$
         args:
           - -v
           - --py-version=3.4
@@ -195,45 +140,11 @@ repos:
           - -v
           - --py-version=3.4
 
-      - id: pip-tools-compile
-        alias: compile-linux-py3.5-tcp-requirements
-        name: Linux Py3.5 TCP Requirements
-        files: ^requirements/((base|pytest)\.txt|static/(.*)\.in)$
-        exclude: ^requirements/static/(centos-6|amzn-1|lint|cloud|docs|osx|windows)\.in$
-        args:
-          - -v
-          - --py-version=3.5
-          - --platform=linux
-          - --out-prefix=tcp
-          - --include=requirements/base.txt
-          - --include=requirements/pytest.txt
-      - id: pip-tools-compile
-        alias: compile-osx-py3.5-tcp-requirements
-        name: OSX Py3.5 TCP Requirements
-        files: ^requirements/((base|pytest)\.txt|static/osx\.in)$
-        args:
-          - -v
-          - --py-version=3.5
-          - --platform=darwin
-          - --out-prefix=tcp
-          - --include=requirements/base.txt
-          - --include=requirements/pytest.txt
-      - id: pip-tools-compile
-        alias: compile-windows-py3.5-tcp-requirements
-        name: Windows Py3.5 TCP Requirements
-        files: ^requirements/((base|pytest)\.txt|static/windows\.in)$
-        args:
-          - -v
-          - --py-version=3.5
-          - --platform=windows
-          - --out-prefix=tcp
-          - --include=requirements/base.txt
-          - --include=requirements/pytest.txt
       - id: pip-tools-compile
         alias: compile-linux-py3.5-zmq-requirements
         name: Linux Py3.5 ZeroMQ Requirements
         files: ^requirements/((base|zeromq|pytest)\.txt|static/(.*)\.in)$
-        exclude: ^requirements/static/(centos-6|amzn-1|lint|cloud|docs|osx|windows)\.in$
+        exclude: ^requirements/static/(centos-6|amzn-2018\.03|lint|cloud|docs|osx|windows)\.in$
         args:
           - -v
           - --py-version=3.5
@@ -273,7 +184,7 @@ repos:
         alias: compile-linux-py3.5-raet-requirements
         name: Linux Py3.5 RAET Requirements
         files: ^requirements/((base|raet|pytest)\.txt|static/(.*)\.in)$
-        exclude: ^requirements/static/(centos-6|amzn-1|lint|cloud|docs|osx|windows)\.in$
+        exclude: ^requirements/static/(centos-6|amzn-2018\.03|lint|cloud|docs|osx|windows)\.in$
         args:
           - -v
           - --py-version=3.5
@@ -321,6 +232,15 @@ repos:
           - -v
           - --py-version=3.5
 
+      - id: pip-tools-compile
+        alias: compile-doc-requirements
+        name: Docs Py3.5 Requirements
+        files: ^requirements/((base|zeromq|pytest)\.txt|static/docs\.in)$
+        args:
+          - -v
+          - --py-version=3.5
+          - --platform=linux
+
       - id: pip-tools-compile
         alias: compile-linux-py3.6-tcp-requirements
         name: Linux Py3.6 TCP Requirements
@@ -348,7 +268,7 @@ repos:
         alias: compile-linux-py3.6-zmq-requirements
         name: Linux Py3.6 ZeroMQ Requirements
         files: ^requirements/((base|zeromq|pytest)\.txt|static/(.*)\.in)$
-        exclude: ^requirements/static/(centos-6|amzn-1|lint|cloud|docs|osx|windows)\.in$
+        exclude: ^requirements/static/(centos-6|amzn-2018\.03|lint|cloud|docs|osx|windows)\.in$
         args:
           - -v
           - --py-version=3.6
@@ -388,7 +308,7 @@ repos:
         alias: compile-linux-py3.6-raet-requirements
         name: Linux Py3.6 RAET Requirements
         files: ^requirements/((base|raet|pytest)\.txt|static/(.*)\.in)$
-        exclude: ^requirements/static/(centos-6|amzn-1|lint|cloud|docs|osx|windows)\.in$
+        exclude: ^requirements/static/(centos-6|amzn-2018\.03|lint|cloud|docs|osx|windows)\.in$
         args:
           - -v
           - --py-version=3.6
@@ -436,6 +356,15 @@ repos:
           - -v
           - --py-version=3.6
 
+      - id: pip-tools-compile
+        alias: compile-doc-requirements
+        name: Docs Py3.6 Requirements
+        files: ^requirements/((base|zeromq|pytest)\.txt|static/docs\.in)$
+        args:
+          - -v
+          - --py-version=3.6
+          - --platform=linux
+
       - id: pip-tools-compile
         alias: compile-linux-py3.7-tcp-requirements
         name: Linux Py3.7 TCP Requirements
@@ -463,7 +392,7 @@ repos:
         alias: compile-linux-py3.7-zmq-requirements
         name: Linux Py3.7 ZeroMQ Requirements
         files: ^requirements/((base|zeromq|pytest)\.txt|static/(.*)\.in)$
-        exclude: ^requirements/static/(centos-6|amzn-1|lint|cloud|docs|osx|windows)\.in$
+        exclude: ^requirements/static/(centos-6|amzn-2018\.03|lint|cloud|docs|osx|windows)\.in$
         args:
           - -v
           - --py-version=3.7
@@ -503,7 +432,7 @@ repos:
         alias: compile-linux-py3.7-raet-requirements
         name: Linux Py3.7 RAET Requirements
         files: ^requirements/((base|raet|pytest)\.txt|static/(.*)\.in)$
-        exclude: ^requirements/static/(centos-6|amzn-1|lint|cloud|docs|osx|windows)\.in$
+        exclude: ^requirements/static/(centos-6|amzn-2018\.03|lint|cloud|docs|osx|windows)\.in$
         args:
           - -v
           - --py-version=3.7
@@ -550,3 +479,12 @@ repos:
         args:
           - -v
           - --py-version=3.7
+
+      - id: pip-tools-compile
+        alias: compile-doc-requirements
+        name: Docs Py3.7 Requirements
+        files: ^requirements/((base|zeromq|pytest)\.txt|static/docs\.in)$
+        args:
+          - -v
+          - --py-version=3.7
+          - --platform=linux

noxfile.py

@@ -25,6 +25,8 @@ if __name__ == '__main__':
 import nox
 from nox.command import CommandFailed
 
+IS_PY3 = sys.version_info > (2,)
+
 # Be verbose when runing under a CI context
 PIP_INSTALL_SILENT = (os.environ.get('JENKINS_URL') or os.environ.get('CI') or os.environ.get('DRONE')) is None
 
@@ -841,8 +843,12 @@ def _lint(session, rcfile, flags, paths):
         raise
     finally:
         stdout.seek(0)
-        contents = stdout.read().encode('utf-8')
+        contents = stdout.read()
         if contents:
+            if IS_PY3:
+                contents = contents.decode('utf-8')
+            else:
+                contents = contents.encode('utf-8')
             sys.stdout.write(contents)
             sys.stdout.flush()
             if pylint_report_path:
@@ -892,14 +898,20 @@ def lint_tests(session):
     _lint(session, '.testing.pylintrc', flags, paths)
 
 
-@nox.session(python='2.7')
+@nox.session(python='3')
 def docs(session):
     '''
     Build Salt's Documentation
     '''
-    session.install('--progress-bar=off', '-r', 'requirements/static/py2.7/docs.txt', silent=PIP_INSTALL_SILENT)
+    pydir = _get_pydir(session)
+    if pydir == 'py3.4':
+        session.error('Sphinx only runs on Python >= 3.5')
+    session.install(
+        '--progress-bar=off',
+        '-r', 'requirements/static/{}/docs.txt'.format(pydir),
+        silent=PIP_INSTALL_SILENT)
     os.chdir('doc/')
     session.run('make', 'clean', external=True)
-    session.run('make', 'html', external=True)
+    session.run('make', 'html', 'SPHINXOPTS=-W', external=True)
     session.run('tar', '-czvf', 'doc-archive.tar.gz', '_build/html')
     os.chdir('..')

requirements/static/amzn-2.in

@@ -19,7 +19,8 @@ mock>=2.0.0; python_version < '3.6'
 more-itertools==5.0.0
 moto
 msgpack-python >= 0.4.2, != 0.5.5
-paramiko==2.1.2
+paramiko==2.1.2; python_version < '3.7'
+paramiko>=2.2.3; python_version >= '3.7'
 psutil
 # Let's install cryptodome instead of pycrypto because of pycrypto's outstanding security issues
 # PyCrypto, if pulled, will be removed from the generated static requirements

requirements/static/centos-7.in

@@ -19,7 +19,8 @@ mock>=2.0.0; python_version < '3.6'
 more-itertools==5.0.0
 moto
 msgpack-python >= 0.4.2, != 0.5.5
-paramiko==2.1.2
+paramiko==2.1.2; python_version < '3.7'
+paramiko>=2.2.3; python_version >= '3.7'
 psutil
 # Let's install cryptodome instead of pycrypto because of pycrypto's outstanding security issues
 # PyCrypto, if pulled, will be removed from the generated static requirements

requirements/static/debian-8.in

@@ -18,7 +18,8 @@ mock>=2.0.0; python_version < '3.6'
 more-itertools==5.0.0
 moto
 msgpack-python >= 0.4.2, != 0.5.5
-paramiko==2.1.2
+paramiko==2.1.2; python_version < '3.7'
+paramiko>=2.2.3; python_version >= '3.7'
 psutil
 # Let's install cryptodome instead of pycrypto because of pycrypto's outstanding security issues
 # PyCrypto, if pulled, will be removed from the generated static requirements

requirements/static/debian-9.in

@@ -18,9 +18,9 @@ mock>=2.0.0; python_version < '3.6'
 more-itertools==5.0.0
 moto
 msgpack-python >= 0.4.2, != 0.5.5
-paramiko==2.1.2
+paramiko==2.1.2; python_version < '3.7'
+paramiko>=2.2.3; python_version >= '3.7'
 psutil
-paramiko==2.1.2
 # Let's install cryptodome instead of pycrypto because of pycrypto's outstanding security issues
 # PyCrypto, if pulled, will be removed from the generated static requirements
 pycryptodome

requirements/static/docs.in

@@ -1 +1 @@
-sphinx
+sphinx>=2.0.1

requirements/static/py2.7/raet-amzn-2.txt

@@ -66,7 +66,7 @@ msgpack-python==0.5.6
 msgpack==0.6.1
 ncclient==0.6.4           # via junos-eznc
 netaddr==0.7.19           # via junos-eznc
-paramiko==2.1.2
+paramiko==2.1.2 ; python_version < "3.7"
 pathlib2==2.3.3           # via pytest
 pbr==5.1.3                # via mock
 pluggy==0.9.0             # via pytest

requirements/static/py2.7/raet-centos-7.txt

@@ -66,7 +66,7 @@ msgpack-python==0.5.6
 msgpack==0.6.1
 ncclient==0.6.4           # via junos-eznc
 netaddr==0.7.19           # via junos-eznc
-paramiko==2.1.2
+paramiko==2.1.2 ; python_version < "3.7"
 pathlib2==2.3.3           # via pytest
 pbr==5.1.3                # via mock
 pluggy==0.9.0             # via pytest

requirements/static/py2.7/raet-debian-8.txt

@@ -65,7 +65,7 @@ msgpack-python==0.5.6
 msgpack==0.6.1
 ncclient==0.6.4           # via junos-eznc
 netaddr==0.7.19           # via junos-eznc
-paramiko==2.1.2
+paramiko==2.1.2 ; python_version < "3.7"
 pathlib2==2.3.3           # via pytest
 pbr==5.1.3                # via mock
 pluggy==0.9.0             # via pytest

requirements/static/py2.7/raet-debian-9.txt

@@ -65,7 +65,7 @@ msgpack-python==0.5.6
 msgpack==0.6.1
 ncclient==0.6.4           # via junos-eznc
 netaddr==0.7.19           # via junos-eznc
-paramiko==2.1.2
+paramiko==2.1.2 ; python_version < "3.7"
 pathlib2==2.3.3           # via pytest
 pbr==5.1.3                # via mock
 pluggy==0.9.0             # via pytest

requirements/static/py2.7/raet-ubuntu-16.04.txt

@@ -65,7 +65,7 @@ msgpack-python==0.5.6
 msgpack==0.6.1
 ncclient==0.6.4           # via junos-eznc
 netaddr==0.7.19           # via junos-eznc
-paramiko==2.1.2
+paramiko==2.1.2 ; python_version < "3.7"
 pathlib2==2.3.3           # via pytest
 pbr==5.1.3                # via mock
 pluggy==0.9.0             # via pytest

requirements/static/py2.7/raet-ubuntu-18.04.txt

@@ -65,7 +65,7 @@ msgpack-python==0.5.6
 msgpack==0.6.1
 ncclient==0.6.4           # via junos-eznc
 netaddr==0.7.19           # via junos-eznc
-paramiko==2.1.2
+paramiko==2.1.2 ; python_version < "3.7"
 pathlib2==2.3.3           # via pytest
 pbr==5.1.3                # via mock
 pluggy==0.9.0             # via pytest

requirements/static/py2.7/zeromq-amzn-2.txt

@@ -64,7 +64,7 @@ msgpack-python==0.5.6
 msgpack==0.6.1
 ncclient==0.6.4           # via junos-eznc
 netaddr==0.7.19           # via junos-eznc
-paramiko==2.1.2
+paramiko==2.1.2 ; python_version < "3.7"
 pathlib2==2.3.3           # via pytest
 pbr==5.1.3                # via mock
 pluggy==0.9.0             # via pytest

requirements/static/py2.7/zeromq-centos-7.txt

@@ -64,7 +64,7 @@ msgpack-python==0.5.6
 msgpack==0.6.1
 ncclient==0.6.4           # via junos-eznc
 netaddr==0.7.19           # via junos-eznc
-paramiko==2.1.2
+paramiko==2.1.2 ; python_version < "3.7"
 pathlib2==2.3.3           # via pytest
 pbr==5.1.3                # via mock
 pluggy==0.9.0             # via pytest

requirements/static/py2.7/zeromq-debian-8.txt

@@ -63,7 +63,7 @@ msgpack-python==0.5.6
 msgpack==0.6.1
 ncclient==0.6.4           # via junos-eznc
 netaddr==0.7.19           # via junos-eznc
-paramiko==2.1.2
+paramiko==2.1.2 ; python_version < "3.7"
 pathlib2==2.3.3           # via pytest
 pbr==5.1.3                # via mock
 pluggy==0.9.0             # via pytest

requirements/static/py2.7/zeromq-debian-9.txt

@@ -63,7 +63,7 @@ msgpack-python==0.5.6
 msgpack==0.6.1
 ncclient==0.6.4           # via junos-eznc
 netaddr==0.7.19           # via junos-eznc
-paramiko==2.1.2
+paramiko==2.1.2 ; python_version < "3.7"
 pathlib2==2.3.3           # via pytest
 pbr==5.1.3                # via mock
 pluggy==0.9.0             # via pytest

requirements/static/py2.7/zeromq-ubuntu-16.04.txt

@@ -63,7 +63,7 @@ msgpack-python==0.5.6
 msgpack==0.6.1
 ncclient==0.6.4           # via junos-eznc
 netaddr==0.7.19           # via junos-eznc
-paramiko==2.1.2
+paramiko==2.1.2 ; python_version < "3.7"
 pathlib2==2.3.3           # via pytest
 pbr==5.1.3                # via mock
 pluggy==0.9.0             # via pytest

requirements/static/py2.7/zeromq-ubuntu-18.04.txt

@@ -63,7 +63,7 @@ msgpack-python==0.5.6
 msgpack==0.6.1
 ncclient==0.6.4           # via junos-eznc
 netaddr==0.7.19           # via junos-eznc
-paramiko==2.1.2
+paramiko==2.1.2 ; python_version < "3.7"
 pathlib2==2.3.3           # via pytest
 pbr==5.1.3                # via mock
 pluggy==0.9.0             # via pytest

requirements/static/py3.4/raet-amzn-2.txt

@@ -60,7 +60,7 @@ msgpack-python==0.5.6
 msgpack==0.6.1
 ncclient==0.6.4           # via junos-eznc
 netaddr==0.7.19           # via junos-eznc
-paramiko==2.1.2
+paramiko==2.1.2 ; python_version < "3.7"
 pathlib2==2.3.3           # via pytest
 pbr==5.1.3                # via mock
 pluggy==0.9.0             # via pytest

requirements/static/py3.4/raet-centos-7.txt

@@ -60,7 +60,7 @@ msgpack-python==0.5.6
 msgpack==0.6.1
 ncclient==0.6.4           # via junos-eznc
 netaddr==0.7.19           # via junos-eznc
-paramiko==2.1.2
+paramiko==2.1.2 ; python_version < "3.7"
 pathlib2==2.3.3           # via pytest
 pbr==5.1.3                # via mock
 pluggy==0.9.0             # via pytest

requirements/static/py3.4/raet-debian-8.txt

@@ -59,7 +59,7 @@ msgpack-python==0.5.6
 msgpack==0.6.1
 ncclient==0.6.4           # via junos-eznc
 netaddr==0.7.19           # via junos-eznc
-paramiko==2.1.2
+paramiko==2.1.2 ; python_version < "3.7"
 pathlib2==2.3.3           # via pytest
 pbr==5.1.3                # via mock
 pluggy==0.9.0             # via pytest

requirements/static/py3.4/raet-debian-9.txt

@@ -59,7 +59,7 @@ msgpack-python==0.5.6
 msgpack==0.6.1
 ncclient==0.6.4           # via junos-eznc
 netaddr==0.7.19           # via junos-eznc
-paramiko==2.1.2
+paramiko==2.1.2 ; python_version < "3.7"
 pathlib2==2.3.3           # via pytest
 pbr==5.1.3                # via mock
 pluggy==0.9.0             # via pytest

requirements/static/py3.4/raet-ubuntu-16.04.txt

@@ -59,7 +59,7 @@ msgpack-python==0.5.6
 msgpack==0.6.1
 ncclient==0.6.4           # via junos-eznc
 netaddr==0.7.19           # via junos-eznc
-paramiko==2.1.2
+paramiko==2.1.2 ; python_version < "3.7"
 pathlib2==2.3.3           # via pytest
 pbr==5.1.3                # via mock
 pluggy==0.9.0             # via pytest

requirements/static/py3.4/raet-ubuntu-18.04.txt

@@ -59,7 +59,7 @@ msgpack-python==0.5.6
 msgpack==0.6.1
 ncclient==0.6.4           # via junos-eznc
 netaddr==0.7.19           # via junos-eznc
-paramiko==2.1.2
+paramiko==2.1.2 ; python_version < "3.7"
 pathlib2==2.3.3           # via pytest
 pbr==5.1.3                # via mock
 pluggy==0.9.0             # via pytest

requirements/static/py3.4/zeromq-amzn-2.txt

@@ -56,7 +56,7 @@ msgpack-python==0.5.6
 msgpack==0.6.1
 ncclient==0.6.4           # via junos-eznc
 netaddr==0.7.19           # via junos-eznc
-paramiko==2.1.2
+paramiko==2.1.2 ; python_version < "3.7"
 pathlib2==2.3.3           # via pytest
 pbr==5.1.3                # via mock
 pluggy==0.9.0             # via pytest

requirements/static/py3.4/zeromq-centos-7.txt

@@ -56,7 +56,7 @@ msgpack-python==0.5.6
 msgpack==0.6.1
 ncclient==0.6.4           # via junos-eznc
 netaddr==0.7.19           # via junos-eznc
-paramiko==2.1.2
+paramiko==2.1.2 ; python_version < "3.7"
 pathlib2==2.3.3           # via pytest
 pbr==5.1.3                # via mock
 pluggy==0.9.0             # via pytest

requirements/static/py3.4/zeromq-debian-8.txt

@@ -55,7 +55,7 @@ msgpack-python==0.5.6
 msgpack==0.6.1
 ncclient==0.6.4           # via junos-eznc
 netaddr==0.7.19           # via junos-eznc
-paramiko==2.1.2
+paramiko==2.1.2 ; python_version < "3.7"
 pathlib2==2.3.3           # via pytest
 pbr==5.1.3                # via mock
 pluggy==0.9.0             # via pytest

requirements/static/py3.4/zeromq-debian-9.txt

@@ -55,7 +55,7 @@ msgpack-python==0.5.6
 msgpack==0.6.1
 ncclient==0.6.4           # via junos-eznc
 netaddr==0.7.19           # via junos-eznc
-paramiko==2.1.2
+paramiko==2.1.2 ; python_version < "3.7"
 pathlib2==2.3.3           # via pytest
 pbr==5.1.3                # via mock
 pluggy==0.9.0             # via pytest

requirements/static/py3.4/zeromq-ubuntu-16.04.txt

@@ -55,7 +55,7 @@ msgpack-python==0.5.6
 msgpack==0.6.1
 ncclient==0.6.4           # via junos-eznc
 netaddr==0.7.19           # via junos-eznc
-paramiko==2.1.2
+paramiko==2.1.2 ; python_version < "3.7"
 pathlib2==2.3.3           # via pytest
 pbr==5.1.3                # via mock
 pluggy==0.9.0             # via pytest

requirements/static/py3.4/zeromq-ubuntu-18.04.txt

@@ -55,7 +55,7 @@ msgpack-python==0.5.6
 msgpack==0.6.1
 ncclient==0.6.4           # via junos-eznc
 netaddr==0.7.19           # via junos-eznc
-paramiko==2.1.2
+paramiko==2.1.2 ; python_version < "3.7"
 pathlib2==2.3.3           # via pytest
 pbr==5.1.3                # via mock
 pluggy==0.9.0             # via pytest

requirements/static/py3.5/docs.txt

@@ -2,10 +2,10 @@
 # This file is autogenerated by pip-compile
 # To update, run:
 #
-#    pip-compile -o requirements/static/py2.7/docs.txt -v requirements/static/docs.in
+#    pip-compile -o requirements/static/py3.5/docs.txt -v requirements/static/docs.in
 #
 alabaster==0.7.12         # via sphinx
-babel==2.6.0              # via sphinx
+babel==2.7.0              # via sphinx
 certifi==2019.3.9         # via requests
 chardet==3.0.4            # via requests
 docutils==0.14            # via sphinx
@@ -14,13 +14,17 @@ imagesize==1.1.0          # via sphinx
 jinja2==2.10.1            # via sphinx
 markupsafe==1.1.1         # via jinja2
 packaging==19.0           # via sphinx
-pygments==2.3.1           # via sphinx
+pygments==2.4.2           # via sphinx
 pyparsing==2.4.0          # via packaging
 pytz==2019.1              # via babel
-requests==2.21.0          # via sphinx
-six==1.12.0               # via packaging, sphinx
+requests==2.22.0          # via sphinx
+six==1.12.0               # via packaging
 snowballstemmer==1.2.1    # via sphinx
-sphinx==1.8.5
-sphinxcontrib-websupport==1.1.0  # via sphinx
-typing==3.6.6             # via sphinx
-urllib3==1.24.2           # via requests
+sphinx==2.0.1
+sphinxcontrib-applehelp==1.0.1  # via sphinx
+sphinxcontrib-devhelp==1.0.1  # via sphinx
+sphinxcontrib-htmlhelp==1.0.2  # via sphinx
+sphinxcontrib-jsmath==1.0.1  # via sphinx
+sphinxcontrib-qthelp==1.0.2  # via sphinx
+sphinxcontrib-serializinghtml==1.1.3  # via sphinx
+urllib3==1.25.3           # via requests

requirements/static/py3.5/raet-amzn-2.txt

@@ -60,7 +60,7 @@ msgpack-python==0.5.6
 msgpack==0.6.1
 ncclient==0.6.4           # via junos-eznc
 netaddr==0.7.19           # via junos-eznc
-paramiko==2.1.2
+paramiko==2.1.2 ; python_version < "3.7"
 pathlib2==2.3.3           # via pytest
 pbr==5.1.3                # via mock
 pluggy==0.9.0             # via pytest

requirements/static/py3.5/raet-centos-7.txt

@@ -60,7 +60,7 @@ msgpack-python==0.5.6
 msgpack==0.6.1
 ncclient==0.6.4           # via junos-eznc
 netaddr==0.7.19           # via junos-eznc
-paramiko==2.1.2
+paramiko==2.1.2 ; python_version < "3.7"
 pathlib2==2.3.3           # via pytest
 pbr==5.1.3                # via mock
 pluggy==0.9.0             # via pytest

requirements/static/py3.5/raet-debian-8.txt

@@ -59,7 +59,7 @@ msgpack-python==0.5.6
 msgpack==0.6.1
 ncclient==0.6.4           # via junos-eznc
 netaddr==0.7.19           # via junos-eznc
-paramiko==2.1.2
+paramiko==2.1.2 ; python_version < "3.7"
 pathlib2==2.3.3           # via pytest
 pbr==5.1.3                # via mock
 pluggy==0.9.0             # via pytest

requirements/static/py3.5/raet-debian-9.txt

@@ -59,7 +59,7 @@ msgpack-python==0.5.6
 msgpack==0.6.1
 ncclient==0.6.4           # via junos-eznc
 netaddr==0.7.19           # via junos-eznc
-paramiko==2.1.2
+paramiko==2.1.2 ; python_version < "3.7"
 pathlib2==2.3.3           # via pytest
 pbr==5.1.3                # via mock
 pluggy==0.9.0             # via pytest

requirements/static/py3.5/raet-ubuntu-16.04.txt

@@ -59,7 +59,7 @@ msgpack-python==0.5.6
 msgpack==0.6.1
 ncclient==0.6.4           # via junos-eznc
 netaddr==0.7.19           # via junos-eznc
-paramiko==2.1.2
+paramiko==2.1.2 ; python_version < "3.7"
 pathlib2==2.3.3           # via pytest
 pbr==5.1.3                # via mock
 pluggy==0.9.0             # via pytest

requirements/static/py3.5/raet-ubuntu-18.04.txt

@@ -59,7 +59,7 @@ msgpack-python==0.5.6
 msgpack==0.6.1
 ncclient==0.6.4           # via junos-eznc
 netaddr==0.7.19           # via junos-eznc
-paramiko==2.1.2
+paramiko==2.1.2 ; python_version < "3.7"
 pathlib2==2.3.3           # via pytest
 pbr==5.1.3                # via mock
 pluggy==0.9.0             # via pytest

requirements/static/py3.5/zeromq-amzn-2.txt

@@ -56,7 +56,7 @@ msgpack-python==0.5.6
 msgpack==0.6.1
 ncclient==0.6.4           # via junos-eznc
 netaddr==0.7.19           # via junos-eznc
-paramiko==2.1.2
+paramiko==2.1.2 ; python_version < "3.7"
 pathlib2==2.3.3           # via pytest
 pbr==5.1.3                # via mock
 pluggy==0.9.0             # via pytest

requirements/static/py3.5/zeromq-centos-7.txt

@@ -56,7 +56,7 @@ msgpack-python==0.5.6
 msgpack==0.6.1
 ncclient==0.6.4           # via junos-eznc
 netaddr==0.7.19           # via junos-eznc
-paramiko==2.1.2
+paramiko==2.1.2 ; python_version < "3.7"
 pathlib2==2.3.3           # via pytest
 pbr==5.1.3                # via mock
 pluggy==0.9.0             # via pytest

requirements/static/py3.5/zeromq-debian-8.txt

@@ -55,7 +55,7 @@ msgpack-python==0.5.6
 msgpack==0.6.1
 ncclient==0.6.4           # via junos-eznc
 netaddr==0.7.19           # via junos-eznc
-paramiko==2.1.2
+paramiko==2.1.2 ; python_version < "3.7"
 pathlib2==2.3.3           # via pytest
 pbr==5.1.3                # via mock
 pluggy==0.9.0             # via pytest

requirements/static/py3.5/zeromq-debian-9.txt

@@ -55,7 +55,7 @@ msgpack-python==0.5.6
 msgpack==0.6.1
 ncclient==0.6.4           # via junos-eznc
 netaddr==0.7.19           # via junos-eznc
-paramiko==2.1.2
+paramiko==2.1.2 ; python_version < "3.7"
 pathlib2==2.3.3           # via pytest
 pbr==5.1.3                # via mock
 pluggy==0.9.0             # via pytest

requirements/static/py3.5/zeromq-ubuntu-16.04.txt

@@ -55,7 +55,7 @@ msgpack-python==0.5.6
 msgpack==0.6.1
 ncclient==0.6.4           # via junos-eznc
 netaddr==0.7.19           # via junos-eznc
-paramiko==2.1.2
+paramiko==2.1.2 ; python_version < "3.7"
 pathlib2==2.3.3           # via pytest
 pbr==5.1.3                # via mock
 pluggy==0.9.0             # via pytest

requirements/static/py3.5/zeromq-ubuntu-18.04.txt

@@ -55,7 +55,7 @@ msgpack-python==0.5.6
 msgpack==0.6.1
 ncclient==0.6.4           # via junos-eznc
 netaddr==0.7.19           # via junos-eznc
-paramiko==2.1.2
+paramiko==2.1.2 ; python_version < "3.7"
 pathlib2==2.3.3           # via pytest
 pbr==5.1.3                # via mock
 pluggy==0.9.0             # via pytest

requirements/static/py3.6/docs.txt

@@ -0,0 +1,30 @@
+#
+# This file is autogenerated by pip-compile
+# To update, run:
+#
+#    pip-compile -o requirements/static/py3.6/docs.txt -v requirements/static/docs.in
+#
+alabaster==0.7.12         # via sphinx
+babel==2.7.0              # via sphinx
+certifi==2019.3.9         # via requests
+chardet==3.0.4            # via requests
+docutils==0.14            # via sphinx
+idna==2.8                 # via requests
+imagesize==1.1.0          # via sphinx
+jinja2==2.10.1            # via sphinx
+markupsafe==1.1.1         # via jinja2
+packaging==19.0           # via sphinx
+pygments==2.4.2           # via sphinx
+pyparsing==2.4.0          # via packaging
+pytz==2019.1              # via babel
+requests==2.22.0          # via sphinx
+six==1.12.0               # via packaging
+snowballstemmer==1.2.1    # via sphinx
+sphinx==2.0.1
+sphinxcontrib-applehelp==1.0.1  # via sphinx
+sphinxcontrib-devhelp==1.0.1  # via sphinx
+sphinxcontrib-htmlhelp==1.0.2  # via sphinx
+sphinxcontrib-jsmath==1.0.1  # via sphinx
+sphinxcontrib-qthelp==1.0.2  # via sphinx
+sphinxcontrib-serializinghtml==1.1.3  # via sphinx
+urllib3==1.25.3           # via requests

requirements/static/py3.6/raet-amzn-2.txt

@@ -60,7 +60,7 @@ msgpack-python==0.5.6
 msgpack==0.6.1
 ncclient==0.6.4           # via junos-eznc
 netaddr==0.7.19           # via junos-eznc
-paramiko==2.1.2
+paramiko==2.1.2 ; python_version < "3.7"
 pbr==5.1.3                # via mock
 pluggy==0.9.0             # via pytest
 portend==2.4              # via cherrypy

requirements/static/py3.6/raet-centos-7.txt

@@ -60,7 +60,7 @@ msgpack-python==0.5.6
 msgpack==0.6.1
 ncclient==0.6.4           # via junos-eznc
 netaddr==0.7.19           # via junos-eznc
-paramiko==2.1.2
+paramiko==2.1.2 ; python_version < "3.7"
 pbr==5.1.3                # via mock
 pluggy==0.9.0             # via pytest
 portend==2.4              # via cherrypy

requirements/static/py3.6/raet-debian-8.txt

@@ -59,7 +59,7 @@ msgpack-python==0.5.6
 msgpack==0.6.1
 ncclient==0.6.4           # via junos-eznc
 netaddr==0.7.19           # via junos-eznc
-paramiko==2.1.2
+paramiko==2.1.2 ; python_version < "3.7"
 pbr==5.1.3                # via mock
 pluggy==0.9.0             # via pytest
 portend==2.4              # via cherrypy

requirements/static/py3.6/raet-debian-9.txt

@@ -59,7 +59,7 @@ msgpack-python==0.5.6
 msgpack==0.6.1
 ncclient==0.6.4           # via junos-eznc
 netaddr==0.7.19           # via junos-eznc
-paramiko==2.1.2
+paramiko==2.1.2 ; python_version < "3.7"
 pbr==5.1.3                # via mock
 pluggy==0.9.0             # via pytest
 portend==2.4              # via cherrypy

requirements/static/py3.6/raet-ubuntu-16.04.txt

@@ -59,7 +59,7 @@ msgpack-python==0.5.6
 msgpack==0.6.1
 ncclient==0.6.4           # via junos-eznc
 netaddr==0.7.19           # via junos-eznc
-paramiko==2.1.2
+paramiko==2.1.2 ; python_version < "3.7"
 pbr==5.1.3                # via mock
 pluggy==0.9.0             # via pytest
 portend==2.4              # via cherrypy

requirements/static/py3.6/raet-ubuntu-18.04.txt

@@ -59,7 +59,7 @@ msgpack-python==0.5.6
 msgpack==0.6.1
 ncclient==0.6.4           # via junos-eznc
 netaddr==0.7.19           # via junos-eznc
-paramiko==2.1.2
+paramiko==2.1.2 ; python_version < "3.7"
 pbr==5.1.3                # via mock
 pluggy==0.9.0             # via pytest
 portend==2.4              # via cherrypy

requirements/static/py3.6/zeromq-amzn-2.txt

@@ -56,7 +56,7 @@ msgpack-python==0.5.6
 msgpack==0.6.1
 ncclient==0.6.4           # via junos-eznc
 netaddr==0.7.19           # via junos-eznc
-paramiko==2.1.2
+paramiko==2.1.2 ; python_version < "3.7"
 pbr==5.1.3                # via mock
 pluggy==0.9.0             # via pytest
 portend==2.4              # via cherrypy

requirements/static/py3.6/zeromq-centos-7.txt

@@ -56,7 +56,7 @@ msgpack-python==0.5.6
 msgpack==0.6.1
 ncclient==0.6.4           # via junos-eznc
 netaddr==0.7.19           # via junos-eznc
-paramiko==2.1.2
+paramiko==2.1.2 ; python_version < "3.7"
 pbr==5.1.3                # via mock
 pluggy==0.9.0             # via pytest
 portend==2.4              # via cherrypy

requirements/static/py3.6/zeromq-debian-8.txt

@@ -55,7 +55,7 @@ msgpack-python==0.5.6
 msgpack==0.6.1
 ncclient==0.6.4           # via junos-eznc
 netaddr==0.7.19           # via junos-eznc
-paramiko==2.1.2
+paramiko==2.1.2 ; python_version < "3.7"
 pbr==5.1.3                # via mock
 pluggy==0.9.0             # via pytest
 portend==2.4              # via cherrypy

requirements/static/py3.6/zeromq-debian-9.txt

@@ -55,7 +55,7 @@ msgpack-python==0.5.6
 msgpack==0.6.1
 ncclient==0.6.4           # via junos-eznc
 netaddr==0.7.19           # via junos-eznc
-paramiko==2.1.2
+paramiko==2.1.2 ; python_version < "3.7"
 pbr==5.1.3                # via mock
 pluggy==0.9.0             # via pytest
 portend==2.4              # via cherrypy

requirements/static/py3.6/zeromq-ubuntu-16.04.txt

@@ -55,7 +55,7 @@ msgpack-python==0.5.6
 msgpack==0.6.1
 ncclient==0.6.4           # via junos-eznc
 netaddr==0.7.19           # via junos-eznc
-paramiko==2.1.2
+paramiko==2.1.2 ; python_version < "3.7"
 pbr==5.1.3                # via mock
 pluggy==0.9.0             # via pytest
 portend==2.4              # via cherrypy

requirements/static/py3.6/zeromq-ubuntu-18.04.txt

@@ -55,7 +55,7 @@ msgpack-python==0.5.6
 msgpack==0.6.1
 ncclient==0.6.4           # via junos-eznc
 netaddr==0.7.19           # via junos-eznc
-paramiko==2.1.2
+paramiko==2.1.2 ; python_version < "3.7"
 pbr==5.1.3                # via mock
 pluggy==0.9.0             # via pytest
 portend==2.4              # via cherrypy

requirements/static/py3.7/docs.txt

@@ -0,0 +1,30 @@
+#
+# This file is autogenerated by pip-compile
+# To update, run:
+#
+#    pip-compile -o requirements/static/py3.7/docs.txt -v requirements/static/docs.in
+#
+alabaster==0.7.12         # via sphinx
+babel==2.7.0              # via sphinx
+certifi==2019.3.9         # via requests
+chardet==3.0.4            # via requests
+docutils==0.14            # via sphinx
+idna==2.8                 # via requests
+imagesize==1.1.0          # via sphinx
+jinja2==2.10.1            # via sphinx
+markupsafe==1.1.1         # via jinja2
+packaging==19.0           # via sphinx
+pygments==2.4.2           # via sphinx
+pyparsing==2.4.0          # via packaging
+pytz==2019.1              # via babel
+requests==2.22.0          # via sphinx
+six==1.12.0               # via packaging
+snowballstemmer==1.2.1    # via sphinx
+sphinx==2.0.1
+sphinxcontrib-applehelp==1.0.1  # via sphinx
+sphinxcontrib-devhelp==1.0.1  # via sphinx
+sphinxcontrib-htmlhelp==1.0.2  # via sphinx
+sphinxcontrib-jsmath==1.0.1  # via sphinx
+sphinxcontrib-qthelp==1.0.2  # via sphinx
+sphinxcontrib-serializinghtml==1.1.3  # via sphinx
+urllib3==1.25.3           # via requests

requirements/static/py3.7/raet-amzn-2.txt

@@ -12,6 +12,7 @@ aws-xray-sdk==0.95        # via moto
 backports-abc==0.5        # via tornado
 backports.functools-lru-cache==1.5  # via cheroot
 backports.ssl-match-hostname==3.7.0.1  # via websocket-client
+bcrypt==3.1.6             # via paramiko
 boto3==1.9.132
 boto==2.49.0
 botocore==1.12.132        # via boto3, moto, s3transfer
@@ -60,7 +61,7 @@ msgpack-python==0.5.6
 msgpack==0.6.1
 ncclient==0.6.4           # via junos-eznc
 netaddr==0.7.19           # via junos-eznc
-paramiko==2.1.2
+paramiko==2.2.3 ; python_version >= "3.7"
 pbr==5.1.3                # via mock
 pluggy==0.9.0             # via pytest
 portend==2.4              # via cherrypy
@@ -72,6 +73,7 @@ pyasn1==0.4.5             # via paramiko, pyasn1-modules, rsa
 pycparser==2.19           # via cffi
 pycryptodome==3.8.1
 pyinotify==0.9.6
+pynacl==1.3.0             # via paramiko
 pyopenssl==19.0.0
 pyserial==3.4             # via junos-eznc
 pytest-cov==2.6.1
@@ -98,7 +100,7 @@ salttesting==2017.6.1
 scp==0.13.2               # via junos-eznc
 setproctitle==1.1.10
 singledispatch==3.4.0.3   # via tornado
-six==1.12.0               # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kazoo, kubernetes, mock, more-itertools, moto, ncclient, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, raet, responses, salttesting, singledispatch, tempora, websocket-client
+six==1.12.0               # via bcrypt, cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kazoo, kubernetes, mock, more-itertools, moto, ncclient, pynacl, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, raet, responses, salttesting, singledispatch, tempora, websocket-client
 smmap2==2.0.5             # via gitdb2
 strict-rfc3339==0.7
 tempora==1.14.1           # via portend

requirements/static/py3.7/raet-centos-7.txt

@@ -12,6 +12,7 @@ aws-xray-sdk==0.95        # via moto
 backports-abc==0.5        # via tornado
 backports.functools-lru-cache==1.5  # via cheroot
 backports.ssl-match-hostname==3.7.0.1  # via websocket-client
+bcrypt==3.1.6             # via paramiko
 boto3==1.9.132
 boto==2.49.0
 botocore==1.12.132        # via boto3, moto, s3transfer
@@ -60,7 +61,7 @@ msgpack-python==0.5.6
 msgpack==0.6.1
 ncclient==0.6.4           # via junos-eznc
 netaddr==0.7.19           # via junos-eznc
-paramiko==2.1.2
+paramiko==2.2.3 ; python_version >= "3.7"
 pbr==5.1.3                # via mock
 pluggy==0.9.0             # via pytest
 portend==2.4              # via cherrypy
@@ -72,6 +73,7 @@ pyasn1==0.4.5             # via paramiko, pyasn1-modules, rsa
 pycparser==2.19           # via cffi
 pycryptodome==3.8.1
 pyinotify==0.9.6
+pynacl==1.3.0             # via paramiko
 pyopenssl==19.0.0
 pyserial==3.4             # via junos-eznc
 pytest-cov==2.6.1
@@ -98,7 +100,7 @@ salttesting==2017.6.1
 scp==0.13.2               # via junos-eznc
 setproctitle==1.1.10
 singledispatch==3.4.0.3   # via tornado
-six==1.12.0               # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kazoo, kubernetes, mock, more-itertools, moto, ncclient, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, raet, responses, salttesting, singledispatch, tempora, websocket-client
+six==1.12.0               # via bcrypt, cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kazoo, kubernetes, mock, more-itertools, moto, ncclient, pynacl, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, raet, responses, salttesting, singledispatch, tempora, websocket-client
 smmap2==2.0.5             # via gitdb2
 strict-rfc3339==0.7
 tempora==1.14.1           # via portend

requirements/static/py3.7/raet-debian-8.txt

@@ -12,6 +12,7 @@ aws-xray-sdk==0.95        # via moto
 backports-abc==0.5        # via tornado
 backports.functools-lru-cache==1.5  # via cheroot
 backports.ssl-match-hostname==3.7.0.1  # via websocket-client
+bcrypt==3.1.6             # via paramiko
 boto3==1.9.132
 boto==2.49.0
 botocore==1.12.132        # via boto3, moto, s3transfer
@@ -59,7 +60,7 @@ msgpack-python==0.5.6
 msgpack==0.6.1
 ncclient==0.6.4           # via junos-eznc
 netaddr==0.7.19           # via junos-eznc
-paramiko==2.1.2
+paramiko==2.2.3 ; python_version >= "3.7"
 pbr==5.1.3                # via mock
 pluggy==0.9.0             # via pytest
 portend==2.4              # via cherrypy
@@ -71,6 +72,7 @@ pyasn1==0.4.5             # via paramiko, pyasn1-modules, rsa
 pycparser==2.19           # via cffi
 pycryptodome==3.8.1
 pyinotify==0.9.6
+pynacl==1.3.0             # via paramiko
 pyopenssl==19.0.0
 pyserial==3.4             # via junos-eznc
 pytest-cov==2.6.1
@@ -97,7 +99,7 @@ salttesting==2017.6.1
 scp==0.13.2               # via junos-eznc
 setproctitle==1.1.10
 singledispatch==3.4.0.3   # via tornado
-six==1.12.0               # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kubernetes, mock, more-itertools, moto, ncclient, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, raet, responses, salttesting, singledispatch, tempora, websocket-client
+six==1.12.0               # via bcrypt, cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kubernetes, mock, more-itertools, moto, ncclient, pynacl, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, raet, responses, salttesting, singledispatch, tempora, websocket-client
 smmap2==2.0.5             # via gitdb2
 strict-rfc3339==0.7
 tempora==1.14.1           # via portend

requirements/static/py3.7/raet-debian-9.txt

@@ -12,6 +12,7 @@ aws-xray-sdk==0.95        # via moto
 backports-abc==0.5        # via tornado
 backports.functools-lru-cache==1.5  # via cheroot
 backports.ssl-match-hostname==3.7.0.1  # via websocket-client
+bcrypt==3.1.6             # via paramiko
 boto3==1.9.132
 boto==2.49.0
 botocore==1.12.132        # via boto3, moto, s3transfer
@@ -59,7 +60,7 @@ msgpack-python==0.5.6
 msgpack==0.6.1
 ncclient==0.6.4           # via junos-eznc
 netaddr==0.7.19           # via junos-eznc
-paramiko==2.1.2
+paramiko==2.2.3 ; python_version >= "3.7"
 pbr==5.1.3                # via mock
 pluggy==0.9.0             # via pytest
 portend==2.4              # via cherrypy
@@ -71,6 +72,7 @@ pyasn1==0.4.5             # via paramiko, pyasn1-modules, rsa
 pycparser==2.19           # via cffi
 pycryptodome==3.8.1
 pyinotify==0.9.6
+pynacl==1.3.0             # via paramiko
 pyopenssl==19.0.0
 pyserial==3.4             # via junos-eznc
 pytest-cov==2.6.1
@@ -97,7 +99,7 @@ salttesting==2017.6.1
 scp==0.13.2               # via junos-eznc
 setproctitle==1.1.10
 singledispatch==3.4.0.3   # via tornado
-six==1.12.0               # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kubernetes, mock, more-itertools, moto, ncclient, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, raet, responses, salttesting, singledispatch, tempora, websocket-client
+six==1.12.0               # via bcrypt, cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kubernetes, mock, more-itertools, moto, ncclient, pynacl, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, raet, responses, salttesting, singledispatch, tempora, websocket-client
 smmap2==2.0.5             # via gitdb2
 strict-rfc3339==0.7
 tempora==1.14.1           # via portend

requirements/static/py3.7/raet-ubuntu-16.04.txt

@@ -12,6 +12,7 @@ aws-xray-sdk==0.95        # via moto
 backports-abc==0.5        # via tornado
 backports.functools-lru-cache==1.5  # via cheroot
 backports.ssl-match-hostname==3.7.0.1  # via websocket-client
+bcrypt==3.1.6             # via paramiko
 boto3==1.9.132
 boto==2.49.0
 botocore==1.12.132        # via boto3, moto, s3transfer
@@ -59,7 +60,7 @@ msgpack-python==0.5.6
 msgpack==0.6.1
 ncclient==0.6.4           # via junos-eznc
 netaddr==0.7.19           # via junos-eznc
-paramiko==2.1.2
+paramiko==2.2.3 ; python_version >= "3.7"
 pbr==5.1.3                # via mock
 pluggy==0.9.0             # via pytest
 portend==2.4              # via cherrypy
@@ -71,6 +72,7 @@ pyasn1==0.4.5             # via paramiko, pyasn1-modules, rsa
 pycparser==2.19           # via cffi
 pycryptodome==3.8.1
 pyinotify==0.9.6
+pynacl==1.3.0             # via paramiko
 pyopenssl==19.0.0
 pyserial==3.4             # via junos-eznc
 pytest-cov==2.6.1
@@ -97,7 +99,7 @@ salttesting==2017.6.1
 scp==0.13.2               # via junos-eznc
 setproctitle==1.1.10
 singledispatch==3.4.0.3   # via tornado
-six==1.12.0               # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kubernetes, mock, more-itertools, moto, ncclient, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, raet, responses, salttesting, singledispatch, tempora, websocket-client
+six==1.12.0               # via bcrypt, cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kubernetes, mock, more-itertools, moto, ncclient, pynacl, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, raet, responses, salttesting, singledispatch, tempora, websocket-client
 smmap2==2.0.5             # via gitdb2
 strict-rfc3339==0.7
 tempora==1.14.1           # via portend

requirements/static/py3.7/raet-ubuntu-18.04.txt

@@ -12,6 +12,7 @@ aws-xray-sdk==0.95        # via moto
 backports-abc==0.5        # via tornado
 backports.functools-lru-cache==1.5  # via cheroot
 backports.ssl-match-hostname==3.7.0.1  # via websocket-client
+bcrypt==3.1.6             # via paramiko
 boto3==1.9.132
 boto==2.49.0
 botocore==1.12.132        # via boto3, moto, s3transfer
@@ -59,7 +60,7 @@ msgpack-python==0.5.6
 msgpack==0.6.1
 ncclient==0.6.4           # via junos-eznc
 netaddr==0.7.19           # via junos-eznc
-paramiko==2.1.2
+paramiko==2.2.3 ; python_version >= "3.7"
 pbr==5.1.3                # via mock
 pluggy==0.9.0             # via pytest
 portend==2.4              # via cherrypy
@@ -71,6 +72,7 @@ pyasn1==0.4.5             # via paramiko, pyasn1-modules, rsa
 pycparser==2.19           # via cffi
 pycryptodome==3.8.1
 pyinotify==0.9.6
+pynacl==1.3.0             # via paramiko
 pyopenssl==19.0.0
 pyserial==3.4             # via junos-eznc
 pytest-cov==2.6.1
@@ -97,7 +99,7 @@ salttesting==2017.6.1
 scp==0.13.2               # via junos-eznc
 setproctitle==1.1.10
 singledispatch==3.4.0.3   # via tornado
-six==1.12.0               # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kubernetes, mock, more-itertools, moto, ncclient, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, raet, responses, salttesting, singledispatch, tempora, websocket-client
+six==1.12.0               # via bcrypt, cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kubernetes, mock, more-itertools, moto, ncclient, pynacl, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, raet, responses, salttesting, singledispatch, tempora, websocket-client
 smmap2==2.0.5             # via gitdb2
 strict-rfc3339==0.7
 tempora==1.14.1           # via portend

requirements/static/py3.7/zeromq-amzn-2.txt

@@ -12,6 +12,7 @@ aws-xray-sdk==0.95        # via moto
 backports-abc==0.5        # via tornado
 backports.functools-lru-cache==1.5  # via cheroot
 backports.ssl-match-hostname==3.7.0.1  # via websocket-client
+bcrypt==3.1.6             # via paramiko
 boto3==1.9.132
 boto==2.49.0
 botocore==1.12.132        # via boto3, moto, s3transfer
@@ -56,7 +57,7 @@ msgpack-python==0.5.6
 msgpack==0.6.1
 ncclient==0.6.4           # via junos-eznc
 netaddr==0.7.19           # via junos-eznc
-paramiko==2.1.2
+paramiko==2.2.3 ; python_version >= "3.7"
 pbr==5.1.3                # via mock
 pluggy==0.9.0             # via pytest
 portend==2.4              # via cherrypy
@@ -70,6 +71,7 @@ pycparser==2.19           # via cffi
 # pycrypto==2.6.1 ; sys_platform != "win32"
 pycryptodome==3.8.1
 pyinotify==0.9.6
+pynacl==1.3.0             # via paramiko
 pyopenssl==19.0.0
 pyserial==3.4             # via junos-eznc
 pytest-cov==2.6.1
@@ -96,7 +98,7 @@ salttesting==2017.6.1
 scp==0.13.2               # via junos-eznc
 setproctitle==1.1.10
 singledispatch==3.4.0.3   # via tornado
-six==1.12.0               # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kazoo, kubernetes, mock, more-itertools, moto, ncclient, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, responses, salttesting, singledispatch, tempora, websocket-client
+six==1.12.0               # via bcrypt, cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kazoo, kubernetes, mock, more-itertools, moto, ncclient, pynacl, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, responses, salttesting, singledispatch, tempora, websocket-client
 smmap2==2.0.5             # via gitdb2
 strict-rfc3339==0.7
 tempora==1.14.1           # via portend

requirements/static/py3.7/zeromq-centos-7.txt

@@ -12,6 +12,7 @@ aws-xray-sdk==0.95        # via moto
 backports-abc==0.5        # via tornado
 backports.functools-lru-cache==1.5  # via cheroot
 backports.ssl-match-hostname==3.7.0.1  # via websocket-client
+bcrypt==3.1.6             # via paramiko
 boto3==1.9.132
 boto==2.49.0
 botocore==1.12.132        # via boto3, moto, s3transfer
@@ -56,7 +57,7 @@ msgpack-python==0.5.6
 msgpack==0.6.1
 ncclient==0.6.4           # via junos-eznc
 netaddr==0.7.19           # via junos-eznc
-paramiko==2.1.2
+paramiko==2.2.3 ; python_version >= "3.7"
 pbr==5.1.3                # via mock
 pluggy==0.9.0             # via pytest
 portend==2.4              # via cherrypy
@@ -70,6 +71,7 @@ pycparser==2.19           # via cffi
 # pycrypto==2.6.1 ; sys_platform != "win32"
 pycryptodome==3.8.1
 pyinotify==0.9.6
+pynacl==1.3.0             # via paramiko
 pyopenssl==19.0.0
 pyserial==3.4             # via junos-eznc
 pytest-cov==2.6.1
@@ -96,7 +98,7 @@ salttesting==2017.6.1
 scp==0.13.2               # via junos-eznc
 setproctitle==1.1.10
 singledispatch==3.4.0.3   # via tornado
-six==1.12.0               # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kazoo, kubernetes, mock, more-itertools, moto, ncclient, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, responses, salttesting, singledispatch, tempora, websocket-client
+six==1.12.0               # via bcrypt, cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kazoo, kubernetes, mock, more-itertools, moto, ncclient, pynacl, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, responses, salttesting, singledispatch, tempora, websocket-client
 smmap2==2.0.5             # via gitdb2
 strict-rfc3339==0.7
 tempora==1.14.1           # via portend

requirements/static/py3.7/zeromq-debian-8.txt

@@ -12,6 +12,7 @@ aws-xray-sdk==0.95        # via moto
 backports-abc==0.5        # via tornado
 backports.functools-lru-cache==1.5  # via cheroot
 backports.ssl-match-hostname==3.7.0.1  # via websocket-client
+bcrypt==3.1.6             # via paramiko
 boto3==1.9.132
 boto==2.49.0
 botocore==1.12.132        # via boto3, moto, s3transfer
@@ -55,7 +56,7 @@ msgpack-python==0.5.6
 msgpack==0.6.1
 ncclient==0.6.4           # via junos-eznc
 netaddr==0.7.19           # via junos-eznc
-paramiko==2.1.2
+paramiko==2.2.3 ; python_version >= "3.7"
 pbr==5.1.3                # via mock
 pluggy==0.9.0             # via pytest
 portend==2.4              # via cherrypy
@@ -69,6 +70,7 @@ pycparser==2.19           # via cffi
 # pycrypto==2.6.1 ; sys_platform != "win32"
 pycryptodome==3.8.1
 pyinotify==0.9.6
+pynacl==1.3.0             # via paramiko
 pyopenssl==19.0.0
 pyserial==3.4             # via junos-eznc
 pytest-cov==2.6.1
@@ -95,7 +97,7 @@ salttesting==2017.6.1
 scp==0.13.2               # via junos-eznc
 setproctitle==1.1.10
 singledispatch==3.4.0.3   # via tornado
-six==1.12.0               # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kubernetes, mock, more-itertools, moto, ncclient, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, responses, salttesting, singledispatch, tempora, websocket-client
+six==1.12.0               # via bcrypt, cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kubernetes, mock, more-itertools, moto, ncclient, pynacl, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, responses, salttesting, singledispatch, tempora, websocket-client
 smmap2==2.0.5             # via gitdb2
 strict-rfc3339==0.7
 tempora==1.14.1           # via portend

requirements/static/py3.7/zeromq-debian-9.txt

@@ -12,6 +12,7 @@ aws-xray-sdk==0.95        # via moto
 backports-abc==0.5        # via tornado
 backports.functools-lru-cache==1.5  # via cheroot
 backports.ssl-match-hostname==3.7.0.1  # via websocket-client
+bcrypt==3.1.6             # via paramiko
 boto3==1.9.132
 boto==2.49.0
 botocore==1.12.132        # via boto3, moto, s3transfer
@@ -55,7 +56,7 @@ msgpack-python==0.5.6
 msgpack==0.6.1
 ncclient==0.6.4           # via junos-eznc
 netaddr==0.7.19           # via junos-eznc
-paramiko==2.1.2
+paramiko==2.2.3 ; python_version >= "3.7"
 pbr==5.1.3                # via mock
 pluggy==0.9.0             # via pytest
 portend==2.4              # via cherrypy
@@ -69,6 +70,7 @@ pycparser==2.19           # via cffi
 # pycrypto==2.6.1 ; sys_platform != "win32"
 pycryptodome==3.8.1
 pyinotify==0.9.6
+pynacl==1.3.0             # via paramiko
 pyopenssl==19.0.0
 pyserial==3.4             # via junos-eznc
 pytest-cov==2.6.1
@@ -95,7 +97,7 @@ salttesting==2017.6.1
 scp==0.13.2               # via junos-eznc
 setproctitle==1.1.10
 singledispatch==3.4.0.3   # via tornado
-six==1.12.0               # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kubernetes, mock, more-itertools, moto, ncclient, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, responses, salttesting, singledispatch, tempora, websocket-client
+six==1.12.0               # via bcrypt, cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kubernetes, mock, more-itertools, moto, ncclient, pynacl, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, responses, salttesting, singledispatch, tempora, websocket-client
 smmap2==2.0.5             # via gitdb2
 strict-rfc3339==0.7
 tempora==1.14.1           # via portend

requirements/static/py3.7/zeromq-ubuntu-16.04.txt

@@ -12,6 +12,7 @@ aws-xray-sdk==0.95        # via moto
 backports-abc==0.5        # via tornado
 backports.functools-lru-cache==1.5  # via cheroot
 backports.ssl-match-hostname==3.7.0.1  # via websocket-client
+bcrypt==3.1.6             # via paramiko
 boto3==1.9.132
 boto==2.49.0
 botocore==1.12.132        # via boto3, moto, s3transfer
@@ -55,7 +56,7 @@ msgpack-python==0.5.6
 msgpack==0.6.1
 ncclient==0.6.4           # via junos-eznc
 netaddr==0.7.19           # via junos-eznc
-paramiko==2.1.2
+paramiko==2.2.3 ; python_version >= "3.7"
 pbr==5.1.3                # via mock
 pluggy==0.9.0             # via pytest
 portend==2.4              # via cherrypy
@@ -69,6 +70,7 @@ pycparser==2.19           # via cffi
 # pycrypto==2.6.1 ; sys_platform != "win32"
 pycryptodome==3.8.1
 pyinotify==0.9.6
+pynacl==1.3.0             # via paramiko
 pyopenssl==19.0.0
 pyserial==3.4             # via junos-eznc
 pytest-cov==2.6.1
@@ -95,7 +97,7 @@ salttesting==2017.6.1
 scp==0.13.2               # via junos-eznc
 setproctitle==1.1.10
 singledispatch==3.4.0.3   # via tornado
-six==1.12.0               # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kubernetes, mock, more-itertools, moto, ncclient, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, responses, salttesting, singledispatch, tempora, websocket-client
+six==1.12.0               # via bcrypt, cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kubernetes, mock, more-itertools, moto, ncclient, pynacl, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, responses, salttesting, singledispatch, tempora, websocket-client
 smmap2==2.0.5             # via gitdb2
 strict-rfc3339==0.7
 tempora==1.14.1           # via portend

requirements/static/py3.7/zeromq-ubuntu-18.04.txt

@@ -12,6 +12,7 @@ aws-xray-sdk==0.95        # via moto
 backports-abc==0.5        # via tornado
 backports.functools-lru-cache==1.5  # via cheroot
 backports.ssl-match-hostname==3.7.0.1  # via websocket-client
+bcrypt==3.1.6             # via paramiko
 boto3==1.9.132
 boto==2.49.0
 botocore==1.12.132        # via boto3, moto, s3transfer
@@ -55,7 +56,7 @@ msgpack-python==0.5.6
 msgpack==0.6.1
 ncclient==0.6.4           # via junos-eznc
 netaddr==0.7.19           # via junos-eznc
-paramiko==2.1.2
+paramiko==2.2.3 ; python_version >= "3.7"
 pbr==5.1.3                # via mock
 pluggy==0.9.0             # via pytest
 portend==2.4              # via cherrypy
@@ -69,6 +70,7 @@ pycparser==2.19           # via cffi
 # pycrypto==2.6.1 ; sys_platform != "win32"
 pycryptodome==3.8.1
 pyinotify==0.9.6
+pynacl==1.3.0             # via paramiko
 pyopenssl==19.0.0
 pyserial==3.4             # via junos-eznc
 pytest-cov==2.6.1
@@ -95,7 +97,7 @@ salttesting==2017.6.1
 scp==0.13.2               # via junos-eznc
 setproctitle==1.1.10
 singledispatch==3.4.0.3   # via tornado
-six==1.12.0               # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kubernetes, mock, more-itertools, moto, ncclient, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, responses, salttesting, singledispatch, tempora, websocket-client
+six==1.12.0               # via bcrypt, cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kubernetes, mock, more-itertools, moto, ncclient, pynacl, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, responses, salttesting, singledispatch, tempora, websocket-client
 smmap2==2.0.5             # via gitdb2
 strict-rfc3339==0.7
 tempora==1.14.1           # via portend

requirements/static/ubuntu-16.04.in

@@ -18,7 +18,8 @@ mock>=2.0.0; python_version < '3.6'
 more-itertools==5.0.0
 moto
 msgpack-python >= 0.4.2, != 0.5.5
-paramiko==2.1.2
+paramiko==2.1.2; python_version < '3.7'
+paramiko>=2.2.3; python_version >= '3.7'
 psutil
 # Let's install cryptodome instead of pycrypto because of pycrypto's outstanding security issues
 # PyCrypto, if pulled, will be removed from the generated static requirements

requirements/static/ubuntu-18.04.in

@@ -18,7 +18,8 @@ mock>=2.0.0; python_version < '3.6'
 more-itertools==5.0.0
 moto
 msgpack-python >= 0.4.2, != 0.5.5
-paramiko==2.1.2
+paramiko==2.1.2; python_version < '3.7'
+paramiko>=2.2.3; python_version >= '3.7'
 psutil
 # Let's install cryptodome instead of pycrypto because of pycrypto's outstanding security issues
 # PyCrypto, if pulled, will be removed from the generated static requirements

salt/log/setup.py

@@ -1118,13 +1118,12 @@ def __process_multiprocessing_logging_queue(opts, queue):
         setup_extended_logging(opts)
     while True:
         try:
-            record_dict = queue.get()
-            if record_dict is None:
+            record = queue.get()
+            if record is None:
                 # A sentinel to stop processing the queue
                 break
             # Just log everything, filtering will happen on the main process
             # logging handlers
-            record = logging.makeLogRecord(record_dict)
             logger = logging.getLogger(record.name)
             logger.handle(record)
         except (EOFError, KeyboardInterrupt, SystemExit):