From 74f43bb5d238dceb897bea66962f37302b851741 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Wed, 13 Sep 2023 16:15:40 +0100 Subject: [PATCH] Upgrade requirements downgraded during the merge forward conflict resolve Signed-off-by: Pedro Algarvio --- requirements/static/ci/py3.10/darwin.txt | 6 ++-- requirements/static/ci/py3.10/freebsd.txt | 6 ++-- requirements/static/ci/py3.10/lint.txt | 2 +- requirements/static/ci/py3.10/linux.txt | 10 +++--- requirements/static/ci/py3.10/windows.txt | 14 +++----- requirements/static/ci/py3.11/windows.txt | 12 +++---- requirements/static/ci/py3.8/freebsd.txt | 38 ++++++++++---------- requirements/static/ci/py3.8/lint.txt | 6 ++-- requirements/static/ci/py3.8/linux.txt | 42 +++++++++++----------- requirements/static/ci/py3.8/windows.txt | 14 +++----- requirements/static/ci/py3.9/darwin.txt | 38 ++++++++++---------- requirements/static/ci/py3.9/freebsd.txt | 38 ++++++++++---------- requirements/static/ci/py3.9/lint.txt | 6 ++-- requirements/static/ci/py3.9/linux.txt | 42 +++++++++++----------- requirements/static/ci/py3.9/windows.txt | 14 +++----- requirements/static/pkg/py3.10/windows.txt | 4 +-- requirements/static/pkg/py3.11/windows.txt | 4 +-- requirements/static/pkg/py3.8/windows.txt | 4 +-- requirements/static/pkg/py3.9/windows.txt | 4 +-- requirements/windows.txt | 2 -- 20 files changed, 133 insertions(+), 173 deletions(-) diff --git a/requirements/static/ci/py3.10/darwin.txt b/requirements/static/ci/py3.10/darwin.txt index b5a0faa0827..88506b1f6c7 100644 --- a/requirements/static/ci/py3.10/darwin.txt +++ b/requirements/static/ci/py3.10/darwin.txt @@ -36,13 +36,13 @@ bcrypt==4.0.1 # via # -r requirements/static/ci/common.in # paramiko -boto3==1.21.46 +boto3==1.26.152 # via # -r requirements/static/ci/common.in # moto boto==2.49.0 # via -r requirements/static/ci/common.in -botocore==1.24.46 +botocore==1.29.152 # via # boto3 # moto @@ -445,7 +445,7 @@ rfc3987==1.3.8 # via -r requirements/static/ci/common.in rsa==4.9 # via google-auth -s3transfer==0.5.2 +s3transfer==0.6.1 # via boto3 scp==0.14.5 # via diff --git a/requirements/static/ci/py3.10/freebsd.txt b/requirements/static/ci/py3.10/freebsd.txt index 098eb907dda..74f59599ca9 100644 --- a/requirements/static/ci/py3.10/freebsd.txt +++ b/requirements/static/ci/py3.10/freebsd.txt @@ -33,13 +33,13 @@ bcrypt==4.0.1 # via # -r requirements/static/ci/common.in # paramiko -boto3==1.21.46 +boto3==1.26.152 # via # -r requirements/static/ci/common.in # moto boto==2.49.0 # via -r requirements/static/ci/common.in -botocore==1.24.46 +botocore==1.29.152 # via # boto3 # moto @@ -438,7 +438,7 @@ rfc3987==1.3.8 # via -r requirements/static/ci/common.in rsa==4.9 # via google-auth -s3transfer==0.5.2 +s3transfer==0.6.1 # via boto3 scp==0.14.5 # via diff --git a/requirements/static/ci/py3.10/lint.txt b/requirements/static/ci/py3.10/lint.txt index 8dc8d96c292..26e0b8abffc 100644 --- a/requirements/static/ci/py3.10/lint.txt +++ b/requirements/static/ci/py3.10/lint.txt @@ -14,7 +14,7 @@ mccabe==0.6.1 # via pylint modernize==0.5 # via saltpylint -pycodestyle==2.5.0 +pycodestyle==2.10.0 # via saltpylint pylint==2.4.4 # via diff --git a/requirements/static/ci/py3.10/linux.txt b/requirements/static/ci/py3.10/linux.txt index 1abdd12347d..0c8c822b6bf 100644 --- a/requirements/static/ci/py3.10/linux.txt +++ b/requirements/static/ci/py3.10/linux.txt @@ -44,13 +44,13 @@ bcrypt==4.0.1 # via # -r requirements/static/ci/common.in # paramiko -boto3==1.21.46 +boto3==1.26.152 # via # -r requirements/static/ci/common.in # moto boto==2.49.0 # via -r requirements/static/ci/common.in -botocore==1.24.46 +botocore==1.29.152 # via # boto3 # moto @@ -358,9 +358,9 @@ pyiface==0.0.11 # via -r requirements/static/ci/linux.in pyinotify==0.9.6 ; sys_platform != "win32" and sys_platform != "darwin" and platform_system != "openbsd" # via -r requirements/static/ci/common.in -pyjwt==2.4.0 +pyjwt==2.7.0 # via twilio -pymysql==1.0.2 +pymysql==1.0.3 # via -r requirements/static/ci/linux.in pynacl==1.5.0 # via @@ -490,7 +490,7 @@ rpm-vercmp==0.1.2 # -r requirements/static/pkg/linux.in rsa==4.9 # via google-auth -s3transfer==0.5.2 +s3transfer==0.6.1 # via boto3 scp==0.14.5 # via diff --git a/requirements/static/ci/py3.10/windows.txt b/requirements/static/ci/py3.10/windows.txt index 9182d33c334..23a3a74ab8d 100644 --- a/requirements/static/ci/py3.10/windows.txt +++ b/requirements/static/ci/py3.10/windows.txt @@ -25,13 +25,13 @@ autocommand==2.2.2 # jaraco.text bcrypt==4.0.1 # via -r requirements/static/ci/common.in -boto3==1.21.46 +boto3==1.26.152 # via # -r requirements/static/ci/common.in # moto boto==2.49.0 # via -r requirements/static/ci/common.in -botocore==1.24.46 +botocore==1.29.152 # via # boto3 # moto @@ -115,7 +115,7 @@ docker==6.1.3 # via -r requirements/pytest.txt etcd3-py==0.1.6 # via -r requirements/static/ci/common.in -exceptiongroup==1.0.4 +exceptiongroup==1.1.1 # via pytest filelock==3.12.1 # via virtualenv @@ -160,10 +160,6 @@ inflect==6.0.4 # jaraco.text iniconfig==2.0.0 # via pytest -ioloop==0.1a0 - # via - # -c requirements/static/ci/../pkg/py3.10/windows.txt - # -r requirements/windows.txt ipaddress==1.0.23 # via kubernetes jaraco.collections==4.1.0 @@ -295,7 +291,7 @@ pymssql==2.2.7 # via # -c requirements/static/ci/../pkg/py3.10/windows.txt # -r requirements/windows.txt -pymysql==1.0.2 +pymysql==1.0.3 # via # -c requirements/static/ci/../pkg/py3.10/windows.txt # -r requirements/windows.txt @@ -412,7 +408,7 @@ rfc3987==1.3.8 # via -r requirements/static/ci/common.in rsa==4.9 # via google-auth -s3transfer==0.5.2 +s3transfer==0.6.1 # via boto3 sed==0.3.1 # via -r requirements/static/ci/windows.in diff --git a/requirements/static/ci/py3.11/windows.txt b/requirements/static/ci/py3.11/windows.txt index 23ec0f35bcb..ef9c1244704 100644 --- a/requirements/static/ci/py3.11/windows.txt +++ b/requirements/static/ci/py3.11/windows.txt @@ -25,13 +25,13 @@ autocommand==2.2.2 # jaraco.text bcrypt==4.0.1 # via -r requirements/static/ci/common.in -boto3==1.21.46 +boto3==1.26.152 # via # -r requirements/static/ci/common.in # moto boto==2.49.0 # via -r requirements/static/ci/common.in -botocore==1.24.46 +botocore==1.29.152 # via # boto3 # moto @@ -158,10 +158,6 @@ inflect==6.0.4 # jaraco.text iniconfig==2.0.0 # via pytest -ioloop==0.1a0 - # via - # -c requirements/static/ci/../pkg/py3.11/windows.txt - # -r requirements/windows.txt ipaddress==1.0.23 # via kubernetes jaraco.collections==4.1.0 @@ -293,7 +289,7 @@ pymssql==2.2.7 # via # -c requirements/static/ci/../pkg/py3.11/windows.txt # -r requirements/windows.txt -pymysql==1.0.2 +pymysql==1.0.3 # via # -c requirements/static/ci/../pkg/py3.11/windows.txt # -r requirements/windows.txt @@ -410,7 +406,7 @@ rfc3987==1.3.8 # via -r requirements/static/ci/common.in rsa==4.9 # via google-auth -s3transfer==0.5.2 +s3transfer==0.6.1 # via boto3 sed==0.3.1 # via -r requirements/static/ci/windows.in diff --git a/requirements/static/ci/py3.8/freebsd.txt b/requirements/static/ci/py3.8/freebsd.txt index dffdaee8d51..508d600fdae 100644 --- a/requirements/static/ci/py3.8/freebsd.txt +++ b/requirements/static/ci/py3.8/freebsd.txt @@ -33,13 +33,13 @@ bcrypt==4.0.1 # via # -r requirements/static/ci/common.in # paramiko -boto3==1.21.46 +boto3==1.26.152 # via # -r requirements/static/ci/common.in # moto boto==2.49.0 # via -r requirements/static/ci/common.in -botocore==1.24.46 +botocore==1.29.152 # via # boto3 # moto @@ -79,8 +79,6 @@ cherrypy==18.8.0 # -c requirements/static/ci/../pkg/py3.8/freebsd.txt # -r requirements/static/ci/common.in # -r requirements/static/pkg/freebsd.in -ciscoconfparse==1.7.24 - # via napalm click==8.1.3 # via geomet clustershell==1.9.1 @@ -101,8 +99,6 @@ cryptography==41.0.3 # paramiko # pyopenssl # vcert -deprecat==2.1.1 - # via ciscoconfparse distlib==0.3.6 # via virtualenv distro==1.8.0 @@ -114,7 +110,6 @@ distro==1.8.0 dnspython==2.3.0 # via # -r requirements/static/ci/common.in - # ciscoconfparse # python-etcd docker==6.1.3 # via -r requirements/pytest.txt @@ -222,8 +217,6 @@ kubernetes==3.0.0 # via -r requirements/static/ci/common.in libnacl==1.8.0 ; sys_platform != "win32" and sys_platform != "darwin" # via -r requirements/static/ci/common.in -loguru==0.6.0 - # via ciscoconfparse looseversion==1.2.0 # via # -c requirements/static/ci/../pkg/py3.8/freebsd.txt @@ -265,10 +258,12 @@ multidict==6.0.4 # via # aiohttp # yarl -napalm==3.1.0 ; sys_platform != "win32" +napalm==4.1.0 ; sys_platform != "win32" # via -r requirements/static/ci/common.in ncclient==0.6.13 - # via junos-eznc + # via + # junos-eznc + # napalm netaddr==0.8.0 # via # junos-eznc @@ -276,6 +271,8 @@ netaddr==0.8.0 # pyeapi netmiko==4.2.0 # via napalm +netutils==1.6.0 + # via napalm ntc-templates==3.4.0 # via netmiko oscrypto==1.3.0 @@ -295,9 +292,7 @@ paramiko==3.2.0 ; sys_platform != "win32" and sys_platform != "darwin" # netmiko # scp passlib==1.7.4 - # via - # -r requirements/static/ci/common.in - # ciscoconfparse + # via -r requirements/static/ci/common.in pathspec==0.11.1 # via yamllint platformdirs==3.5.3 @@ -447,7 +442,7 @@ rfc3987==1.3.8 # via -r requirements/static/ci/common.in rsa==4.9 # via google-auth -s3transfer==0.5.2 +s3transfer==0.6.1 # via boto3 scp==0.14.5 # via @@ -500,9 +495,7 @@ timelib==0.3.0 # -c requirements/static/ci/../pkg/py3.8/freebsd.txt # -r requirements/static/pkg/freebsd.in toml==0.10.2 - # via - # -r requirements/static/ci/common.in - # ciscoconfparse + # via -r requirements/static/ci/common.in tomli==2.0.1 # via pytest tornado==6.3.2 ; python_version >= "3.8" @@ -511,11 +504,18 @@ tornado==6.3.2 ; python_version >= "3.8" # -r requirements/base.txt transitions==0.9.0 # via junos-eznc +ttp-templates==0.3.5 + # via napalm +ttp==0.9.5 + # via + # napalm + # ttp-templates types-pyyaml==6.0.1 # via responses typing-extensions==4.6.2 # via # -c requirements/static/ci/../pkg/py3.8/freebsd.txt + # napalm # pydantic # pytest-shell-utilities # pytest-system-statistics @@ -547,8 +547,6 @@ werkzeug==2.3.6 # via # moto # pytest-httpserver -wrapt==1.15.0 - # via deprecat xmldiff==2.6.3 # via -r requirements/static/ci/common.in xmltodict==0.13.0 diff --git a/requirements/static/ci/py3.8/lint.txt b/requirements/static/ci/py3.8/lint.txt index ca08daefc56..0b75ee9a840 100644 --- a/requirements/static/ci/py3.8/lint.txt +++ b/requirements/static/ci/py3.8/lint.txt @@ -14,7 +14,7 @@ mccabe==0.6.1 # via pylint modernize==0.5 # via saltpylint -pycodestyle==2.5.0 +pycodestyle==2.10.0 # via saltpylint pylint==2.4.4 # via @@ -31,6 +31,4 @@ toml==0.10.2 # -c requirements/static/ci/py3.8/linux.txt # -r requirements/static/ci/lint.in wrapt==1.11.2 - # via - # -c requirements/static/ci/py3.8/linux.txt - # astroid + # via astroid diff --git a/requirements/static/ci/py3.8/linux.txt b/requirements/static/ci/py3.8/linux.txt index 0af13b389fe..52d38a65b21 100644 --- a/requirements/static/ci/py3.8/linux.txt +++ b/requirements/static/ci/py3.8/linux.txt @@ -44,13 +44,13 @@ bcrypt==4.0.1 # via # -r requirements/static/ci/common.in # paramiko -boto3==1.21.46 +boto3==1.26.152 # via # -r requirements/static/ci/common.in # moto boto==2.49.0 # via -r requirements/static/ci/common.in -botocore==1.24.46 +botocore==1.29.152 # via # boto3 # moto @@ -93,8 +93,6 @@ cherrypy==18.8.0 # -c requirements/static/ci/../pkg/py3.8/linux.txt # -r requirements/static/ci/common.in # -r requirements/static/pkg/linux.in -ciscoconfparse==1.7.24 - # via napalm click==8.1.3 # via geomet clustershell==1.9.1 @@ -116,8 +114,6 @@ cryptography==41.0.3 # paramiko # pyopenssl # vcert -deprecat==2.1.1 - # via ciscoconfparse distlib==0.3.6 # via virtualenv distro==1.8.0 @@ -128,7 +124,6 @@ distro==1.8.0 dnspython==2.3.0 # via # -r requirements/static/ci/common.in - # ciscoconfparse # python-etcd docker==6.1.3 # via -r requirements/pytest.txt @@ -247,8 +242,6 @@ kubernetes==3.0.0 # via -r requirements/static/ci/common.in libnacl==1.8.0 ; sys_platform != "win32" and sys_platform != "darwin" # via -r requirements/static/ci/common.in -loguru==0.6.0 - # via ciscoconfparse looseversion==1.2.0 # via # -c requirements/static/ci/../pkg/py3.8/linux.txt @@ -290,10 +283,12 @@ multidict==6.0.4 # via # aiohttp # yarl -napalm==3.1.0 ; sys_platform != "win32" +napalm==4.1.0 ; sys_platform != "win32" # via -r requirements/static/ci/common.in ncclient==0.6.13 - # via junos-eznc + # via + # junos-eznc + # napalm netaddr==0.8.0 # via # junos-eznc @@ -301,6 +296,8 @@ netaddr==0.8.0 # pyeapi netmiko==4.2.0 # via napalm +netutils==1.6.0 + # via napalm ntc-templates==3.4.0 # via netmiko oscrypto==1.3.0 @@ -321,9 +318,7 @@ paramiko==3.2.0 ; sys_platform != "win32" and sys_platform != "darwin" # netmiko # scp passlib==1.7.4 - # via - # -r requirements/static/ci/common.in - # ciscoconfparse + # via -r requirements/static/ci/common.in pathspec==0.11.1 # via yamllint platformdirs==3.5.3 @@ -367,9 +362,9 @@ pyiface==0.0.11 # via -r requirements/static/ci/linux.in pyinotify==0.9.6 ; sys_platform != "win32" and sys_platform != "darwin" and platform_system != "openbsd" # via -r requirements/static/ci/common.in -pyjwt==2.4.0 +pyjwt==2.7.0 # via twilio -pymysql==1.0.2 +pymysql==1.0.3 # via -r requirements/static/ci/linux.in pynacl==1.5.0 # via @@ -499,7 +494,7 @@ rpm-vercmp==0.1.2 # -r requirements/static/pkg/linux.in rsa==4.9 # via google-auth -s3transfer==0.5.2 +s3transfer==0.6.1 # via boto3 scp==0.14.5 # via @@ -562,9 +557,7 @@ timelib==0.3.0 # -c requirements/static/ci/../pkg/py3.8/linux.txt # -r requirements/static/pkg/linux.in toml==0.10.2 - # via - # -r requirements/static/ci/common.in - # ciscoconfparse + # via -r requirements/static/ci/common.in tomli==2.0.1 # via pytest tornado==6.3.2 ; python_version >= "3.8" @@ -573,6 +566,12 @@ tornado==6.3.2 ; python_version >= "3.8" # -r requirements/base.txt transitions==0.9.0 # via junos-eznc +ttp-templates==0.3.5 + # via napalm +ttp==0.9.5 + # via + # napalm + # ttp-templates twilio==8.2.2 # via -r requirements/static/ci/linux.in types-pyyaml==6.0.1 @@ -580,6 +579,7 @@ types-pyyaml==6.0.1 typing-extensions==4.6.2 # via # -c requirements/static/ci/../pkg/py3.8/linux.txt + # napalm # pydantic # pytest-shell-utilities # pytest-system-statistics @@ -611,8 +611,6 @@ werkzeug==2.3.6 # via # moto # pytest-httpserver -wrapt==1.11.2 - # via deprecat xmldiff==2.6.3 # via -r requirements/static/ci/common.in xmltodict==0.13.0 diff --git a/requirements/static/ci/py3.8/windows.txt b/requirements/static/ci/py3.8/windows.txt index 569406362ed..958a15ba179 100644 --- a/requirements/static/ci/py3.8/windows.txt +++ b/requirements/static/ci/py3.8/windows.txt @@ -25,13 +25,13 @@ autocommand==2.2.2 # jaraco.text bcrypt==4.0.1 # via -r requirements/static/ci/common.in -boto3==1.21.46 +boto3==1.26.152 # via # -r requirements/static/ci/common.in # moto boto==2.49.0 # via -r requirements/static/ci/common.in -botocore==1.24.46 +botocore==1.29.152 # via # boto3 # moto @@ -115,7 +115,7 @@ docker==6.1.3 # via -r requirements/pytest.txt etcd3-py==0.1.6 # via -r requirements/static/ci/common.in -exceptiongroup==1.0.4 +exceptiongroup==1.1.1 # via pytest filelock==3.12.1 # via virtualenv @@ -164,10 +164,6 @@ inflect==6.0.4 # jaraco.text iniconfig==2.0.0 # via pytest -ioloop==0.1a0 - # via - # -c requirements/static/ci/../pkg/py3.8/windows.txt - # -r requirements/windows.txt ipaddress==1.0.23 # via kubernetes jaraco.collections==4.1.0 @@ -299,7 +295,7 @@ pymssql==2.2.7 # via # -c requirements/static/ci/../pkg/py3.8/windows.txt # -r requirements/windows.txt -pymysql==1.0.2 +pymysql==1.0.3 # via # -c requirements/static/ci/../pkg/py3.8/windows.txt # -r requirements/windows.txt @@ -417,7 +413,7 @@ rfc3987==1.3.8 # via -r requirements/static/ci/common.in rsa==4.9 # via google-auth -s3transfer==0.5.2 +s3transfer==0.6.1 # via boto3 sed==0.3.1 # via -r requirements/static/ci/windows.in diff --git a/requirements/static/ci/py3.9/darwin.txt b/requirements/static/ci/py3.9/darwin.txt index 9ed66e7ac29..a2c334ae752 100644 --- a/requirements/static/ci/py3.9/darwin.txt +++ b/requirements/static/ci/py3.9/darwin.txt @@ -36,13 +36,13 @@ bcrypt==4.0.1 # via # -r requirements/static/ci/common.in # paramiko -boto3==1.21.46 +boto3==1.26.152 # via # -r requirements/static/ci/common.in # moto boto==2.49.0 # via -r requirements/static/ci/common.in -botocore==1.24.46 +botocore==1.29.152 # via # boto3 # moto @@ -83,8 +83,6 @@ cherrypy==18.8.0 # -c requirements/static/ci/../pkg/py3.9/darwin.txt # -r requirements/darwin.txt # -r requirements/static/ci/common.in -ciscoconfparse==1.7.24 - # via napalm click==8.1.3 # via geomet clustershell==1.9.1 @@ -105,8 +103,6 @@ cryptography==41.0.3 # paramiko # pyopenssl # vcert -deprecat==2.1.1 - # via ciscoconfparse distlib==0.3.6 # via virtualenv distro==1.8.0 @@ -117,7 +113,6 @@ distro==1.8.0 dnspython==2.3.0 # via # -r requirements/static/ci/common.in - # ciscoconfparse # python-etcd docker==6.1.3 # via -r requirements/pytest.txt @@ -223,8 +218,6 @@ linode-python==1.1.1 # via # -c requirements/static/ci/../pkg/py3.9/darwin.txt # -r requirements/darwin.txt -loguru==0.6.0 - # via ciscoconfparse looseversion==1.2.0 # via # -c requirements/static/ci/../pkg/py3.9/darwin.txt @@ -266,10 +259,12 @@ multidict==6.0.4 # via # aiohttp # yarl -napalm==3.1.0 ; sys_platform != "win32" +napalm==4.1.0 ; sys_platform != "win32" # via -r requirements/static/ci/common.in ncclient==0.6.13 - # via junos-eznc + # via + # junos-eznc + # napalm netaddr==0.8.0 # via # junos-eznc @@ -277,6 +272,8 @@ netaddr==0.8.0 # pyeapi netmiko==4.2.0 # via napalm +netutils==1.6.0 + # via napalm ntc-templates==3.4.0 # via netmiko oscrypto==1.3.0 @@ -295,9 +292,7 @@ paramiko==3.2.0 # netmiko # scp passlib==1.7.4 - # via - # -r requirements/static/ci/common.in - # ciscoconfparse + # via -r requirements/static/ci/common.in pathspec==0.11.1 # via yamllint platformdirs==3.5.3 @@ -450,7 +445,7 @@ rfc3987==1.3.8 # via -r requirements/static/ci/common.in rsa==4.9 # via google-auth -s3transfer==0.5.2 +s3transfer==0.6.1 # via boto3 scp==0.14.5 # via @@ -504,9 +499,7 @@ timelib==0.3.0 # -c requirements/static/ci/../pkg/py3.9/darwin.txt # -r requirements/darwin.txt toml==0.10.2 - # via - # -r requirements/static/ci/common.in - # ciscoconfparse + # via -r requirements/static/ci/common.in tomli==2.0.1 # via pytest tornado==6.3.2 ; python_version >= "3.8" @@ -515,11 +508,18 @@ tornado==6.3.2 ; python_version >= "3.8" # -r requirements/base.txt transitions==0.9.0 # via junos-eznc +ttp-templates==0.3.5 + # via napalm +ttp==0.9.5 + # via + # napalm + # ttp-templates types-pyyaml==6.0.1 # via responses typing-extensions==4.6.2 # via # -c requirements/static/ci/../pkg/py3.9/darwin.txt + # napalm # pydantic # pytest-shell-utilities # pytest-system-statistics @@ -555,8 +555,6 @@ werkzeug==2.3.6 # via # moto # pytest-httpserver -wrapt==1.15.0 - # via deprecat xmldiff==2.6.3 # via -r requirements/static/ci/common.in xmltodict==0.13.0 diff --git a/requirements/static/ci/py3.9/freebsd.txt b/requirements/static/ci/py3.9/freebsd.txt index 029739abb5d..f41598a86be 100644 --- a/requirements/static/ci/py3.9/freebsd.txt +++ b/requirements/static/ci/py3.9/freebsd.txt @@ -33,13 +33,13 @@ bcrypt==4.0.1 # via # -r requirements/static/ci/common.in # paramiko -boto3==1.21.46 +boto3==1.26.152 # via # -r requirements/static/ci/common.in # moto boto==2.49.0 # via -r requirements/static/ci/common.in -botocore==1.24.46 +botocore==1.29.152 # via # boto3 # moto @@ -79,8 +79,6 @@ cherrypy==18.8.0 # -c requirements/static/ci/../pkg/py3.9/freebsd.txt # -r requirements/static/ci/common.in # -r requirements/static/pkg/freebsd.in -ciscoconfparse==1.7.24 - # via napalm click==8.1.3 # via geomet clustershell==1.9.1 @@ -101,8 +99,6 @@ cryptography==41.0.3 # paramiko # pyopenssl # vcert -deprecat==2.1.1 - # via ciscoconfparse distlib==0.3.6 # via virtualenv distro==1.8.0 @@ -114,7 +110,6 @@ distro==1.8.0 dnspython==2.3.0 # via # -r requirements/static/ci/common.in - # ciscoconfparse # python-etcd docker==6.1.3 # via -r requirements/pytest.txt @@ -218,8 +213,6 @@ kubernetes==3.0.0 # via -r requirements/static/ci/common.in libnacl==1.8.0 ; sys_platform != "win32" and sys_platform != "darwin" # via -r requirements/static/ci/common.in -loguru==0.6.0 - # via ciscoconfparse looseversion==1.2.0 # via # -c requirements/static/ci/../pkg/py3.9/freebsd.txt @@ -261,10 +254,12 @@ multidict==6.0.4 # via # aiohttp # yarl -napalm==3.1.0 ; sys_platform != "win32" +napalm==4.1.0 ; sys_platform != "win32" # via -r requirements/static/ci/common.in ncclient==0.6.13 - # via junos-eznc + # via + # junos-eznc + # napalm netaddr==0.8.0 # via # junos-eznc @@ -272,6 +267,8 @@ netaddr==0.8.0 # pyeapi netmiko==4.2.0 # via napalm +netutils==1.6.0 + # via napalm ntc-templates==3.4.0 # via netmiko oscrypto==1.3.0 @@ -291,9 +288,7 @@ paramiko==3.2.0 ; sys_platform != "win32" and sys_platform != "darwin" # netmiko # scp passlib==1.7.4 - # via - # -r requirements/static/ci/common.in - # ciscoconfparse + # via -r requirements/static/ci/common.in pathspec==0.11.1 # via yamllint platformdirs==3.5.3 @@ -443,7 +438,7 @@ rfc3987==1.3.8 # via -r requirements/static/ci/common.in rsa==4.9 # via google-auth -s3transfer==0.5.2 +s3transfer==0.6.1 # via boto3 scp==0.14.5 # via @@ -496,9 +491,7 @@ timelib==0.3.0 # -c requirements/static/ci/../pkg/py3.9/freebsd.txt # -r requirements/static/pkg/freebsd.in toml==0.10.2 - # via - # -r requirements/static/ci/common.in - # ciscoconfparse + # via -r requirements/static/ci/common.in tomli==2.0.1 # via pytest tornado==6.3.2 ; python_version >= "3.8" @@ -507,11 +500,18 @@ tornado==6.3.2 ; python_version >= "3.8" # -r requirements/base.txt transitions==0.9.0 # via junos-eznc +ttp-templates==0.3.5 + # via napalm +ttp==0.9.5 + # via + # napalm + # ttp-templates types-pyyaml==6.0.1 # via responses typing-extensions==4.6.2 # via # -c requirements/static/ci/../pkg/py3.9/freebsd.txt + # napalm # pydantic # pytest-shell-utilities # pytest-system-statistics @@ -543,8 +543,6 @@ werkzeug==2.3.6 # via # moto # pytest-httpserver -wrapt==1.15.0 - # via deprecat xmldiff==2.6.3 # via -r requirements/static/ci/common.in xmltodict==0.13.0 diff --git a/requirements/static/ci/py3.9/lint.txt b/requirements/static/ci/py3.9/lint.txt index 0d9d18ee493..13375d3d20e 100644 --- a/requirements/static/ci/py3.9/lint.txt +++ b/requirements/static/ci/py3.9/lint.txt @@ -14,7 +14,7 @@ mccabe==0.6.1 # via pylint modernize==0.5 # via saltpylint -pycodestyle==2.5.0 +pycodestyle==2.10.0 # via saltpylint pylint==2.4.4 # via @@ -31,6 +31,4 @@ toml==0.10.2 # -c requirements/static/ci/py3.9/linux.txt # -r requirements/static/ci/lint.in wrapt==1.11.2 - # via - # -c requirements/static/ci/py3.9/linux.txt - # astroid + # via astroid diff --git a/requirements/static/ci/py3.9/linux.txt b/requirements/static/ci/py3.9/linux.txt index 467f872e68e..1f696d80665 100644 --- a/requirements/static/ci/py3.9/linux.txt +++ b/requirements/static/ci/py3.9/linux.txt @@ -44,13 +44,13 @@ bcrypt==4.0.1 # via # -r requirements/static/ci/common.in # paramiko -boto3==1.21.46 +boto3==1.26.152 # via # -r requirements/static/ci/common.in # moto boto==2.49.0 # via -r requirements/static/ci/common.in -botocore==1.24.46 +botocore==1.29.152 # via # boto3 # moto @@ -93,8 +93,6 @@ cherrypy==18.8.0 # -c requirements/static/ci/../pkg/py3.9/linux.txt # -r requirements/static/ci/common.in # -r requirements/static/pkg/linux.in -ciscoconfparse==1.7.24 - # via napalm click==8.1.3 # via geomet clustershell==1.9.1 @@ -116,8 +114,6 @@ cryptography==41.0.3 # paramiko # pyopenssl # vcert -deprecat==2.1.1 - # via ciscoconfparse distlib==0.3.6 # via virtualenv distro==1.8.0 @@ -128,7 +124,6 @@ distro==1.8.0 dnspython==2.3.0 # via # -r requirements/static/ci/common.in - # ciscoconfparse # python-etcd docker==6.1.3 # via -r requirements/pytest.txt @@ -245,8 +240,6 @@ kubernetes==3.0.0 # via -r requirements/static/ci/common.in libnacl==1.8.0 ; sys_platform != "win32" and sys_platform != "darwin" # via -r requirements/static/ci/common.in -loguru==0.6.0 - # via ciscoconfparse looseversion==1.2.0 # via # -c requirements/static/ci/../pkg/py3.9/linux.txt @@ -288,10 +281,12 @@ multidict==6.0.4 # via # aiohttp # yarl -napalm==3.1.0 ; sys_platform != "win32" +napalm==4.1.0 ; sys_platform != "win32" # via -r requirements/static/ci/common.in ncclient==0.6.13 - # via junos-eznc + # via + # junos-eznc + # napalm netaddr==0.8.0 # via # junos-eznc @@ -299,6 +294,8 @@ netaddr==0.8.0 # pyeapi netmiko==4.2.0 # via napalm +netutils==1.6.0 + # via napalm ntc-templates==3.4.0 # via netmiko oscrypto==1.3.0 @@ -319,9 +316,7 @@ paramiko==3.2.0 ; sys_platform != "win32" and sys_platform != "darwin" # netmiko # scp passlib==1.7.4 - # via - # -r requirements/static/ci/common.in - # ciscoconfparse + # via -r requirements/static/ci/common.in pathspec==0.11.1 # via yamllint platformdirs==3.5.3 @@ -365,9 +360,9 @@ pyiface==0.0.11 # via -r requirements/static/ci/linux.in pyinotify==0.9.6 ; sys_platform != "win32" and sys_platform != "darwin" and platform_system != "openbsd" # via -r requirements/static/ci/common.in -pyjwt==2.4.0 +pyjwt==2.7.0 # via twilio -pymysql==1.0.2 +pymysql==1.0.3 # via -r requirements/static/ci/linux.in pynacl==1.5.0 # via @@ -497,7 +492,7 @@ rpm-vercmp==0.1.2 # -r requirements/static/pkg/linux.in rsa==4.9 # via google-auth -s3transfer==0.5.2 +s3transfer==0.6.1 # via boto3 scp==0.14.5 # via @@ -560,9 +555,7 @@ timelib==0.3.0 # -c requirements/static/ci/../pkg/py3.9/linux.txt # -r requirements/static/pkg/linux.in toml==0.10.2 - # via - # -r requirements/static/ci/common.in - # ciscoconfparse + # via -r requirements/static/ci/common.in tomli==2.0.1 # via pytest tornado==6.3.2 ; python_version >= "3.8" @@ -571,6 +564,12 @@ tornado==6.3.2 ; python_version >= "3.8" # -r requirements/base.txt transitions==0.9.0 # via junos-eznc +ttp-templates==0.3.5 + # via napalm +ttp==0.9.5 + # via + # napalm + # ttp-templates twilio==8.2.2 # via -r requirements/static/ci/linux.in types-pyyaml==6.0.1 @@ -578,6 +577,7 @@ types-pyyaml==6.0.1 typing-extensions==4.6.2 # via # -c requirements/static/ci/../pkg/py3.9/linux.txt + # napalm # pydantic # pytest-shell-utilities # pytest-system-statistics @@ -609,8 +609,6 @@ werkzeug==2.3.6 # via # moto # pytest-httpserver -wrapt==1.11.2 - # via deprecat xmldiff==2.6.3 # via -r requirements/static/ci/common.in xmltodict==0.13.0 diff --git a/requirements/static/ci/py3.9/windows.txt b/requirements/static/ci/py3.9/windows.txt index 1e8ddf9d602..df440960e4e 100644 --- a/requirements/static/ci/py3.9/windows.txt +++ b/requirements/static/ci/py3.9/windows.txt @@ -25,13 +25,13 @@ autocommand==2.2.2 # jaraco.text bcrypt==4.0.1 # via -r requirements/static/ci/common.in -boto3==1.21.46 +boto3==1.26.152 # via # -r requirements/static/ci/common.in # moto boto==2.49.0 # via -r requirements/static/ci/common.in -botocore==1.24.46 +botocore==1.29.152 # via # boto3 # moto @@ -115,7 +115,7 @@ docker==6.1.3 # via -r requirements/pytest.txt etcd3-py==0.1.6 # via -r requirements/static/ci/common.in -exceptiongroup==1.0.4 +exceptiongroup==1.1.1 # via pytest filelock==3.12.1 # via virtualenv @@ -160,10 +160,6 @@ inflect==6.0.4 # jaraco.text iniconfig==2.0.0 # via pytest -ioloop==0.1a0 - # via - # -c requirements/static/ci/../pkg/py3.9/windows.txt - # -r requirements/windows.txt ipaddress==1.0.23 # via kubernetes jaraco.collections==4.1.0 @@ -295,7 +291,7 @@ pymssql==2.2.7 # via # -c requirements/static/ci/../pkg/py3.9/windows.txt # -r requirements/windows.txt -pymysql==1.0.2 +pymysql==1.0.3 # via # -c requirements/static/ci/../pkg/py3.9/windows.txt # -r requirements/windows.txt @@ -413,7 +409,7 @@ rfc3987==1.3.8 # via -r requirements/static/ci/common.in rsa==4.9 # via google-auth -s3transfer==0.5.2 +s3transfer==0.6.1 # via boto3 sed==0.3.1 # via -r requirements/static/ci/windows.in diff --git a/requirements/static/pkg/py3.10/windows.txt b/requirements/static/pkg/py3.10/windows.txt index 19ea68bf266..08a9392fe75 100644 --- a/requirements/static/pkg/py3.10/windows.txt +++ b/requirements/static/pkg/py3.10/windows.txt @@ -44,8 +44,6 @@ importlib-metadata==6.6.0 # via -r requirements/windows.txt inflect==6.0.4 # via jaraco.text -ioloop==0.1a0 - # via -r requirements/windows.txt jaraco.collections==4.1.0 # via cherrypy jaraco.context==4.3.0 @@ -93,7 +91,7 @@ pydantic==1.10.8 # via inflect pymssql==2.2.7 # via -r requirements/windows.txt -pymysql==1.0.2 +pymysql==1.0.3 # via -r requirements/windows.txt pyopenssl==23.2.0 # via -r requirements/windows.txt diff --git a/requirements/static/pkg/py3.11/windows.txt b/requirements/static/pkg/py3.11/windows.txt index a86e47e4d0d..e6037315eed 100644 --- a/requirements/static/pkg/py3.11/windows.txt +++ b/requirements/static/pkg/py3.11/windows.txt @@ -44,8 +44,6 @@ importlib-metadata==6.6.0 # via -r requirements/windows.txt inflect==6.0.4 # via jaraco.text -ioloop==0.1a0 - # via -r requirements/windows.txt jaraco.collections==4.1.0 # via cherrypy jaraco.context==4.3.0 @@ -93,7 +91,7 @@ pydantic==1.10.8 # via inflect pymssql==2.2.7 # via -r requirements/windows.txt -pymysql==1.0.2 +pymysql==1.0.3 # via -r requirements/windows.txt pyopenssl==23.2.0 # via -r requirements/windows.txt diff --git a/requirements/static/pkg/py3.8/windows.txt b/requirements/static/pkg/py3.8/windows.txt index 9171da8c7ce..ccb15ea5725 100644 --- a/requirements/static/pkg/py3.8/windows.txt +++ b/requirements/static/pkg/py3.8/windows.txt @@ -46,8 +46,6 @@ importlib-resources==5.12.0 # via jaraco.text inflect==6.0.4 # via jaraco.text -ioloop==0.1a0 - # via -r requirements/windows.txt jaraco.collections==4.1.0 # via cherrypy jaraco.context==4.3.0 @@ -95,7 +93,7 @@ pydantic==1.10.8 # via inflect pymssql==2.2.7 # via -r requirements/windows.txt -pymysql==1.0.2 +pymysql==1.0.3 # via -r requirements/windows.txt pyopenssl==23.2.0 # via -r requirements/windows.txt diff --git a/requirements/static/pkg/py3.9/windows.txt b/requirements/static/pkg/py3.9/windows.txt index b8104d5fbea..c2e1c05d49c 100644 --- a/requirements/static/pkg/py3.9/windows.txt +++ b/requirements/static/pkg/py3.9/windows.txt @@ -44,8 +44,6 @@ importlib-metadata==6.6.0 # via -r requirements/windows.txt inflect==6.0.4 # via jaraco.text -ioloop==0.1a0 - # via -r requirements/windows.txt jaraco.collections==4.1.0 # via cherrypy jaraco.context==4.3.0 @@ -93,7 +91,7 @@ pydantic==1.10.8 # via inflect pymssql==2.2.7 # via -r requirements/windows.txt -pymysql==1.0.2 +pymysql==1.0.3 # via -r requirements/windows.txt pyopenssl==23.2.0 # via -r requirements/windows.txt diff --git a/requirements/windows.txt b/requirements/windows.txt index b938df913df..2c7e8359264 100644 --- a/requirements/windows.txt +++ b/requirements/windows.txt @@ -11,8 +11,6 @@ cffi>=1.14.5 cherrypy>=18.6.1 gitpython>=3.1.30 cryptography>=41.0.3 -gitpython>=3.1.30 -ioloop>=0.1a0 lxml>=4.6.3 pyasn1>=0.4.8 pymssql>=2.2.1