From c3477da2ddb81509b4e2c550ea36497c0b05709c Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Mon, 11 Sep 2023 09:40:35 +0100 Subject: [PATCH] The 3006.x branch is Python >= 3.7 already. Remove unnecessary `python_version` markers. Signed-off-by: Pedro Algarvio --- requirements/darwin.txt | 3 +-- requirements/pytest.txt | 3 +-- requirements/static/ci/common.in | 12 +++++------- requirements/static/ci/darwin.in | 2 +- requirements/static/ci/freebsd.in | 2 +- requirements/static/ci/linux.in | 6 ++---- requirements/static/ci/pkgtests-windows.in | 3 +-- requirements/static/ci/py3.10/cloud.txt | 10 +++++----- requirements/static/ci/py3.10/darwin.txt | 12 ++++++------ requirements/static/ci/py3.10/freebsd.txt | 12 ++++++------ requirements/static/ci/py3.10/lint.txt | 12 ++++++------ requirements/static/ci/py3.10/linux.txt | 14 +++++++------- .../static/ci/py3.10/pkgtests-windows.txt | 2 +- requirements/static/ci/py3.10/windows.txt | 12 ++++++------ requirements/static/ci/py3.7/cloud.txt | 12 ++++++------ requirements/static/ci/py3.7/freebsd.txt | 14 +++++++------- requirements/static/ci/py3.7/lint.txt | 14 +++++++------- requirements/static/ci/py3.7/linux.txt | 16 ++++++++-------- requirements/static/ci/py3.7/windows.txt | 12 ++++++------ requirements/static/ci/py3.8/cloud.txt | 12 ++++++------ requirements/static/ci/py3.8/freebsd.txt | 14 +++++++------- requirements/static/ci/py3.8/lint.txt | 14 +++++++------- requirements/static/ci/py3.8/linux.txt | 16 ++++++++-------- requirements/static/ci/py3.8/windows.txt | 12 ++++++------ requirements/static/ci/py3.9/cloud.txt | 12 ++++++------ requirements/static/ci/py3.9/darwin.txt | 14 +++++++------- requirements/static/ci/py3.9/freebsd.txt | 14 +++++++------- requirements/static/ci/py3.9/lint.txt | 14 +++++++------- requirements/static/ci/py3.9/linux.txt | 16 ++++++++-------- requirements/static/ci/py3.9/windows.txt | 12 ++++++------ requirements/static/ci/windows.in | 2 +- requirements/static/pkg/freebsd.in | 1 - requirements/static/pkg/linux.in | 1 - requirements/static/pkg/py3.10/darwin.txt | 2 +- requirements/static/pkg/py3.10/windows.txt | 2 +- requirements/static/pkg/py3.7/windows.txt | 2 +- requirements/static/pkg/py3.8/windows.txt | 2 +- requirements/static/pkg/py3.9/darwin.txt | 2 +- requirements/static/pkg/py3.9/windows.txt | 2 +- requirements/windows.txt | 3 +-- 40 files changed, 166 insertions(+), 176 deletions(-) diff --git a/requirements/darwin.txt b/requirements/darwin.txt index 2b0106ba9d1..59aa84bc06e 100644 --- a/requirements/darwin.txt +++ b/requirements/darwin.txt @@ -3,10 +3,9 @@ -r zeromq.txt apache-libcloud>=2.4.0 -backports.ssl_match_hostname>=3.7.0.1; python_version < '3.7' cherrypy>=17.4.1 cryptography>=41.0.3 -gitpython>=3.1.30; python_version >= '3.7' +gitpython>=3.1.30 idna>=2.8 linode-python>=1.1.1 pyasn1>=0.4.8 diff --git a/requirements/pytest.txt b/requirements/pytest.txt index 5b67583a3d7..5940ca1f2c7 100644 --- a/requirements/pytest.txt +++ b/requirements/pytest.txt @@ -1,7 +1,6 @@ mock >= 3.0.0 # PyTest -pytest >= 7.0.1; python_version <= "3.6" -pytest >= 7.2.0; python_version > "3.6" +pytest >= 7.2.0 pytest-salt-factories >= 1.0.0rc21; sys_platform == 'win32' pytest-salt-factories[docker] >= 1.0.0rc21; sys_platform != 'win32' pytest-tempdir >= 2019.10.12 diff --git a/requirements/static/ci/common.in b/requirements/static/ci/common.in index 4e55fb95f10..ac54d8ee9e7 100644 --- a/requirements/static/ci/common.in +++ b/requirements/static/ci/common.in @@ -3,8 +3,7 @@ # to a particular platform, please add it to the corresponding `.in` file in this directory. azure==4.0.0; sys_platform != 'win32' apache-libcloud>=1.5.0; sys_platform != 'win32' -boto3>=1.16.0,<1.17.0; python_version < '3.6' -boto3>=1.17.67; python_version >= '3.6' +boto3>=1.17.67 boto>=2.46.0 cassandra-driver>=2.0 certifi>=2022.12.07 @@ -14,8 +13,8 @@ clustershell croniter>=0.3.0,!=0.3.22"; sys_platform != 'win32' dnspython docker -etcd3-py==0.1.6 ; python_version >= '3.6' -gitpython>=3.1.30; python_version >= '3.7' +etcd3-py==0.1.6 +gitpython>=3.1.30 jmespath jsonschema junos-eznc; sys_platform != 'win32' and python_version <= '3.10' @@ -24,10 +23,9 @@ kazoo; sys_platform != 'win32' and sys_platform != 'darwin' keyring==5.7.1 kubernetes<4.0 libnacl>=1.7.1; sys_platform != 'win32' and sys_platform != 'darwin' -moto>=1.3.14 ; python_version <= '3.5' -moto>=2.0.0 ; python_version >= '3.6' +moto>=2.0.0 # Napalm pulls in pyeapi which does not work on Py3.10 -napalm; sys_platform != 'win32' and python_version > '3.6' and python_version < '3.10' +napalm; sys_platform != 'win32' and python_version < '3.10' paramiko>=2.10.1; sys_platform != 'win32' and sys_platform != 'darwin' passlib[bcrypt]>=1.7.4 pynacl>=1.5.0 diff --git a/requirements/static/ci/darwin.in b/requirements/static/ci/darwin.in index d7b8f010e0f..9ab7e15587a 100644 --- a/requirements/static/ci/darwin.in +++ b/requirements/static/ci/darwin.in @@ -3,7 +3,7 @@ # pylxd(or likely ws4py) will cause the test suite to hang at the finish line under runtests.py # pylxd>=2.2.5 yamlordereddictloader -pygit2>=1.2.0; python_version >= '3.7' +pygit2>=1.2.0 yamllint mercurial hglib diff --git a/requirements/static/ci/freebsd.in b/requirements/static/ci/freebsd.in index 20f88c8724a..00f34fddee4 100644 --- a/requirements/static/ci/freebsd.in +++ b/requirements/static/ci/freebsd.in @@ -1,5 +1,5 @@ # FreeBSD static CI requirements -pygit2==1.8.0; python_version >= '3.7' +pygit2==1.8.0 yamllint mercurial hglib diff --git a/requirements/static/ci/linux.in b/requirements/static/ci/linux.in index c05c78de1e5..a76d02ccc5c 100644 --- a/requirements/static/ci/linux.in +++ b/requirements/static/ci/linux.in @@ -3,13 +3,11 @@ pyiface pygit2<1.1.0; python_version <= '3.8' pygit2>=1.4.0; python_version > '3.8' pygit2==1.9.1; python_version >= '3.10' -pymysql==0.9.3; python_version <= '3.5' -pymysql>=1.0.2; python_version > '3.5' +pymysql>=1.0.2 ansible>=4.4.0; python_version < '3.9' ansible>=7.0.0; python_version >= '3.9' twilio -python-telegram-bot==12.8; python_version <= '3.5' -python-telegram-bot>=13.7; python_version > '3.5' +python-telegram-bot>=13.7 yamllint mercurial hglib diff --git a/requirements/static/ci/pkgtests-windows.in b/requirements/static/ci/pkgtests-windows.in index f34edda6f04..53cdcf3e5fc 100644 --- a/requirements/static/ci/pkgtests-windows.in +++ b/requirements/static/ci/pkgtests-windows.in @@ -1,5 +1,4 @@ cherrypy pytest-salt-factories==1.0.0rc17 -pythonnet==3.0.1; python_version >= '3.7' -pythonnet==2.5.2; python_version < '3.7' +pythonnet==3.0.1 wmi==1.5.1; sys_platform == 'win32' diff --git a/requirements/static/ci/py3.10/cloud.txt b/requirements/static/ci/py3.10/cloud.txt index d824ccaef96..0fd1d6fb3db 100644 --- a/requirements/static/ci/py3.10/cloud.txt +++ b/requirements/static/ci/py3.10/cloud.txt @@ -335,7 +335,7 @@ bcrypt==3.2.0 # via # paramiko # passlib -boto3==1.21.46 ; python_version >= "3.6" +boto3==1.21.46 # via # -r requirements/static/ci/common.in # moto @@ -414,7 +414,7 @@ docker==5.0.2 # via # -r requirements/static/ci/common.in # pytest-salt-factories -etcd3-py==0.1.6 ; python_version >= "3.6" +etcd3-py==0.1.6 # via -r requirements/static/ci/common.in exceptiongroup==1.0.4 # via pytest @@ -432,7 +432,7 @@ geomet==0.2.1.post1 # via cassandra-driver gitdb==4.0.7 # via gitpython -gitpython==3.1.32 ; python_version >= "3.7" +gitpython==3.1.32 # via -r requirements/static/ci/common.in google-auth==2.1.0 # via kubernetes @@ -510,7 +510,7 @@ more-itertools==8.8.0 # cherrypy # jaraco.classes # jaraco.functools -moto==3.0.1 ; python_version >= "3.6" +moto==3.0.1 # via -r requirements/static/ci/common.in msgpack==1.0.2 # via @@ -717,7 +717,7 @@ pytest-tempdir==2019.10.12 # pytest-salt-factories pytest-timeout==2.0.2 # via -r requirements/pytest.txt -pytest==7.2.0 ; python_version > "3.6" +pytest==7.2.0 # via # -r requirements/pytest.txt # pytest-custom-exit-code diff --git a/requirements/static/ci/py3.10/darwin.txt b/requirements/static/ci/py3.10/darwin.txt index 84d153a310b..8e43b9a0371 100644 --- a/requirements/static/ci/py3.10/darwin.txt +++ b/requirements/static/ci/py3.10/darwin.txt @@ -335,7 +335,7 @@ bcrypt==3.1.6 # via # paramiko # passlib -boto3==1.21.46 ; python_version >= "3.6" +boto3==1.21.46 # via # -r requirements/static/ci/common.in # moto @@ -412,7 +412,7 @@ docker==5.0.3 # via # -r requirements/static/ci/common.in # pytest-salt-factories -etcd3-py==0.1.6 ; python_version >= "3.6" +etcd3-py==0.1.6 # via -r requirements/static/ci/common.in exceptiongroup==1.0.4 # via pytest @@ -430,7 +430,7 @@ geomet==0.1.2 # via cassandra-driver gitdb==4.0.5 # via gitpython -gitpython==3.1.32 ; python_version >= "3.7" +gitpython==3.1.32 # via # -r requirements/darwin.txt # -r requirements/static/ci/common.in @@ -513,7 +513,7 @@ more-itertools==8.2.0 # cherrypy # jaraco.classes # jaraco.functools -moto==3.0.1 ; python_version >= "3.6" +moto==3.0.1 # via -r requirements/static/ci/common.in msgpack==1.0.2 # via @@ -664,7 +664,7 @@ pycparser==2.21 ; python_version >= "3.9" # cffi pycryptodomex==3.9.8 # via -r requirements/crypto.txt -pygit2==1.9.1 ; python_version >= "3.7" +pygit2==1.9.1 # via -r requirements/static/ci/darwin.in pyjwt==2.4.0 # via adal @@ -712,7 +712,7 @@ pytest-tempdir==2019.10.12 # pytest-salt-factories pytest-timeout==1.4.2 # via -r requirements/pytest.txt -pytest==7.2.0 ; python_version > "3.6" +pytest==7.2.0 # via # -r requirements/pytest.txt # pytest-custom-exit-code diff --git a/requirements/static/ci/py3.10/freebsd.txt b/requirements/static/ci/py3.10/freebsd.txt index e4ac6666cad..b17de0c8156 100644 --- a/requirements/static/ci/py3.10/freebsd.txt +++ b/requirements/static/ci/py3.10/freebsd.txt @@ -333,7 +333,7 @@ bcrypt==3.1.6 # via # paramiko # passlib -boto3==1.21.46 ; python_version >= "3.6" +boto3==1.21.46 # via # -r requirements/static/ci/common.in # moto @@ -411,7 +411,7 @@ docker==5.0.3 # via # -r requirements/static/ci/common.in # pytest-salt-factories -etcd3-py==0.1.6 ; python_version >= "3.6" +etcd3-py==0.1.6 # via -r requirements/static/ci/common.in exceptiongroup==1.0.4 # via pytest @@ -429,7 +429,7 @@ geomet==0.2.1.post1 # via cassandra-driver gitdb==4.0.5 # via gitpython -gitpython==3.1.32 ; python_version >= "3.7" +gitpython==3.1.32 # via -r requirements/static/ci/common.in google-auth==1.6.3 # via kubernetes @@ -511,7 +511,7 @@ more-itertools==5.0.0 # cherrypy # jaraco.classes # jaraco.functools -moto==3.0.1 ; python_version >= "3.6" +moto==3.0.1 # via -r requirements/static/ci/common.in msgpack==1.0.2 # via @@ -662,7 +662,7 @@ pycparser==2.21 ; python_version >= "3.9" # cffi pycryptodomex==3.9.8 # via -r requirements/crypto.txt -pygit2==1.8.0 ; python_version >= "3.7" +pygit2==1.8.0 # via -r requirements/static/ci/freebsd.in pyinotify==0.9.6 ; sys_platform != "win32" and sys_platform != "darwin" and platform_system != "openbsd" # via -r requirements/static/ci/common.in @@ -712,7 +712,7 @@ pytest-tempdir==2019.10.12 # pytest-salt-factories pytest-timeout==1.4.2 # via -r requirements/pytest.txt -pytest==7.2.0 ; python_version > "3.6" +pytest==7.2.0 # via # -r requirements/pytest.txt # pytest-custom-exit-code diff --git a/requirements/static/ci/py3.10/lint.txt b/requirements/static/ci/py3.10/lint.txt index dae28399872..f5a55633c4a 100644 --- a/requirements/static/ci/py3.10/lint.txt +++ b/requirements/static/ci/py3.10/lint.txt @@ -336,7 +336,7 @@ bcrypt==3.2.0 # via # paramiko # passlib -boto3==1.21.46 ; python_version >= "3.6" +boto3==1.21.46 # via # -r requirements/static/ci/common.in # moto @@ -413,7 +413,7 @@ dnspython==2.1.0 # python-etcd docker==5.0.0 # via -r requirements/static/ci/common.in -etcd3-py==0.1.6 ; python_version >= "3.6" +etcd3-py==0.1.6 # via -r requirements/static/ci/common.in filelock==3.0.12 # via virtualenv @@ -427,7 +427,7 @@ geomet==0.2.1.post1 # via cassandra-driver gitdb==4.0.7 # via gitpython -gitpython==3.1.32 ; python_version >= "3.7" +gitpython==3.1.32 # via -r requirements/static/ci/common.in google-auth==2.0.1 # via kubernetes @@ -514,7 +514,7 @@ more-itertools==8.8.0 # cherrypy # jaraco.classes # jaraco.functools -moto==3.0.1 ; python_version >= "3.6" +moto==3.0.1 # via -r requirements/static/ci/common.in msgpack==1.0.2 # via -r requirements/base.txt @@ -671,7 +671,7 @@ pylint==2.4.4 # via # -r requirements/static/ci/lint.in # saltpylint -pymysql==1.0.2 ; python_version > "3.5" +pymysql==1.0.2 # via -r requirements/static/ci/linux.in pynacl==1.5.0 # via @@ -706,7 +706,7 @@ python-etcd==0.4.5 # via -r requirements/static/ci/common.in python-gnupg==0.4.8 # via -r requirements/static/pkg/linux.in -python-telegram-bot==13.7 ; python_version > "3.5" +python-telegram-bot==13.7 # via -r requirements/static/ci/linux.in pytz==2022.1 # via diff --git a/requirements/static/ci/py3.10/linux.txt b/requirements/static/ci/py3.10/linux.txt index 35207680b2f..ba85e91fdc9 100644 --- a/requirements/static/ci/py3.10/linux.txt +++ b/requirements/static/ci/py3.10/linux.txt @@ -344,7 +344,7 @@ bcrypt==3.1.6 # via # paramiko # passlib -boto3==1.21.46 ; python_version >= "3.6" +boto3==1.21.46 # via # -r requirements/static/ci/common.in # moto @@ -425,7 +425,7 @@ docker==5.0.3 # via # -r requirements/static/ci/common.in # pytest-salt-factories -etcd3-py==0.1.6 ; python_version >= "3.6" +etcd3-py==0.1.6 # via -r requirements/static/ci/common.in exceptiongroup==1.0.4 # via pytest @@ -443,7 +443,7 @@ geomet==0.1.2 # via cassandra-driver gitdb==4.0.5 # via gitpython -gitpython==3.1.32 ; python_version >= "3.7" +gitpython==3.1.32 # via -r requirements/static/ci/common.in google-auth==1.6.3 # via kubernetes @@ -526,7 +526,7 @@ more-itertools==5.0.0 # cherrypy # jaraco.classes # jaraco.functools -moto==3.0.1 ; python_version >= "3.6" +moto==3.0.1 # via -r requirements/static/ci/common.in msgpack==1.0.2 # via @@ -685,7 +685,7 @@ pyjwt==2.4.0 # via # adal # twilio -pymysql==1.0.2 ; python_version > "3.5" +pymysql==1.0.2 # via -r requirements/static/ci/linux.in pynacl==1.5.0 # via @@ -729,7 +729,7 @@ pytest-tempdir==2019.10.12 # pytest-salt-factories pytest-timeout==1.4.2 # via -r requirements/pytest.txt -pytest==7.2.0 ; python_version > "3.6" +pytest==7.2.0 # via # -r requirements/pytest.txt # pytest-custom-exit-code @@ -758,7 +758,7 @@ python-etcd==0.4.5 # via -r requirements/static/ci/common.in python-gnupg==0.4.8 # via -r requirements/static/pkg/linux.in -python-telegram-bot==13.7 ; python_version > "3.5" +python-telegram-bot==13.7 # via -r requirements/static/ci/linux.in pytz==2022.1 # via diff --git a/requirements/static/ci/py3.10/pkgtests-windows.txt b/requirements/static/ci/py3.10/pkgtests-windows.txt index de7ee93e182..88e31addbb2 100644 --- a/requirements/static/ci/py3.10/pkgtests-windows.txt +++ b/requirements/static/ci/py3.10/pkgtests-windows.txt @@ -128,7 +128,7 @@ pytest==7.2.1 # pytest-skip-markers # pytest-system-statistics # pytest-tempdir -pythonnet==3.0.1 ; python_version >= "3.7" +pythonnet==3.0.1 # via -r requirements/static/ci/pkgtests-windows.in pytz==2022.7.1 # via tempora diff --git a/requirements/static/ci/py3.10/windows.txt b/requirements/static/ci/py3.10/windows.txt index 218a65c8ec7..66bd0d7590c 100644 --- a/requirements/static/ci/py3.10/windows.txt +++ b/requirements/static/ci/py3.10/windows.txt @@ -21,7 +21,7 @@ attrs==20.3.0 # pytest-system-statistics bcrypt==4.0.1 # via passlib -boto3==1.21.46 ; python_version >= "3.6" +boto3==1.21.46 # via # -r requirements/static/ci/common.in # moto @@ -95,7 +95,7 @@ docker-pycreds==0.4.0 # via docker docker==2.7.0 # via -r requirements/static/ci/common.in -etcd3-py==0.1.6 ; python_version >= "3.6" +etcd3-py==0.1.6 # via -r requirements/static/ci/common.in exceptiongroup==1.0.4 # via pytest @@ -113,7 +113,7 @@ geomet==0.1.2 # via cassandra-driver gitdb==4.0.7 # via gitpython -gitpython==3.1.32 ; python_version >= "3.7" +gitpython==3.1.32 # via # -r requirements/static/ci/common.in # -r requirements/windows.txt @@ -182,7 +182,7 @@ more-itertools==8.2.0 # cherrypy # jaraco.classes # jaraco.functools -moto==3.0.1 ; python_version >= "3.6" +moto==3.0.1 # via -r requirements/static/ci/common.in msgpack==1.0.2 # via @@ -232,7 +232,7 @@ pycparser==2.21 ; python_version >= "3.9" # cffi pycryptodomex==3.10.1 # via -r requirements/crypto.txt -pygit2==1.9.1 ; python_version >= "3.7" +pygit2==1.9.1 # via -r requirements/static/ci/windows.in pymssql==2.2.7 # via -r requirements/windows.txt @@ -276,7 +276,7 @@ pytest-tempdir==2019.10.12 # pytest-salt-factories pytest-timeout==2.1.0 # via -r requirements/pytest.txt -pytest==7.2.0 ; python_version > "3.6" +pytest==7.2.0 # via # -r requirements/pytest.txt # pytest-custom-exit-code diff --git a/requirements/static/ci/py3.7/cloud.txt b/requirements/static/ci/py3.7/cloud.txt index 17d3dba3318..84a48dd4102 100644 --- a/requirements/static/ci/py3.7/cloud.txt +++ b/requirements/static/ci/py3.7/cloud.txt @@ -337,7 +337,7 @@ bcrypt==3.2.0 # via # paramiko # passlib -boto3==1.21.46 ; python_version >= "3.6" +boto3==1.21.46 # via # -r requirements/static/ci/common.in # moto @@ -422,7 +422,7 @@ docker==5.0.2 # via # -r requirements/static/ci/common.in # pytest-salt-factories -etcd3-py==0.1.6 ; python_version >= "3.6" +etcd3-py==0.1.6 # via -r requirements/static/ci/common.in exceptiongroup==1.0.4 # via pytest @@ -444,7 +444,7 @@ geomet==0.2.1.post1 # via cassandra-driver gitdb==4.0.7 # via gitpython -gitpython==3.1.32 ; python_version >= "3.7" +gitpython==3.1.32 # via -r requirements/static/ci/common.in google-auth==2.1.0 # via kubernetes @@ -537,7 +537,7 @@ more-itertools==8.8.0 # cherrypy # jaraco.classes # jaraco.functools -moto==3.0.1 ; python_version >= "3.6" +moto==3.0.1 # via -r requirements/static/ci/common.in msgpack==1.0.2 # via @@ -639,7 +639,7 @@ multidict==6.0.2 # via # aiohttp # yarl -napalm==3.3.1 ; sys_platform != "win32" and python_version > "3.6" and python_version < "3.10" +napalm==3.3.1 ; sys_platform != "win32" and python_version < "3.10" # via -r requirements/static/ci/common.in ncclient==0.6.12 # via @@ -761,7 +761,7 @@ pytest-tempdir==2019.10.12 # pytest-salt-factories pytest-timeout==2.0.2 # via -r requirements/pytest.txt -pytest==7.2.0 ; python_version > "3.6" +pytest==7.2.0 # via # -r requirements/pytest.txt # pytest-custom-exit-code diff --git a/requirements/static/ci/py3.7/freebsd.txt b/requirements/static/ci/py3.7/freebsd.txt index 9842a5c61e8..6378d6f687b 100644 --- a/requirements/static/ci/py3.7/freebsd.txt +++ b/requirements/static/ci/py3.7/freebsd.txt @@ -335,7 +335,7 @@ bcrypt==3.1.6 # via # paramiko # passlib -boto3==1.21.46 ; python_version >= "3.6" +boto3==1.21.46 # via # -r requirements/static/ci/common.in # moto @@ -419,7 +419,7 @@ docker==5.0.3 # via # -r requirements/static/ci/common.in # pytest-salt-factories -etcd3-py==0.1.6 ; python_version >= "3.6" +etcd3-py==0.1.6 # via -r requirements/static/ci/common.in exceptiongroup==1.0.4 # via pytest @@ -441,7 +441,7 @@ geomet==0.2.1.post1 # via cassandra-driver gitdb==4.0.5 # via gitpython -gitpython==3.1.32 ; python_version >= "3.7" +gitpython==3.1.32 # via -r requirements/static/ci/common.in google-auth==1.6.3 # via kubernetes @@ -535,7 +535,7 @@ more-itertools==5.0.0 # cherrypy # jaraco.classes # jaraco.functools -moto==3.0.1 ; python_version >= "3.6" +moto==3.0.1 # via -r requirements/static/ci/common.in msgpack==1.0.2 # via @@ -637,7 +637,7 @@ multidict==6.0.2 # via # aiohttp # yarl -napalm==3.1.0 ; sys_platform != "win32" and python_version > "3.6" and python_version < "3.10" +napalm==3.1.0 ; sys_platform != "win32" and python_version < "3.10" # via -r requirements/static/ci/common.in ncclient==0.6.4 # via junos-eznc @@ -698,7 +698,7 @@ pycryptodomex==3.9.8 # via -r requirements/crypto.txt pyeapi==0.8.3 # via napalm -pygit2==1.8.0 ; python_version >= "3.7" +pygit2==1.8.0 # via -r requirements/static/ci/freebsd.in pyinotify==0.9.6 ; sys_platform != "win32" and sys_platform != "darwin" and platform_system != "openbsd" # via -r requirements/static/ci/common.in @@ -750,7 +750,7 @@ pytest-tempdir==2019.10.12 # pytest-salt-factories pytest-timeout==1.4.2 # via -r requirements/pytest.txt -pytest==7.2.0 ; python_version > "3.6" +pytest==7.2.0 # via # -r requirements/pytest.txt # pytest-custom-exit-code diff --git a/requirements/static/ci/py3.7/lint.txt b/requirements/static/ci/py3.7/lint.txt index 9d08fbbd9fd..0bfa44f611b 100644 --- a/requirements/static/ci/py3.7/lint.txt +++ b/requirements/static/ci/py3.7/lint.txt @@ -340,7 +340,7 @@ bcrypt==3.2.0 # via # paramiko # passlib -boto3==1.21.46 ; python_version >= "3.6" +boto3==1.21.46 # via # -r requirements/static/ci/common.in # moto @@ -423,7 +423,7 @@ dnspython==2.1.0 # python-etcd docker==5.0.0 # via -r requirements/static/ci/common.in -etcd3-py==0.1.6 ; python_version >= "3.6" +etcd3-py==0.1.6 # via -r requirements/static/ci/common.in filelock==3.0.12 # via virtualenv @@ -441,7 +441,7 @@ geomet==0.2.1.post1 # via cassandra-driver gitdb==4.0.7 # via gitpython -gitpython==3.1.32 ; python_version >= "3.7" +gitpython==3.1.32 # via -r requirements/static/ci/common.in google-auth==2.0.1 # via kubernetes @@ -541,7 +541,7 @@ more-itertools==8.8.0 # cherrypy # jaraco.classes # jaraco.functools -moto==3.0.1 ; python_version >= "3.6" +moto==3.0.1 # via -r requirements/static/ci/common.in msgpack==1.0.2 # via -r requirements/base.txt @@ -641,7 +641,7 @@ multidict==6.0.2 # via # aiohttp # yarl -napalm==3.3.1 ; sys_platform != "win32" and python_version > "3.6" and python_version < "3.10" +napalm==3.3.1 ; sys_platform != "win32" and python_version < "3.10" # via -r requirements/static/ci/common.in ncclient==0.6.12 # via @@ -714,7 +714,7 @@ pylint==2.4.4 # via # -r requirements/static/ci/lint.in # saltpylint -pymysql==1.0.2 ; python_version > "3.5" +pymysql==1.0.2 # via -r requirements/static/ci/linux.in pynacl==1.5.0 # via @@ -751,7 +751,7 @@ python-etcd==0.4.5 # via -r requirements/static/ci/common.in python-gnupg==0.4.8 # via -r requirements/static/pkg/linux.in -python-telegram-bot==13.7 ; python_version > "3.5" +python-telegram-bot==13.7 # via -r requirements/static/ci/linux.in pytz==2022.1 # via diff --git a/requirements/static/ci/py3.7/linux.txt b/requirements/static/ci/py3.7/linux.txt index 1712ddc501b..52202b23cd1 100644 --- a/requirements/static/ci/py3.7/linux.txt +++ b/requirements/static/ci/py3.7/linux.txt @@ -346,7 +346,7 @@ bcrypt==3.1.6 # via # paramiko # passlib -boto3==1.21.46 ; python_version >= "3.6" +boto3==1.21.46 # via # -r requirements/static/ci/common.in # moto @@ -433,7 +433,7 @@ docker==5.0.3 # via # -r requirements/static/ci/common.in # pytest-salt-factories -etcd3-py==0.1.6 ; python_version >= "3.6" +etcd3-py==0.1.6 # via -r requirements/static/ci/common.in exceptiongroup==1.0.4 # via pytest @@ -455,7 +455,7 @@ geomet==0.1.2 # via cassandra-driver gitdb==4.0.5 # via gitpython -gitpython==3.1.32 ; python_version >= "3.7" +gitpython==3.1.32 # via -r requirements/static/ci/common.in google-auth==1.6.3 # via kubernetes @@ -550,7 +550,7 @@ more-itertools==5.0.0 # cherrypy # jaraco.classes # jaraco.functools -moto==3.0.1 ; python_version >= "3.6" +moto==3.0.1 # via -r requirements/static/ci/common.in msgpack==1.0.2 # via @@ -649,7 +649,7 @@ multidict==6.0.2 # via # aiohttp # yarl -napalm==3.1.0 ; sys_platform != "win32" and python_version > "3.6" and python_version < "3.10" +napalm==3.1.0 ; sys_platform != "win32" and python_version < "3.10" # via -r requirements/static/ci/common.in ncclient==0.6.4 # via junos-eznc @@ -721,7 +721,7 @@ pyjwt==2.4.0 # via # adal # twilio -pymysql==1.0.2 ; python_version > "3.5" +pymysql==1.0.2 # via -r requirements/static/ci/linux.in pynacl==1.5.0 # via @@ -769,7 +769,7 @@ pytest-tempdir==2019.10.12 # pytest-salt-factories pytest-timeout==1.4.2 # via -r requirements/pytest.txt -pytest==7.2.0 ; python_version > "3.6" +pytest==7.2.0 # via # -r requirements/pytest.txt # pytest-custom-exit-code @@ -798,7 +798,7 @@ python-etcd==0.4.5 # via -r requirements/static/ci/common.in python-gnupg==0.4.8 # via -r requirements/static/pkg/linux.in -python-telegram-bot==13.7 ; python_version > "3.5" +python-telegram-bot==13.7 # via -r requirements/static/ci/linux.in pytz==2022.1 # via diff --git a/requirements/static/ci/py3.7/windows.txt b/requirements/static/ci/py3.7/windows.txt index 427ffbccb61..070b7829a16 100644 --- a/requirements/static/ci/py3.7/windows.txt +++ b/requirements/static/ci/py3.7/windows.txt @@ -25,7 +25,7 @@ backports.entry-points-selectable==1.1.0 # via virtualenv bcrypt==4.0.1 # via passlib -boto3==1.21.46 ; python_version >= "3.6" +boto3==1.21.46 # via # -r requirements/static/ci/common.in # moto @@ -101,7 +101,7 @@ docker-pycreds==0.4.0 # via docker docker==2.7.0 # via -r requirements/static/ci/common.in -etcd3-py==0.1.6 ; python_version >= "3.6" +etcd3-py==0.1.6 # via -r requirements/static/ci/common.in exceptiongroup==1.0.4 # via pytest @@ -119,7 +119,7 @@ geomet==0.1.2 # via cassandra-driver gitdb==4.0.7 # via gitpython -gitpython==3.1.32 ; python_version >= "3.7" +gitpython==3.1.32 # via # -r requirements/static/ci/common.in # -r requirements/windows.txt @@ -196,7 +196,7 @@ more-itertools==8.2.0 # cherrypy # jaraco.classes # jaraco.functools -moto==3.0.1 ; python_version >= "3.6" +moto==3.0.1 # via -r requirements/static/ci/common.in msgpack==1.0.2 # via @@ -245,7 +245,7 @@ pycparser==2.21 # cffi pycryptodomex==3.10.1 # via -r requirements/crypto.txt -pygit2==1.9.1 ; python_version >= "3.7" +pygit2==1.9.1 # via -r requirements/static/ci/windows.in pymssql==2.2.1 # via -r requirements/windows.txt @@ -289,7 +289,7 @@ pytest-tempdir==2019.10.12 # pytest-salt-factories pytest-timeout==1.4.2 # via -r requirements/pytest.txt -pytest==7.2.0 ; python_version > "3.6" +pytest==7.2.0 # via # -r requirements/pytest.txt # pytest-custom-exit-code diff --git a/requirements/static/ci/py3.8/cloud.txt b/requirements/static/ci/py3.8/cloud.txt index 719a9e8017f..f745c38d137 100644 --- a/requirements/static/ci/py3.8/cloud.txt +++ b/requirements/static/ci/py3.8/cloud.txt @@ -335,7 +335,7 @@ bcrypt==3.2.0 # via # paramiko # passlib -boto3==1.21.46 ; python_version >= "3.6" +boto3==1.21.46 # via # -r requirements/static/ci/common.in # moto @@ -420,7 +420,7 @@ docker==5.0.2 # via # -r requirements/static/ci/common.in # pytest-salt-factories -etcd3-py==0.1.6 ; python_version >= "3.6" +etcd3-py==0.1.6 # via -r requirements/static/ci/common.in exceptiongroup==1.0.4 # via pytest @@ -442,7 +442,7 @@ geomet==0.2.1.post1 # via cassandra-driver gitdb==4.0.7 # via gitpython -gitpython==3.1.32 ; python_version >= "3.7" +gitpython==3.1.32 # via -r requirements/static/ci/common.in google-auth==2.1.0 # via kubernetes @@ -526,7 +526,7 @@ more-itertools==8.8.0 # cherrypy # jaraco.classes # jaraco.functools -moto==3.0.1 ; python_version >= "3.6" +moto==3.0.1 # via -r requirements/static/ci/common.in msgpack==1.0.2 # via @@ -628,7 +628,7 @@ multidict==6.0.2 # via # aiohttp # yarl -napalm==3.3.1 ; sys_platform != "win32" and python_version > "3.6" and python_version < "3.10" +napalm==3.3.1 ; sys_platform != "win32" and python_version < "3.10" # via -r requirements/static/ci/common.in ncclient==0.6.12 # via @@ -750,7 +750,7 @@ pytest-tempdir==2019.10.12 # pytest-salt-factories pytest-timeout==2.0.2 # via -r requirements/pytest.txt -pytest==7.2.0 ; python_version > "3.6" +pytest==7.2.0 # via # -r requirements/pytest.txt # pytest-custom-exit-code diff --git a/requirements/static/ci/py3.8/freebsd.txt b/requirements/static/ci/py3.8/freebsd.txt index 72fed05bd52..5523d07759f 100644 --- a/requirements/static/ci/py3.8/freebsd.txt +++ b/requirements/static/ci/py3.8/freebsd.txt @@ -333,7 +333,7 @@ bcrypt==3.1.6 # via # paramiko # passlib -boto3==1.21.46 ; python_version >= "3.6" +boto3==1.21.46 # via # -r requirements/static/ci/common.in # moto @@ -417,7 +417,7 @@ docker==5.0.3 # via # -r requirements/static/ci/common.in # pytest-salt-factories -etcd3-py==0.1.6 ; python_version >= "3.6" +etcd3-py==0.1.6 # via -r requirements/static/ci/common.in exceptiongroup==1.0.4 # via pytest @@ -439,7 +439,7 @@ geomet==0.2.1.post1 # via cassandra-driver gitdb==4.0.5 # via gitpython -gitpython==3.1.32 ; python_version >= "3.7" +gitpython==3.1.32 # via -r requirements/static/ci/common.in google-auth==1.6.3 # via kubernetes @@ -525,7 +525,7 @@ more-itertools==5.0.0 # cherrypy # jaraco.classes # jaraco.functools -moto==3.0.1 ; python_version >= "3.6" +moto==3.0.1 # via -r requirements/static/ci/common.in msgpack==1.0.2 # via @@ -627,7 +627,7 @@ multidict==6.0.2 # via # aiohttp # yarl -napalm==3.1.0 ; sys_platform != "win32" and python_version > "3.6" and python_version < "3.10" +napalm==3.1.0 ; sys_platform != "win32" and python_version < "3.10" # via -r requirements/static/ci/common.in ncclient==0.6.4 # via junos-eznc @@ -688,7 +688,7 @@ pycryptodomex==3.9.8 # via -r requirements/crypto.txt pyeapi==0.8.3 # via napalm -pygit2==1.8.0 ; python_version >= "3.7" +pygit2==1.8.0 # via -r requirements/static/ci/freebsd.in pyinotify==0.9.6 ; sys_platform != "win32" and sys_platform != "darwin" and platform_system != "openbsd" # via -r requirements/static/ci/common.in @@ -740,7 +740,7 @@ pytest-tempdir==2019.10.12 # pytest-salt-factories pytest-timeout==1.4.2 # via -r requirements/pytest.txt -pytest==7.2.0 ; python_version > "3.6" +pytest==7.2.0 # via # -r requirements/pytest.txt # pytest-custom-exit-code diff --git a/requirements/static/ci/py3.8/lint.txt b/requirements/static/ci/py3.8/lint.txt index a4c9f88df2c..eb9ccf647d7 100644 --- a/requirements/static/ci/py3.8/lint.txt +++ b/requirements/static/ci/py3.8/lint.txt @@ -338,7 +338,7 @@ bcrypt==3.2.0 # via # paramiko # passlib -boto3==1.21.46 ; python_version >= "3.6" +boto3==1.21.46 # via # -r requirements/static/ci/common.in # moto @@ -421,7 +421,7 @@ dnspython==2.1.0 # python-etcd docker==5.0.0 # via -r requirements/static/ci/common.in -etcd3-py==0.1.6 ; python_version >= "3.6" +etcd3-py==0.1.6 # via -r requirements/static/ci/common.in filelock==3.0.12 # via virtualenv @@ -439,7 +439,7 @@ geomet==0.2.1.post1 # via cassandra-driver gitdb==4.0.7 # via gitpython -gitpython==3.1.32 ; python_version >= "3.7" +gitpython==3.1.32 # via -r requirements/static/ci/common.in google-auth==2.0.1 # via kubernetes @@ -532,7 +532,7 @@ more-itertools==8.8.0 # cherrypy # jaraco.classes # jaraco.functools -moto==3.0.1 ; python_version >= "3.6" +moto==3.0.1 # via -r requirements/static/ci/common.in msgpack==1.0.2 # via -r requirements/base.txt @@ -632,7 +632,7 @@ multidict==6.0.2 # via # aiohttp # yarl -napalm==3.3.1 ; sys_platform != "win32" and python_version > "3.6" and python_version < "3.10" +napalm==3.3.1 ; sys_platform != "win32" and python_version < "3.10" # via -r requirements/static/ci/common.in ncclient==0.6.12 # via @@ -705,7 +705,7 @@ pylint==2.4.4 # via # -r requirements/static/ci/lint.in # saltpylint -pymysql==1.0.2 ; python_version > "3.5" +pymysql==1.0.2 # via -r requirements/static/ci/linux.in pynacl==1.5.0 # via @@ -742,7 +742,7 @@ python-etcd==0.4.5 # via -r requirements/static/ci/common.in python-gnupg==0.4.8 # via -r requirements/static/pkg/linux.in -python-telegram-bot==13.7 ; python_version > "3.5" +python-telegram-bot==13.7 # via -r requirements/static/ci/linux.in pytz==2022.1 # via diff --git a/requirements/static/ci/py3.8/linux.txt b/requirements/static/ci/py3.8/linux.txt index 813e472060b..73f4b260208 100644 --- a/requirements/static/ci/py3.8/linux.txt +++ b/requirements/static/ci/py3.8/linux.txt @@ -344,7 +344,7 @@ bcrypt==3.1.6 # via # paramiko # passlib -boto3==1.21.46 ; python_version >= "3.6" +boto3==1.21.46 # via # -r requirements/static/ci/common.in # moto @@ -431,7 +431,7 @@ docker==5.0.3 # via # -r requirements/static/ci/common.in # pytest-salt-factories -etcd3-py==0.1.6 ; python_version >= "3.6" +etcd3-py==0.1.6 # via -r requirements/static/ci/common.in exceptiongroup==1.0.4 # via pytest @@ -453,7 +453,7 @@ geomet==0.1.2 # via cassandra-driver gitdb==4.0.5 # via gitpython -gitpython==3.1.32 ; python_version >= "3.7" +gitpython==3.1.32 # via -r requirements/static/ci/common.in google-auth==1.6.3 # via kubernetes @@ -540,7 +540,7 @@ more-itertools==5.0.0 # cherrypy # jaraco.classes # jaraco.functools -moto==3.0.1 ; python_version >= "3.6" +moto==3.0.1 # via -r requirements/static/ci/common.in msgpack==1.0.2 # via @@ -639,7 +639,7 @@ multidict==6.0.2 # via # aiohttp # yarl -napalm==3.1.0 ; sys_platform != "win32" and python_version > "3.6" and python_version < "3.10" +napalm==3.1.0 ; sys_platform != "win32" and python_version < "3.10" # via -r requirements/static/ci/common.in ncclient==0.6.4 # via junos-eznc @@ -711,7 +711,7 @@ pyjwt==2.4.0 # via # adal # twilio -pymysql==1.0.2 ; python_version > "3.5" +pymysql==1.0.2 # via -r requirements/static/ci/linux.in pynacl==1.5.0 # via @@ -757,7 +757,7 @@ pytest-tempdir==2019.10.12 # pytest-salt-factories pytest-timeout==1.4.2 # via -r requirements/pytest.txt -pytest==7.2.0 ; python_version > "3.6" +pytest==7.2.0 # via # -r requirements/pytest.txt # pytest-custom-exit-code @@ -786,7 +786,7 @@ python-etcd==0.4.5 # via -r requirements/static/ci/common.in python-gnupg==0.4.8 # via -r requirements/static/pkg/linux.in -python-telegram-bot==13.7 ; python_version > "3.5" +python-telegram-bot==13.7 # via -r requirements/static/ci/linux.in pytz==2022.1 # via diff --git a/requirements/static/ci/py3.8/windows.txt b/requirements/static/ci/py3.8/windows.txt index a569f4cc57e..42339f24695 100644 --- a/requirements/static/ci/py3.8/windows.txt +++ b/requirements/static/ci/py3.8/windows.txt @@ -23,7 +23,7 @@ backports.entry-points-selectable==1.1.0 # via virtualenv bcrypt==4.0.1 # via passlib -boto3==1.21.46 ; python_version >= "3.6" +boto3==1.21.46 # via # -r requirements/static/ci/common.in # moto @@ -97,7 +97,7 @@ docker-pycreds==0.4.0 # via docker docker==2.7.0 # via -r requirements/static/ci/common.in -etcd3-py==0.1.6 ; python_version >= "3.6" +etcd3-py==0.1.6 # via -r requirements/static/ci/common.in exceptiongroup==1.0.4 # via pytest @@ -115,7 +115,7 @@ geomet==0.1.2 # via cassandra-driver gitdb==4.0.7 # via gitpython -gitpython==3.1.32 ; python_version >= "3.7" +gitpython==3.1.32 # via # -r requirements/static/ci/common.in # -r requirements/windows.txt @@ -184,7 +184,7 @@ more-itertools==8.2.0 # cherrypy # jaraco.classes # jaraco.functools -moto==3.0.1 ; python_version >= "3.6" +moto==3.0.1 # via -r requirements/static/ci/common.in msgpack==1.0.2 # via @@ -233,7 +233,7 @@ pycparser==2.21 # cffi pycryptodomex==3.10.1 # via -r requirements/crypto.txt -pygit2==1.9.1 ; python_version >= "3.7" +pygit2==1.9.1 # via -r requirements/static/ci/windows.in pymssql==2.2.1 # via -r requirements/windows.txt @@ -277,7 +277,7 @@ pytest-tempdir==2019.10.12 # pytest-salt-factories pytest-timeout==1.4.2 # via -r requirements/pytest.txt -pytest==7.2.0 ; python_version > "3.6" +pytest==7.2.0 # via # -r requirements/pytest.txt # pytest-custom-exit-code diff --git a/requirements/static/ci/py3.9/cloud.txt b/requirements/static/ci/py3.9/cloud.txt index 96475f41697..db7f5d7a899 100644 --- a/requirements/static/ci/py3.9/cloud.txt +++ b/requirements/static/ci/py3.9/cloud.txt @@ -335,7 +335,7 @@ bcrypt==3.2.0 # via # paramiko # passlib -boto3==1.21.46 ; python_version >= "3.6" +boto3==1.21.46 # via # -r requirements/static/ci/common.in # moto @@ -420,7 +420,7 @@ docker==5.0.2 # via # -r requirements/static/ci/common.in # pytest-salt-factories -etcd3-py==0.1.6 ; python_version >= "3.6" +etcd3-py==0.1.6 # via -r requirements/static/ci/common.in exceptiongroup==1.0.4 # via pytest @@ -442,7 +442,7 @@ geomet==0.2.1.post1 # via cassandra-driver gitdb==4.0.7 # via gitpython -gitpython==3.1.32 ; python_version >= "3.7" +gitpython==3.1.32 # via -r requirements/static/ci/common.in google-auth==2.1.0 # via kubernetes @@ -526,7 +526,7 @@ more-itertools==8.8.0 # cherrypy # jaraco.classes # jaraco.functools -moto==3.0.1 ; python_version >= "3.6" +moto==3.0.1 # via -r requirements/static/ci/common.in msgpack==1.0.2 # via @@ -628,7 +628,7 @@ multidict==6.0.2 # via # aiohttp # yarl -napalm==3.3.1 ; sys_platform != "win32" and python_version > "3.6" and python_version < "3.10" +napalm==3.3.1 ; sys_platform != "win32" and python_version < "3.10" # via -r requirements/static/ci/common.in ncclient==0.6.12 # via @@ -753,7 +753,7 @@ pytest-tempdir==2019.10.12 # pytest-salt-factories pytest-timeout==2.0.2 # via -r requirements/pytest.txt -pytest==7.2.0 ; python_version > "3.6" +pytest==7.2.0 # via # -r requirements/pytest.txt # pytest-custom-exit-code diff --git a/requirements/static/ci/py3.9/darwin.txt b/requirements/static/ci/py3.9/darwin.txt index b7919e3ad5d..e948d5f2bf1 100644 --- a/requirements/static/ci/py3.9/darwin.txt +++ b/requirements/static/ci/py3.9/darwin.txt @@ -335,7 +335,7 @@ bcrypt==3.1.6 # via # paramiko # passlib -boto3==1.21.46 ; python_version >= "3.6" +boto3==1.21.46 # via # -r requirements/static/ci/common.in # moto @@ -418,7 +418,7 @@ docker==5.0.3 # via # -r requirements/static/ci/common.in # pytest-salt-factories -etcd3-py==0.1.6 ; python_version >= "3.6" +etcd3-py==0.1.6 # via -r requirements/static/ci/common.in exceptiongroup==1.0.4 # via pytest @@ -440,7 +440,7 @@ geomet==0.1.2 # via cassandra-driver gitdb==4.0.5 # via gitpython -gitpython==3.1.32 ; python_version >= "3.7" +gitpython==3.1.32 # via # -r requirements/darwin.txt # -r requirements/static/ci/common.in @@ -527,7 +527,7 @@ more-itertools==8.2.0 # cherrypy # jaraco.classes # jaraco.functools -moto==3.0.1 ; python_version >= "3.6" +moto==3.0.1 # via -r requirements/static/ci/common.in msgpack==1.0.2 # via @@ -629,7 +629,7 @@ multidict==6.0.2 # via # aiohttp # yarl -napalm==3.1.0 ; sys_platform != "win32" and python_version > "3.6" and python_version < "3.10" +napalm==3.1.0 ; sys_platform != "win32" and python_version < "3.10" # via -r requirements/static/ci/common.in ncclient==0.6.4 # via junos-eznc @@ -693,7 +693,7 @@ pycryptodomex==3.9.8 # via -r requirements/crypto.txt pyeapi==0.8.3 # via napalm -pygit2==1.9.1 ; python_version >= "3.7" +pygit2==1.9.1 # via -r requirements/static/ci/darwin.in pyjwt==2.4.0 # via adal @@ -743,7 +743,7 @@ pytest-tempdir==2019.10.12 # pytest-salt-factories pytest-timeout==1.4.2 # via -r requirements/pytest.txt -pytest==7.2.0 ; python_version > "3.6" +pytest==7.2.0 # via # -r requirements/pytest.txt # pytest-custom-exit-code diff --git a/requirements/static/ci/py3.9/freebsd.txt b/requirements/static/ci/py3.9/freebsd.txt index fa800ba551a..f46090934fd 100644 --- a/requirements/static/ci/py3.9/freebsd.txt +++ b/requirements/static/ci/py3.9/freebsd.txt @@ -333,7 +333,7 @@ bcrypt==3.1.6 # via # paramiko # passlib -boto3==1.21.46 ; python_version >= "3.6" +boto3==1.21.46 # via # -r requirements/static/ci/common.in # moto @@ -417,7 +417,7 @@ docker==5.0.3 # via # -r requirements/static/ci/common.in # pytest-salt-factories -etcd3-py==0.1.6 ; python_version >= "3.6" +etcd3-py==0.1.6 # via -r requirements/static/ci/common.in exceptiongroup==1.0.4 # via pytest @@ -439,7 +439,7 @@ geomet==0.2.1.post1 # via cassandra-driver gitdb==4.0.5 # via gitpython -gitpython==3.1.32 ; python_version >= "3.7" +gitpython==3.1.32 # via -r requirements/static/ci/common.in google-auth==1.6.3 # via kubernetes @@ -525,7 +525,7 @@ more-itertools==5.0.0 # cherrypy # jaraco.classes # jaraco.functools -moto==3.0.1 ; python_version >= "3.6" +moto==3.0.1 # via -r requirements/static/ci/common.in msgpack==1.0.2 # via @@ -627,7 +627,7 @@ multidict==6.0.2 # via # aiohttp # yarl -napalm==3.1.0 ; sys_platform != "win32" and python_version > "3.6" and python_version < "3.10" +napalm==3.1.0 ; sys_platform != "win32" and python_version < "3.10" # via -r requirements/static/ci/common.in ncclient==0.6.4 # via junos-eznc @@ -691,7 +691,7 @@ pycryptodomex==3.9.8 # via -r requirements/crypto.txt pyeapi==0.8.3 # via napalm -pygit2==1.8.0 ; python_version >= "3.7" +pygit2==1.8.0 # via -r requirements/static/ci/freebsd.in pyinotify==0.9.6 ; sys_platform != "win32" and sys_platform != "darwin" and platform_system != "openbsd" # via -r requirements/static/ci/common.in @@ -743,7 +743,7 @@ pytest-tempdir==2019.10.12 # pytest-salt-factories pytest-timeout==1.4.2 # via -r requirements/pytest.txt -pytest==7.2.0 ; python_version > "3.6" +pytest==7.2.0 # via # -r requirements/pytest.txt # pytest-custom-exit-code diff --git a/requirements/static/ci/py3.9/lint.txt b/requirements/static/ci/py3.9/lint.txt index 28cce1cc652..c34a07a08d6 100644 --- a/requirements/static/ci/py3.9/lint.txt +++ b/requirements/static/ci/py3.9/lint.txt @@ -336,7 +336,7 @@ bcrypt==3.2.0 # via # paramiko # passlib -boto3==1.21.46 ; python_version >= "3.6" +boto3==1.21.46 # via # -r requirements/static/ci/common.in # moto @@ -419,7 +419,7 @@ dnspython==2.1.0 # python-etcd docker==5.0.0 # via -r requirements/static/ci/common.in -etcd3-py==0.1.6 ; python_version >= "3.6" +etcd3-py==0.1.6 # via -r requirements/static/ci/common.in filelock==3.0.12 # via virtualenv @@ -437,7 +437,7 @@ geomet==0.2.1.post1 # via cassandra-driver gitdb==4.0.7 # via gitpython -gitpython==3.1.32 ; python_version >= "3.7" +gitpython==3.1.32 # via -r requirements/static/ci/common.in google-auth==2.0.1 # via kubernetes @@ -530,7 +530,7 @@ more-itertools==8.8.0 # cherrypy # jaraco.classes # jaraco.functools -moto==3.0.1 ; python_version >= "3.6" +moto==3.0.1 # via -r requirements/static/ci/common.in msgpack==1.0.2 # via -r requirements/base.txt @@ -630,7 +630,7 @@ multidict==6.0.2 # via # aiohttp # yarl -napalm==3.3.1 ; sys_platform != "win32" and python_version > "3.6" and python_version < "3.10" +napalm==3.3.1 ; sys_platform != "win32" and python_version < "3.10" # via -r requirements/static/ci/common.in ncclient==0.6.12 # via @@ -706,7 +706,7 @@ pylint==2.4.4 # via # -r requirements/static/ci/lint.in # saltpylint -pymysql==1.0.2 ; python_version > "3.5" +pymysql==1.0.2 # via -r requirements/static/ci/linux.in pynacl==1.5.0 # via @@ -743,7 +743,7 @@ python-etcd==0.4.5 # via -r requirements/static/ci/common.in python-gnupg==0.4.8 # via -r requirements/static/pkg/linux.in -python-telegram-bot==13.7 ; python_version > "3.5" +python-telegram-bot==13.7 # via -r requirements/static/ci/linux.in pytz==2022.1 # via diff --git a/requirements/static/ci/py3.9/linux.txt b/requirements/static/ci/py3.9/linux.txt index 2b12495b674..60849297f15 100644 --- a/requirements/static/ci/py3.9/linux.txt +++ b/requirements/static/ci/py3.9/linux.txt @@ -344,7 +344,7 @@ bcrypt==3.1.6 # via # paramiko # passlib -boto3==1.21.46 ; python_version >= "3.6" +boto3==1.21.46 # via # -r requirements/static/ci/common.in # moto @@ -433,7 +433,7 @@ docker==5.0.3 # via # -r requirements/static/ci/common.in # pytest-salt-factories -etcd3-py==0.1.6 ; python_version >= "3.6" +etcd3-py==0.1.6 # via -r requirements/static/ci/common.in exceptiongroup==1.0.4 # via pytest @@ -455,7 +455,7 @@ geomet==0.1.2 # via cassandra-driver gitdb==4.0.5 # via gitpython -gitpython==3.1.32 ; python_version >= "3.7" +gitpython==3.1.32 # via -r requirements/static/ci/common.in google-auth==1.6.3 # via kubernetes @@ -542,7 +542,7 @@ more-itertools==5.0.0 # cherrypy # jaraco.classes # jaraco.functools -moto==3.0.1 ; python_version >= "3.6" +moto==3.0.1 # via -r requirements/static/ci/common.in msgpack==1.0.2 # via @@ -641,7 +641,7 @@ multidict==6.0.2 # via # aiohttp # yarl -napalm==3.1.0 ; sys_platform != "win32" and python_version > "3.6" and python_version < "3.10" +napalm==3.1.0 ; sys_platform != "win32" and python_version < "3.10" # via -r requirements/static/ci/common.in ncclient==0.6.4 # via junos-eznc @@ -716,7 +716,7 @@ pyjwt==2.4.0 # via # adal # twilio -pymysql==1.0.2 ; python_version > "3.5" +pymysql==1.0.2 # via -r requirements/static/ci/linux.in pynacl==1.5.0 # via @@ -762,7 +762,7 @@ pytest-tempdir==2019.10.12 # pytest-salt-factories pytest-timeout==1.4.2 # via -r requirements/pytest.txt -pytest==7.2.0 ; python_version > "3.6" +pytest==7.2.0 # via # -r requirements/pytest.txt # pytest-custom-exit-code @@ -791,7 +791,7 @@ python-etcd==0.4.5 # via -r requirements/static/ci/common.in python-gnupg==0.4.8 # via -r requirements/static/pkg/linux.in -python-telegram-bot==13.7 ; python_version > "3.5" +python-telegram-bot==13.7 # via -r requirements/static/ci/linux.in pytz==2022.1 # via diff --git a/requirements/static/ci/py3.9/windows.txt b/requirements/static/ci/py3.9/windows.txt index ca747c4bd01..8a52aac3ade 100644 --- a/requirements/static/ci/py3.9/windows.txt +++ b/requirements/static/ci/py3.9/windows.txt @@ -23,7 +23,7 @@ backports.entry-points-selectable==1.1.0 # via virtualenv bcrypt==4.0.1 # via passlib -boto3==1.21.46 ; python_version >= "3.6" +boto3==1.21.46 # via # -r requirements/static/ci/common.in # moto @@ -97,7 +97,7 @@ docker-pycreds==0.4.0 # via docker docker==2.7.0 # via -r requirements/static/ci/common.in -etcd3-py==0.1.6 ; python_version >= "3.6" +etcd3-py==0.1.6 # via -r requirements/static/ci/common.in exceptiongroup==1.0.4 # via pytest @@ -115,7 +115,7 @@ geomet==0.1.2 # via cassandra-driver gitdb==4.0.7 # via gitpython -gitpython==3.1.32 ; python_version >= "3.7" +gitpython==3.1.32 # via # -r requirements/static/ci/common.in # -r requirements/windows.txt @@ -184,7 +184,7 @@ more-itertools==8.2.0 # cherrypy # jaraco.classes # jaraco.functools -moto==3.0.1 ; python_version >= "3.6" +moto==3.0.1 # via -r requirements/static/ci/common.in msgpack==1.0.2 # via @@ -234,7 +234,7 @@ pycparser==2.21 ; python_version >= "3.9" # cffi pycryptodomex==3.10.1 # via -r requirements/crypto.txt -pygit2==1.9.1 ; python_version >= "3.7" +pygit2==1.9.1 # via -r requirements/static/ci/windows.in pymssql==2.2.1 # via -r requirements/windows.txt @@ -278,7 +278,7 @@ pytest-tempdir==2019.10.12 # pytest-salt-factories pytest-timeout==1.4.2 # via -r requirements/pytest.txt -pytest==7.2.0 ; python_version > "3.6" +pytest==7.2.0 # via # -r requirements/pytest.txt # pytest-custom-exit-code diff --git a/requirements/static/ci/windows.in b/requirements/static/ci/windows.in index b2b7857de46..38fc3fd2e08 100644 --- a/requirements/static/ci/windows.in +++ b/requirements/static/ci/windows.in @@ -1,7 +1,7 @@ # This is a compilation of requirements installed on salt-jenkins git.salt state run dmidecode patch -pygit2>=1.2.0; python_version >= '3.7' +pygit2>=1.2.0 sed pywinrm>=0.4.1 yamllint diff --git a/requirements/static/pkg/freebsd.in b/requirements/static/pkg/freebsd.in index 1e176a3bed5..3780d5b0fd8 100644 --- a/requirements/static/pkg/freebsd.in +++ b/requirements/static/pkg/freebsd.in @@ -2,7 +2,6 @@ # Any non hard dependencies of Salt for FreeBSD can go here cherrypy cryptography>=41.0.3 -backports.ssl_match_hostname>=3.7.0.1; python_version < '3.7' pycparser>=2.21; python_version >= '3.9' pyopenssl>=23.2.0 python-dateutil>=2.8.0 diff --git a/requirements/static/pkg/linux.in b/requirements/static/pkg/linux.in index a47fa824571..937c6d3b204 100644 --- a/requirements/static/pkg/linux.in +++ b/requirements/static/pkg/linux.in @@ -1,7 +1,6 @@ # This file only exists to trigger the right static compiled requirements destination. # Any non hard dependencies of Salt for linux can go here cherrypy -backports.ssl_match_hostname>=3.7.0.1; python_version < '3.7' pycparser>=2.21; python_version >= '3.9' pyopenssl>=23.2.0 python-dateutil>=2.8.0 diff --git a/requirements/static/pkg/py3.10/darwin.txt b/requirements/static/pkg/py3.10/darwin.txt index 29ffba3c654..47c12f9101c 100644 --- a/requirements/static/pkg/py3.10/darwin.txt +++ b/requirements/static/pkg/py3.10/darwin.txt @@ -26,7 +26,7 @@ distro==1.5.0 # via -r requirements/base.txt gitdb==4.0.5 # via gitpython -gitpython==3.1.32 ; python_version >= "3.7" +gitpython==3.1.32 # via -r requirements/darwin.txt idna==2.8 # via diff --git a/requirements/static/pkg/py3.10/windows.txt b/requirements/static/pkg/py3.10/windows.txt index cb8689efc64..38d35777b84 100644 --- a/requirements/static/pkg/py3.10/windows.txt +++ b/requirements/static/pkg/py3.10/windows.txt @@ -31,7 +31,7 @@ distro==1.5.0 # via -r requirements/base.txt gitdb==4.0.7 # via gitpython -gitpython==3.1.32 ; python_version >= "3.7" +gitpython==3.1.32 # via -r requirements/windows.txt idna==2.8 # via requests diff --git a/requirements/static/pkg/py3.7/windows.txt b/requirements/static/pkg/py3.7/windows.txt index ebe7e57c8aa..d5cb5495afa 100644 --- a/requirements/static/pkg/py3.7/windows.txt +++ b/requirements/static/pkg/py3.7/windows.txt @@ -31,7 +31,7 @@ distro==1.5.0 # via -r requirements/base.txt gitdb==4.0.7 # via gitpython -gitpython==3.1.32 ; python_version >= "3.7" +gitpython==3.1.32 # via -r requirements/windows.txt idna==2.8 # via requests diff --git a/requirements/static/pkg/py3.8/windows.txt b/requirements/static/pkg/py3.8/windows.txt index 22bfc68ae51..7fcd3c74327 100644 --- a/requirements/static/pkg/py3.8/windows.txt +++ b/requirements/static/pkg/py3.8/windows.txt @@ -31,7 +31,7 @@ distro==1.5.0 # via -r requirements/base.txt gitdb==4.0.7 # via gitpython -gitpython==3.1.32 ; python_version >= "3.7" +gitpython==3.1.32 # via -r requirements/windows.txt idna==2.8 # via requests diff --git a/requirements/static/pkg/py3.9/darwin.txt b/requirements/static/pkg/py3.9/darwin.txt index e81cc47fdc3..061a754124c 100644 --- a/requirements/static/pkg/py3.9/darwin.txt +++ b/requirements/static/pkg/py3.9/darwin.txt @@ -26,7 +26,7 @@ distro==1.5.0 # via -r requirements/base.txt gitdb==4.0.5 # via gitpython -gitpython==3.1.32 ; python_version >= "3.7" +gitpython==3.1.32 # via -r requirements/darwin.txt idna==2.8 # via diff --git a/requirements/static/pkg/py3.9/windows.txt b/requirements/static/pkg/py3.9/windows.txt index 60a28ce2e2a..5a026fdbc81 100644 --- a/requirements/static/pkg/py3.9/windows.txt +++ b/requirements/static/pkg/py3.9/windows.txt @@ -31,7 +31,7 @@ distro==1.5.0 # via -r requirements/base.txt gitdb==4.0.7 # via gitpython -gitpython==3.1.32 ; python_version >= "3.7" +gitpython==3.1.32 # via -r requirements/windows.txt idna==2.8 # via requests diff --git a/requirements/windows.txt b/requirements/windows.txt index 998bdd2dadc..7911eef6732 100644 --- a/requirements/windows.txt +++ b/requirements/windows.txt @@ -6,12 +6,11 @@ pywin32>=305 wmi>=1.5.1 pythonnet>=3.0.1 -backports.ssl-match-hostname>=3.7.0.1; python_version < '3.7' certifi>=2022.12.07 cffi>=1.14.5 cherrypy>=18.6.1 cryptography>=41.0.3 -gitpython>=3.1.30; python_version >= '3.7' +gitpython>=3.1.30 ioloop>=0.1a0 lxml>=4.6.3 pyasn1>=0.4.8