From 1c3667a3acdcf51e2646f90880cc05e9b3b62368 Mon Sep 17 00:00:00 2001 From: Akmod Date: Wed, 5 Jun 2019 12:07:28 -0600 Subject: [PATCH] Updated paramiko to version 2.2.3 for python3.7 support (#53356) * Updated paramiko to version 2.2.3 for python3.7 support * Handle nox running under Py2 and Py3 * Stop compiling static TCP requirements. * Fix Amazon 2018.03 in excludes * Compile requirements files --- .pre-commit-config.yaml | 96 ++----------------- noxfile.py | 8 +- requirements/static/amzn-2.in | 3 +- requirements/static/centos-7.in | 3 +- requirements/static/debian-8.in | 3 +- requirements/static/debian-9.in | 4 +- requirements/static/py2.7/raet-amzn-2.txt | 2 +- requirements/static/py2.7/raet-centos-7.txt | 2 +- requirements/static/py2.7/raet-debian-8.txt | 2 +- requirements/static/py2.7/raet-debian-9.txt | 2 +- .../static/py2.7/raet-ubuntu-16.04.txt | 2 +- .../static/py2.7/raet-ubuntu-18.04.txt | 2 +- requirements/static/py2.7/zeromq-amzn-2.txt | 2 +- requirements/static/py2.7/zeromq-centos-7.txt | 2 +- requirements/static/py2.7/zeromq-debian-8.txt | 2 +- requirements/static/py2.7/zeromq-debian-9.txt | 2 +- .../static/py2.7/zeromq-ubuntu-16.04.txt | 2 +- .../static/py2.7/zeromq-ubuntu-18.04.txt | 2 +- requirements/static/py3.4/raet-amzn-2.txt | 2 +- requirements/static/py3.4/raet-centos-7.txt | 2 +- requirements/static/py3.4/raet-debian-8.txt | 2 +- requirements/static/py3.4/raet-debian-9.txt | 2 +- .../static/py3.4/raet-ubuntu-16.04.txt | 2 +- .../static/py3.4/raet-ubuntu-18.04.txt | 2 +- requirements/static/py3.4/zeromq-amzn-2.txt | 2 +- requirements/static/py3.4/zeromq-centos-7.txt | 2 +- requirements/static/py3.4/zeromq-debian-8.txt | 2 +- requirements/static/py3.4/zeromq-debian-9.txt | 2 +- .../static/py3.4/zeromq-ubuntu-16.04.txt | 2 +- .../static/py3.4/zeromq-ubuntu-18.04.txt | 2 +- requirements/static/py3.5/raet-amzn-2.txt | 2 +- requirements/static/py3.5/raet-centos-7.txt | 2 +- requirements/static/py3.5/raet-debian-8.txt | 2 +- requirements/static/py3.5/raet-debian-9.txt | 2 +- .../static/py3.5/raet-ubuntu-16.04.txt | 2 +- .../static/py3.5/raet-ubuntu-18.04.txt | 2 +- requirements/static/py3.5/zeromq-amzn-2.txt | 2 +- requirements/static/py3.5/zeromq-centos-7.txt | 2 +- requirements/static/py3.5/zeromq-debian-8.txt | 2 +- requirements/static/py3.5/zeromq-debian-9.txt | 2 +- .../static/py3.5/zeromq-ubuntu-16.04.txt | 2 +- .../static/py3.5/zeromq-ubuntu-18.04.txt | 2 +- requirements/static/py3.6/raet-amzn-2.txt | 2 +- requirements/static/py3.6/raet-centos-7.txt | 2 +- requirements/static/py3.6/raet-debian-8.txt | 2 +- requirements/static/py3.6/raet-debian-9.txt | 2 +- .../static/py3.6/raet-ubuntu-16.04.txt | 2 +- .../static/py3.6/raet-ubuntu-18.04.txt | 2 +- requirements/static/py3.6/zeromq-amzn-2.txt | 2 +- requirements/static/py3.6/zeromq-centos-7.txt | 2 +- requirements/static/py3.6/zeromq-debian-8.txt | 2 +- requirements/static/py3.6/zeromq-debian-9.txt | 2 +- .../static/py3.6/zeromq-ubuntu-16.04.txt | 2 +- .../static/py3.6/zeromq-ubuntu-18.04.txt | 2 +- requirements/static/py3.7/raet-amzn-2.txt | 6 +- requirements/static/py3.7/raet-centos-7.txt | 6 +- requirements/static/py3.7/raet-debian-8.txt | 6 +- requirements/static/py3.7/raet-debian-9.txt | 6 +- .../static/py3.7/raet-ubuntu-16.04.txt | 6 +- .../static/py3.7/raet-ubuntu-18.04.txt | 6 +- requirements/static/py3.7/zeromq-amzn-2.txt | 6 +- requirements/static/py3.7/zeromq-centos-7.txt | 6 +- requirements/static/py3.7/zeromq-debian-8.txt | 6 +- requirements/static/py3.7/zeromq-debian-9.txt | 6 +- .../static/py3.7/zeromq-ubuntu-16.04.txt | 6 +- .../static/py3.7/zeromq-ubuntu-18.04.txt | 6 +- requirements/static/ubuntu-16.04.in | 3 +- requirements/static/ubuntu-18.04.in | 3 +- 68 files changed, 123 insertions(+), 168 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 831b090620..b760636773 100644 --- a/.pre-commit-config.yaml +++ b/.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 @@ -136,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 @@ -166,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 @@ -186,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 @@ -264,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 @@ -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 @@ -472,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 @@ -512,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 diff --git a/noxfile.py b/noxfile.py index 0f446704ad..f4d954b8cc 100644 --- a/noxfile.py +++ b/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: diff --git a/requirements/static/amzn-2.in b/requirements/static/amzn-2.in index c0e7f1adff..85cd18eaa8 100644 --- a/requirements/static/amzn-2.in +++ b/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 diff --git a/requirements/static/centos-7.in b/requirements/static/centos-7.in index c0e7f1adff..85cd18eaa8 100644 --- a/requirements/static/centos-7.in +++ b/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 diff --git a/requirements/static/debian-8.in b/requirements/static/debian-8.in index 5409d83270..847206c896 100644 --- a/requirements/static/debian-8.in +++ b/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 diff --git a/requirements/static/debian-9.in b/requirements/static/debian-9.in index 743b68399e..690558f83b 100644 --- a/requirements/static/debian-9.in +++ b/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 diff --git a/requirements/static/py2.7/raet-amzn-2.txt b/requirements/static/py2.7/raet-amzn-2.txt index 133bc0c574..276b9d4b1d 100644 --- a/requirements/static/py2.7/raet-amzn-2.txt +++ b/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 diff --git a/requirements/static/py2.7/raet-centos-7.txt b/requirements/static/py2.7/raet-centos-7.txt index d59c70a620..d24d366392 100644 --- a/requirements/static/py2.7/raet-centos-7.txt +++ b/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 diff --git a/requirements/static/py2.7/raet-debian-8.txt b/requirements/static/py2.7/raet-debian-8.txt index 354a721145..e5089e1370 100644 --- a/requirements/static/py2.7/raet-debian-8.txt +++ b/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 diff --git a/requirements/static/py2.7/raet-debian-9.txt b/requirements/static/py2.7/raet-debian-9.txt index a3a47ce31b..e645a2ca84 100644 --- a/requirements/static/py2.7/raet-debian-9.txt +++ b/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 diff --git a/requirements/static/py2.7/raet-ubuntu-16.04.txt b/requirements/static/py2.7/raet-ubuntu-16.04.txt index 594f559248..f37f199e84 100644 --- a/requirements/static/py2.7/raet-ubuntu-16.04.txt +++ b/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 diff --git a/requirements/static/py2.7/raet-ubuntu-18.04.txt b/requirements/static/py2.7/raet-ubuntu-18.04.txt index ea15ba89d3..c0c9d2ede2 100644 --- a/requirements/static/py2.7/raet-ubuntu-18.04.txt +++ b/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 diff --git a/requirements/static/py2.7/zeromq-amzn-2.txt b/requirements/static/py2.7/zeromq-amzn-2.txt index 70fe98624e..73ad2539de 100644 --- a/requirements/static/py2.7/zeromq-amzn-2.txt +++ b/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 diff --git a/requirements/static/py2.7/zeromq-centos-7.txt b/requirements/static/py2.7/zeromq-centos-7.txt index 12fd89a778..fe2a298459 100644 --- a/requirements/static/py2.7/zeromq-centos-7.txt +++ b/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 diff --git a/requirements/static/py2.7/zeromq-debian-8.txt b/requirements/static/py2.7/zeromq-debian-8.txt index ee236852d8..51564ed7e2 100644 --- a/requirements/static/py2.7/zeromq-debian-8.txt +++ b/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 diff --git a/requirements/static/py2.7/zeromq-debian-9.txt b/requirements/static/py2.7/zeromq-debian-9.txt index 518f2bc961..814dd02cae 100644 --- a/requirements/static/py2.7/zeromq-debian-9.txt +++ b/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 diff --git a/requirements/static/py2.7/zeromq-ubuntu-16.04.txt b/requirements/static/py2.7/zeromq-ubuntu-16.04.txt index b662c1ce29..788e4e8a5a 100644 --- a/requirements/static/py2.7/zeromq-ubuntu-16.04.txt +++ b/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 diff --git a/requirements/static/py2.7/zeromq-ubuntu-18.04.txt b/requirements/static/py2.7/zeromq-ubuntu-18.04.txt index 344d9a4466..bcffe0436a 100644 --- a/requirements/static/py2.7/zeromq-ubuntu-18.04.txt +++ b/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 diff --git a/requirements/static/py3.4/raet-amzn-2.txt b/requirements/static/py3.4/raet-amzn-2.txt index 934f8f6e19..ff82ac8f92 100644 --- a/requirements/static/py3.4/raet-amzn-2.txt +++ b/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 diff --git a/requirements/static/py3.4/raet-centos-7.txt b/requirements/static/py3.4/raet-centos-7.txt index 2558185135..192b317183 100644 --- a/requirements/static/py3.4/raet-centos-7.txt +++ b/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 diff --git a/requirements/static/py3.4/raet-debian-8.txt b/requirements/static/py3.4/raet-debian-8.txt index 1c96a63164..e314980c88 100644 --- a/requirements/static/py3.4/raet-debian-8.txt +++ b/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 diff --git a/requirements/static/py3.4/raet-debian-9.txt b/requirements/static/py3.4/raet-debian-9.txt index 60da6a4f29..b68906ce48 100644 --- a/requirements/static/py3.4/raet-debian-9.txt +++ b/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 diff --git a/requirements/static/py3.4/raet-ubuntu-16.04.txt b/requirements/static/py3.4/raet-ubuntu-16.04.txt index 9f9c46f32f..4a2e7120cf 100644 --- a/requirements/static/py3.4/raet-ubuntu-16.04.txt +++ b/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 diff --git a/requirements/static/py3.4/raet-ubuntu-18.04.txt b/requirements/static/py3.4/raet-ubuntu-18.04.txt index 0f8c58b477..f46a97084f 100644 --- a/requirements/static/py3.4/raet-ubuntu-18.04.txt +++ b/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 diff --git a/requirements/static/py3.4/zeromq-amzn-2.txt b/requirements/static/py3.4/zeromq-amzn-2.txt index 76417e8c22..719c20357b 100644 --- a/requirements/static/py3.4/zeromq-amzn-2.txt +++ b/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 diff --git a/requirements/static/py3.4/zeromq-centos-7.txt b/requirements/static/py3.4/zeromq-centos-7.txt index 9d99785fb9..9763d89b1a 100644 --- a/requirements/static/py3.4/zeromq-centos-7.txt +++ b/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 diff --git a/requirements/static/py3.4/zeromq-debian-8.txt b/requirements/static/py3.4/zeromq-debian-8.txt index ff61c003dd..c06723758f 100644 --- a/requirements/static/py3.4/zeromq-debian-8.txt +++ b/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 diff --git a/requirements/static/py3.4/zeromq-debian-9.txt b/requirements/static/py3.4/zeromq-debian-9.txt index 7e52e5388f..00eeba21e0 100644 --- a/requirements/static/py3.4/zeromq-debian-9.txt +++ b/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 diff --git a/requirements/static/py3.4/zeromq-ubuntu-16.04.txt b/requirements/static/py3.4/zeromq-ubuntu-16.04.txt index d6a55221b9..52059c6041 100644 --- a/requirements/static/py3.4/zeromq-ubuntu-16.04.txt +++ b/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 diff --git a/requirements/static/py3.4/zeromq-ubuntu-18.04.txt b/requirements/static/py3.4/zeromq-ubuntu-18.04.txt index e4854cbb09..18b35e1ea1 100644 --- a/requirements/static/py3.4/zeromq-ubuntu-18.04.txt +++ b/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 diff --git a/requirements/static/py3.5/raet-amzn-2.txt b/requirements/static/py3.5/raet-amzn-2.txt index e81c53cd39..91cdfcdbfe 100644 --- a/requirements/static/py3.5/raet-amzn-2.txt +++ b/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 diff --git a/requirements/static/py3.5/raet-centos-7.txt b/requirements/static/py3.5/raet-centos-7.txt index 0898547e37..8e7cff80c1 100644 --- a/requirements/static/py3.5/raet-centos-7.txt +++ b/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 diff --git a/requirements/static/py3.5/raet-debian-8.txt b/requirements/static/py3.5/raet-debian-8.txt index 1f3b8bf357..670d2b87cc 100644 --- a/requirements/static/py3.5/raet-debian-8.txt +++ b/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 diff --git a/requirements/static/py3.5/raet-debian-9.txt b/requirements/static/py3.5/raet-debian-9.txt index 668202fae1..1cb6fb9feb 100644 --- a/requirements/static/py3.5/raet-debian-9.txt +++ b/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 diff --git a/requirements/static/py3.5/raet-ubuntu-16.04.txt b/requirements/static/py3.5/raet-ubuntu-16.04.txt index c6187c6eed..f739ec24f9 100644 --- a/requirements/static/py3.5/raet-ubuntu-16.04.txt +++ b/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 diff --git a/requirements/static/py3.5/raet-ubuntu-18.04.txt b/requirements/static/py3.5/raet-ubuntu-18.04.txt index 0aa0e9a126..68c0e9ebf1 100644 --- a/requirements/static/py3.5/raet-ubuntu-18.04.txt +++ b/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 diff --git a/requirements/static/py3.5/zeromq-amzn-2.txt b/requirements/static/py3.5/zeromq-amzn-2.txt index 6dd4b3eaff..332dd3ad72 100644 --- a/requirements/static/py3.5/zeromq-amzn-2.txt +++ b/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 diff --git a/requirements/static/py3.5/zeromq-centos-7.txt b/requirements/static/py3.5/zeromq-centos-7.txt index 3d4880d98c..bcdc1be1d3 100644 --- a/requirements/static/py3.5/zeromq-centos-7.txt +++ b/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 diff --git a/requirements/static/py3.5/zeromq-debian-8.txt b/requirements/static/py3.5/zeromq-debian-8.txt index d94d24f5e0..868cb16163 100644 --- a/requirements/static/py3.5/zeromq-debian-8.txt +++ b/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 diff --git a/requirements/static/py3.5/zeromq-debian-9.txt b/requirements/static/py3.5/zeromq-debian-9.txt index 73a879a4ae..fdd13a35e9 100644 --- a/requirements/static/py3.5/zeromq-debian-9.txt +++ b/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 diff --git a/requirements/static/py3.5/zeromq-ubuntu-16.04.txt b/requirements/static/py3.5/zeromq-ubuntu-16.04.txt index 1005fd5f59..f2433c2455 100644 --- a/requirements/static/py3.5/zeromq-ubuntu-16.04.txt +++ b/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 diff --git a/requirements/static/py3.5/zeromq-ubuntu-18.04.txt b/requirements/static/py3.5/zeromq-ubuntu-18.04.txt index 498d02b8b0..aad60c17d2 100644 --- a/requirements/static/py3.5/zeromq-ubuntu-18.04.txt +++ b/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 diff --git a/requirements/static/py3.6/raet-amzn-2.txt b/requirements/static/py3.6/raet-amzn-2.txt index adc85310d6..ce45046b6b 100644 --- a/requirements/static/py3.6/raet-amzn-2.txt +++ b/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 diff --git a/requirements/static/py3.6/raet-centos-7.txt b/requirements/static/py3.6/raet-centos-7.txt index 6f8a08385a..c248a4abbd 100644 --- a/requirements/static/py3.6/raet-centos-7.txt +++ b/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 diff --git a/requirements/static/py3.6/raet-debian-8.txt b/requirements/static/py3.6/raet-debian-8.txt index b8768381a3..5deb43431a 100644 --- a/requirements/static/py3.6/raet-debian-8.txt +++ b/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 diff --git a/requirements/static/py3.6/raet-debian-9.txt b/requirements/static/py3.6/raet-debian-9.txt index 3f82c4f53c..6549a6323b 100644 --- a/requirements/static/py3.6/raet-debian-9.txt +++ b/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 diff --git a/requirements/static/py3.6/raet-ubuntu-16.04.txt b/requirements/static/py3.6/raet-ubuntu-16.04.txt index 5a0f85f785..48de5cf692 100644 --- a/requirements/static/py3.6/raet-ubuntu-16.04.txt +++ b/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 diff --git a/requirements/static/py3.6/raet-ubuntu-18.04.txt b/requirements/static/py3.6/raet-ubuntu-18.04.txt index 9227ff8077..c362a384b7 100644 --- a/requirements/static/py3.6/raet-ubuntu-18.04.txt +++ b/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 diff --git a/requirements/static/py3.6/zeromq-amzn-2.txt b/requirements/static/py3.6/zeromq-amzn-2.txt index dbe21c8108..524306d894 100644 --- a/requirements/static/py3.6/zeromq-amzn-2.txt +++ b/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 diff --git a/requirements/static/py3.6/zeromq-centos-7.txt b/requirements/static/py3.6/zeromq-centos-7.txt index e929ca1bfa..09acb209c7 100644 --- a/requirements/static/py3.6/zeromq-centos-7.txt +++ b/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 diff --git a/requirements/static/py3.6/zeromq-debian-8.txt b/requirements/static/py3.6/zeromq-debian-8.txt index 44dd9d86cd..cd9f329f8d 100644 --- a/requirements/static/py3.6/zeromq-debian-8.txt +++ b/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 diff --git a/requirements/static/py3.6/zeromq-debian-9.txt b/requirements/static/py3.6/zeromq-debian-9.txt index 6f95b934c5..95cf959ab9 100644 --- a/requirements/static/py3.6/zeromq-debian-9.txt +++ b/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 diff --git a/requirements/static/py3.6/zeromq-ubuntu-16.04.txt b/requirements/static/py3.6/zeromq-ubuntu-16.04.txt index 8f4130444c..8f17d73e04 100644 --- a/requirements/static/py3.6/zeromq-ubuntu-16.04.txt +++ b/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 diff --git a/requirements/static/py3.6/zeromq-ubuntu-18.04.txt b/requirements/static/py3.6/zeromq-ubuntu-18.04.txt index ab6b299fb5..22159e3b00 100644 --- a/requirements/static/py3.6/zeromq-ubuntu-18.04.txt +++ b/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 diff --git a/requirements/static/py3.7/raet-amzn-2.txt b/requirements/static/py3.7/raet-amzn-2.txt index eea8b5b3e5..5a775f5d3e 100644 --- a/requirements/static/py3.7/raet-amzn-2.txt +++ b/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 diff --git a/requirements/static/py3.7/raet-centos-7.txt b/requirements/static/py3.7/raet-centos-7.txt index 85ba4ca718..3a37561df2 100644 --- a/requirements/static/py3.7/raet-centos-7.txt +++ b/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 diff --git a/requirements/static/py3.7/raet-debian-8.txt b/requirements/static/py3.7/raet-debian-8.txt index 714bf90df1..4b551dd5ed 100644 --- a/requirements/static/py3.7/raet-debian-8.txt +++ b/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 diff --git a/requirements/static/py3.7/raet-debian-9.txt b/requirements/static/py3.7/raet-debian-9.txt index a7d6995e13..282a8e40a9 100644 --- a/requirements/static/py3.7/raet-debian-9.txt +++ b/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 diff --git a/requirements/static/py3.7/raet-ubuntu-16.04.txt b/requirements/static/py3.7/raet-ubuntu-16.04.txt index cbc23e0038..4a01ab917d 100644 --- a/requirements/static/py3.7/raet-ubuntu-16.04.txt +++ b/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 diff --git a/requirements/static/py3.7/raet-ubuntu-18.04.txt b/requirements/static/py3.7/raet-ubuntu-18.04.txt index f4e67ecca6..cfa435eab7 100644 --- a/requirements/static/py3.7/raet-ubuntu-18.04.txt +++ b/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 diff --git a/requirements/static/py3.7/zeromq-amzn-2.txt b/requirements/static/py3.7/zeromq-amzn-2.txt index 1285a50191..3414c8e15d 100644 --- a/requirements/static/py3.7/zeromq-amzn-2.txt +++ b/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 diff --git a/requirements/static/py3.7/zeromq-centos-7.txt b/requirements/static/py3.7/zeromq-centos-7.txt index ef34352d6b..3e6b913d52 100644 --- a/requirements/static/py3.7/zeromq-centos-7.txt +++ b/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 diff --git a/requirements/static/py3.7/zeromq-debian-8.txt b/requirements/static/py3.7/zeromq-debian-8.txt index 390a781237..018d874514 100644 --- a/requirements/static/py3.7/zeromq-debian-8.txt +++ b/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 diff --git a/requirements/static/py3.7/zeromq-debian-9.txt b/requirements/static/py3.7/zeromq-debian-9.txt index 0ed01f8872..17169f3a35 100644 --- a/requirements/static/py3.7/zeromq-debian-9.txt +++ b/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 diff --git a/requirements/static/py3.7/zeromq-ubuntu-16.04.txt b/requirements/static/py3.7/zeromq-ubuntu-16.04.txt index 9529672ef8..cd41811f88 100644 --- a/requirements/static/py3.7/zeromq-ubuntu-16.04.txt +++ b/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 diff --git a/requirements/static/py3.7/zeromq-ubuntu-18.04.txt b/requirements/static/py3.7/zeromq-ubuntu-18.04.txt index 7633aff277..eada4fc408 100644 --- a/requirements/static/py3.7/zeromq-ubuntu-18.04.txt +++ b/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 diff --git a/requirements/static/ubuntu-16.04.in b/requirements/static/ubuntu-16.04.in index a7061108f2..690558f83b 100644 --- a/requirements/static/ubuntu-16.04.in +++ b/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 diff --git a/requirements/static/ubuntu-18.04.in b/requirements/static/ubuntu-18.04.in index a7061108f2..690558f83b 100644 --- a/requirements/static/ubuntu-18.04.in +++ b/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