saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-16 09:40:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Don't use requirements with extras as that breaks pip constraints usage

Browse source 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
This commit is contained in:
Pedro Algarvio 2023-06-17 20:53:05 +01:00 • committed by Pedro Algarvio
parent b01c195632
commit ced7fea9f4
17 changed files with 66 additions and 86 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
requirements/pytest.txt
View file

@ -1,8 +1,8 @@
mock >= 3.0.0
# PyTest
docker
pytest >= 7.2.0
pytest-salt-factories >= 1.0.0rc21; sys_platform == 'win32'
pytest-salt-factories[docker] >= 1.0.0rc21; sys_platform != 'win32'
pytest-salt-factories >= 1.0.0rc21
pytest-tempdir >= 2019.10.12
pytest-helpers-namespace >= 2019.1.8
pytest-subtests

6
requirements/static/ci/common.in
View file

@ -14,7 +14,6 @@ cherrypy>=17.4.1
clustershell
croniter>=0.3.0,!=0.3.22"; sys_platform != 'win32'
dnspython
docker
etcd3-py==0.1.6
gitpython>=3.1.30
jmespath
@ -29,7 +28,10 @@ libnacl>=1.7.1; sys_platform != 'win32' and sys_platform != 'darwin'
moto>=2.0.0
napalm; sys_platform != 'win32'
paramiko>=2.10.1; sys_platform != 'win32' and sys_platform != 'darwin'
passlib[bcrypt]>=1.7.4
# bcrypt is an extra requirement for passlib, and we shouldn't use extras, like, passlib[bcrypt]
# since that will break using the compiled static requirements files as contraints file
bcrypt
passlib>=1.7.4
pyinotify>=0.9.6; sys_platform != 'win32' and sys_platform != 'darwin' and platform_system != "openbsd"
python-etcd>0.4.2
pyvmomi

10
requirements/static/ci/py3.10/darwin.txt
View file

@ -34,8 +34,8 @@ autocommand==2.2.2
# jaraco.text
bcrypt==4.0.1
# via
# -r requirements/static/ci/common.in
# paramiko
# passlib
boto3==1.26.152
# via
# -r requirements/static/ci/common.in
@ -114,9 +114,7 @@ dnspython==2.3.0
# -r requirements/static/ci/common.in
# python-etcd
docker==6.1.3
# via
# -r requirements/static/ci/common.in
# pytest-salt-factories
# via -r requirements/pytest.txt
etcd3-py==0.1.6
# via -r requirements/static/ci/common.in
exceptiongroup==1.1.1
@ -292,7 +290,7 @@ paramiko==3.2.0
# ncclient
# netmiko
# scp
passlib[bcrypt]==1.7.4
passlib==1.7.4
# via -r requirements/static/ci/common.in
pathspec==0.11.1
# via yamllint
@ -359,7 +357,7 @@ pytest-helpers-namespace==2021.12.29
# pytest-shell-utilities
pytest-httpserver==1.0.8
# via -r requirements/pytest.txt
pytest-salt-factories[docker]==1.0.0rc21 ; sys_platform != "win32"
pytest-salt-factories==1.0.0rc21
# via -r requirements/pytest.txt
pytest-shell-utilities==1.7.0
# via pytest-salt-factories

10
requirements/static/ci/py3.10/freebsd.txt
View file

@ -31,8 +31,8 @@ autocommand==2.2.2
# jaraco.text
bcrypt==4.0.1
# via
# -r requirements/static/ci/common.in
# paramiko
# passlib
boto3==1.26.152
# via
# -r requirements/static/ci/common.in
@ -111,9 +111,7 @@ dnspython==2.3.0
# -r requirements/static/ci/common.in
# python-etcd
docker==6.1.3
# via
# -r requirements/static/ci/common.in
# pytest-salt-factories
# via -r requirements/pytest.txt
etcd3-py==0.1.6
# via -r requirements/static/ci/common.in
exceptiongroup==1.1.1
@ -288,7 +286,7 @@ paramiko==3.2.0 ; sys_platform != "win32" and sys_platform != "darwin"
# ncclient
# netmiko
# scp
passlib[bcrypt]==1.7.4
passlib==1.7.4
# via -r requirements/static/ci/common.in
pathspec==0.11.1
# via yamllint
@ -354,7 +352,7 @@ pytest-helpers-namespace==2021.12.29
# pytest-shell-utilities
pytest-httpserver==1.0.8
# via -r requirements/pytest.txt
pytest-salt-factories[docker]==1.0.0rc21 ; sys_platform != "win32"
pytest-salt-factories==1.0.0rc21
# via -r requirements/pytest.txt
pytest-shell-utilities==1.7.0
# via pytest-salt-factories

10
requirements/static/ci/py3.10/linux.txt
View file

@ -42,8 +42,8 @@ autocommand==2.2.2
# jaraco.text
bcrypt==4.0.1
# via
# -r requirements/static/ci/common.in
# paramiko
# passlib
boto3==1.26.152
# via
# -r requirements/static/ci/common.in
@ -125,9 +125,7 @@ dnspython==2.3.0
# -r requirements/static/ci/common.in
# python-etcd
docker==6.1.3
# via
# -r requirements/static/ci/common.in
# pytest-salt-factories
# via -r requirements/pytest.txt
etcd3-py==0.1.6
# via -r requirements/static/ci/common.in
exceptiongroup==1.1.1
@ -314,7 +312,7 @@ paramiko==3.2.0 ; sys_platform != "win32" and sys_platform != "darwin"
# ncclient
# netmiko
# scp
passlib[bcrypt]==1.7.4
passlib==1.7.4
# via -r requirements/static/ci/common.in
pathspec==0.11.1
# via yamllint
@ -387,7 +385,7 @@ pytest-helpers-namespace==2021.12.29
# pytest-shell-utilities
pytest-httpserver==1.0.8
# via -r requirements/pytest.txt
pytest-salt-factories[docker]==1.0.0rc21 ; sys_platform != "win32"
pytest-salt-factories==1.0.0rc21
# via -r requirements/pytest.txt
pytest-shell-utilities==1.7.0
# via pytest-salt-factories

8
requirements/static/ci/py3.10/windows.txt
View file

@ -24,7 +24,7 @@ autocommand==2.2.2
# -c requirements/static/ci/../pkg/py3.10/windows.txt
# jaraco.text
bcrypt==4.0.1
# via passlib
# via -r requirements/static/ci/common.in
boto3==1.26.152
# via
# -r requirements/static/ci/common.in
@ -110,7 +110,7 @@ dnspython==2.3.0
# -r requirements/static/ci/common.in
# python-etcd
docker==6.1.3
# via -r requirements/static/ci/common.in
# via -r requirements/pytest.txt
etcd3-py==0.1.6
# via -r requirements/static/ci/common.in
exceptiongroup==1.1.1
@ -242,7 +242,7 @@ packaging==23.1
# -r requirements/base.txt
# docker
# pytest
passlib[bcrypt]==1.7.4
passlib==1.7.4
# via -r requirements/static/ci/common.in
patch==1.16
# via -r requirements/static/ci/windows.in
@ -311,7 +311,7 @@ pytest-helpers-namespace==2021.12.29
# pytest-shell-utilities
pytest-httpserver==1.0.8
# via -r requirements/pytest.txt
pytest-salt-factories==1.0.0rc21 ; sys_platform == "win32"
pytest-salt-factories==1.0.0rc21
# via -r requirements/pytest.txt
pytest-shell-utilities==1.7.0
# via pytest-salt-factories

10
requirements/static/ci/py3.11/darwin.txt
View file

@ -34,8 +34,8 @@ autocommand==2.2.2
# jaraco.text
bcrypt==4.0.1
# via
# -r requirements/static/ci/common.in
# paramiko
# passlib
boto3==1.26.152
# via
# -r requirements/static/ci/common.in
@ -114,9 +114,7 @@ dnspython==2.3.0
# -r requirements/static/ci/common.in
# python-etcd
docker==6.1.3
# via
# -r requirements/static/ci/common.in
# pytest-salt-factories
# via -r requirements/pytest.txt
etcd3-py==0.1.6
# via -r requirements/static/ci/common.in
filelock==3.12.1
@ -290,7 +288,7 @@ paramiko==3.2.0
# ncclient
# netmiko
# scp
passlib[bcrypt]==1.7.4
passlib==1.7.4
# via -r requirements/static/ci/common.in
pathspec==0.11.1
# via yamllint
@ -357,7 +355,7 @@ pytest-helpers-namespace==2021.12.29
# pytest-shell-utilities
pytest-httpserver==1.0.8
# via -r requirements/pytest.txt
pytest-salt-factories[docker]==1.0.0rc21 ; sys_platform != "win32"
pytest-salt-factories==1.0.0rc21
# via -r requirements/pytest.txt
pytest-shell-utilities==1.7.0
# via pytest-salt-factories

10
requirements/static/ci/py3.11/freebsd.txt
View file

@ -31,8 +31,8 @@ autocommand==2.2.2
# jaraco.text
bcrypt==4.0.1
# via
# -r requirements/static/ci/common.in
# paramiko
# passlib
boto3==1.26.152
# via
# -r requirements/static/ci/common.in
@ -111,9 +111,7 @@ dnspython==2.3.0
# -r requirements/static/ci/common.in
# python-etcd
docker==6.1.3
# via
# -r requirements/static/ci/common.in
# pytest-salt-factories
# via -r requirements/pytest.txt
etcd3-py==0.1.6
# via -r requirements/static/ci/common.in
filelock==3.12.1
@ -286,7 +284,7 @@ paramiko==3.2.0 ; sys_platform != "win32" and sys_platform != "darwin"
# ncclient
# netmiko
# scp
passlib[bcrypt]==1.7.4
passlib==1.7.4
# via -r requirements/static/ci/common.in
pathspec==0.11.1
# via yamllint
@ -352,7 +350,7 @@ pytest-helpers-namespace==2021.12.29
# pytest-shell-utilities
pytest-httpserver==1.0.8
# via -r requirements/pytest.txt
pytest-salt-factories[docker]==1.0.0rc21 ; sys_platform != "win32"
pytest-salt-factories==1.0.0rc21
# via -r requirements/pytest.txt
pytest-shell-utilities==1.7.0
# via pytest-salt-factories

10
requirements/static/ci/py3.11/linux.txt
View file

@ -42,8 +42,8 @@ autocommand==2.2.2
# jaraco.text
bcrypt==4.0.1
# via
# -r requirements/static/ci/common.in
# paramiko
# passlib
boto3==1.26.152
# via
# -r requirements/static/ci/common.in
@ -125,9 +125,7 @@ dnspython==2.3.0
# -r requirements/static/ci/common.in
# python-etcd
docker==6.1.3
# via
# -r requirements/static/ci/common.in
# pytest-salt-factories
# via -r requirements/pytest.txt
etcd3-py==0.1.6
# via -r requirements/static/ci/common.in
filelock==3.12.1
@ -310,7 +308,7 @@ paramiko==3.2.0 ; sys_platform != "win32" and sys_platform != "darwin"
# ncclient
# netmiko
# scp
passlib[bcrypt]==1.7.4
passlib==1.7.4
# via -r requirements/static/ci/common.in
pathspec==0.11.1
# via yamllint
@ -383,7 +381,7 @@ pytest-helpers-namespace==2021.12.29
# pytest-shell-utilities
pytest-httpserver==1.0.8
# via -r requirements/pytest.txt
pytest-salt-factories[docker]==1.0.0rc21 ; sys_platform != "win32"
pytest-salt-factories==1.0.0rc21
# via -r requirements/pytest.txt
pytest-shell-utilities==1.7.0
# via pytest-salt-factories

8
requirements/static/ci/py3.11/windows.txt
View file

@ -24,7 +24,7 @@ autocommand==2.2.2
# -c requirements/static/ci/../pkg/py3.11/windows.txt
# jaraco.text
bcrypt==4.0.1
# via passlib
# via -r requirements/static/ci/common.in
boto3==1.26.152
# via
# -r requirements/static/ci/common.in
@ -110,7 +110,7 @@ dnspython==2.3.0
# -r requirements/static/ci/common.in
# python-etcd
docker==6.1.3
# via -r requirements/static/ci/common.in
# via -r requirements/pytest.txt
etcd3-py==0.1.6
# via -r requirements/static/ci/common.in
filelock==3.12.1
@ -240,7 +240,7 @@ packaging==23.1
# -r requirements/base.txt
# docker
# pytest
passlib[bcrypt]==1.7.4
passlib==1.7.4
# via -r requirements/static/ci/common.in
patch==1.16
# via -r requirements/static/ci/windows.in
@ -309,7 +309,7 @@ pytest-helpers-namespace==2021.12.29
# pytest-shell-utilities
pytest-httpserver==1.0.8
# via -r requirements/pytest.txt
pytest-salt-factories==1.0.0rc21 ; sys_platform == "win32"
pytest-salt-factories==1.0.0rc21
# via -r requirements/pytest.txt
pytest-shell-utilities==1.7.0
# via pytest-salt-factories

10
requirements/static/ci/py3.8/freebsd.txt
View file

@ -31,8 +31,8 @@ autocommand==2.2.2
# jaraco.text
bcrypt==4.0.1
# via
# -r requirements/static/ci/common.in
# paramiko
# passlib
boto3==1.26.152
# via
# -r requirements/static/ci/common.in
@ -111,9 +111,7 @@ dnspython==2.3.0
# -r requirements/static/ci/common.in
# python-etcd
docker==6.1.3
# via
# -r requirements/static/ci/common.in
# pytest-salt-factories
# via -r requirements/pytest.txt
etcd3-py==0.1.6
# via -r requirements/static/ci/common.in
exceptiongroup==1.1.1
@ -292,7 +290,7 @@ paramiko==3.2.0 ; sys_platform != "win32" and sys_platform != "darwin"
# ncclient
# netmiko
# scp
passlib[bcrypt]==1.7.4
passlib==1.7.4
# via -r requirements/static/ci/common.in
pathspec==0.11.1
# via yamllint
@ -357,7 +355,7 @@ pytest-helpers-namespace==2021.12.29
# pytest-shell-utilities
pytest-httpserver==1.0.8
# via -r requirements/pytest.txt
pytest-salt-factories[docker]==1.0.0rc21 ; sys_platform != "win32"
pytest-salt-factories==1.0.0rc21
# via -r requirements/pytest.txt
pytest-shell-utilities==1.7.0
# via pytest-salt-factories

10
requirements/static/ci/py3.8/linux.txt
View file

@ -42,8 +42,8 @@ autocommand==2.2.2
# jaraco.text
bcrypt==4.0.1
# via
# -r requirements/static/ci/common.in
# paramiko
# passlib
boto3==1.26.152
# via
# -r requirements/static/ci/common.in
@ -125,9 +125,7 @@ dnspython==2.3.0
# -r requirements/static/ci/common.in
# python-etcd
docker==6.1.3
# via
# -r requirements/static/ci/common.in
# pytest-salt-factories
# via -r requirements/pytest.txt
etcd3-py==0.1.6
# via -r requirements/static/ci/common.in
exceptiongroup==1.1.1
@ -318,7 +316,7 @@ paramiko==3.2.0 ; sys_platform != "win32" and sys_platform != "darwin"
# ncclient
# netmiko
# scp
passlib[bcrypt]==1.7.4
passlib==1.7.4
# via -r requirements/static/ci/common.in
pathspec==0.11.1
# via yamllint
@ -391,7 +389,7 @@ pytest-helpers-namespace==2021.12.29
# pytest-shell-utilities
pytest-httpserver==1.0.8
# via -r requirements/pytest.txt
pytest-salt-factories[docker]==1.0.0rc21 ; sys_platform != "win32"
pytest-salt-factories==1.0.0rc21
# via -r requirements/pytest.txt
pytest-shell-utilities==1.7.0
# via pytest-salt-factories

8
requirements/static/ci/py3.8/windows.txt
View file

@ -24,7 +24,7 @@ autocommand==2.2.2
# -c requirements/static/ci/../pkg/py3.8/windows.txt
# jaraco.text
bcrypt==4.0.1
# via passlib
# via -r requirements/static/ci/common.in
boto3==1.26.152
# via
# -r requirements/static/ci/common.in
@ -110,7 +110,7 @@ dnspython==2.3.0
# -r requirements/static/ci/common.in
# python-etcd
docker==6.1.3
# via -r requirements/static/ci/common.in
# via -r requirements/pytest.txt
etcd3-py==0.1.6
# via -r requirements/static/ci/common.in
exceptiongroup==1.1.1
@ -246,7 +246,7 @@ packaging==23.1
# -r requirements/base.txt
# docker
# pytest
passlib[bcrypt]==1.7.4
passlib==1.7.4
# via -r requirements/static/ci/common.in
patch==1.16
# via -r requirements/static/ci/windows.in
@ -315,7 +315,7 @@ pytest-helpers-namespace==2021.12.29
# pytest-shell-utilities
pytest-httpserver==1.0.8
# via -r requirements/pytest.txt
pytest-salt-factories==1.0.0rc21 ; sys_platform == "win32"
pytest-salt-factories==1.0.0rc21
# via -r requirements/pytest.txt
pytest-shell-utilities==1.7.0
# via pytest-salt-factories

10
requirements/static/ci/py3.9/darwin.txt
View file

@ -34,8 +34,8 @@ autocommand==2.2.2
# jaraco.text
bcrypt==4.0.1
# via
# -r requirements/static/ci/common.in
# paramiko
# passlib
boto3==1.26.152
# via
# -r requirements/static/ci/common.in
@ -114,9 +114,7 @@ dnspython==2.3.0
# -r requirements/static/ci/common.in
# python-etcd
docker==6.1.3
# via
# -r requirements/static/ci/common.in
# pytest-salt-factories
# via -r requirements/pytest.txt
etcd3-py==0.1.6
# via -r requirements/static/ci/common.in
exceptiongroup==1.1.1
@ -292,7 +290,7 @@ paramiko==3.2.0
# ncclient
# netmiko
# scp
passlib[bcrypt]==1.7.4
passlib==1.7.4
# via -r requirements/static/ci/common.in
pathspec==0.11.1
# via yamllint
@ -359,7 +357,7 @@ pytest-helpers-namespace==2021.12.29
# pytest-shell-utilities
pytest-httpserver==1.0.8
# via -r requirements/pytest.txt
pytest-salt-factories[docker]==1.0.0rc21 ; sys_platform != "win32"
pytest-salt-factories==1.0.0rc21
# via -r requirements/pytest.txt
pytest-shell-utilities==1.7.0
# via pytest-salt-factories

10
requirements/static/ci/py3.9/freebsd.txt
View file

@ -31,8 +31,8 @@ autocommand==2.2.2
# jaraco.text
bcrypt==4.0.1
# via
# -r requirements/static/ci/common.in
# paramiko
# passlib
boto3==1.26.152
# via
# -r requirements/static/ci/common.in
@ -111,9 +111,7 @@ dnspython==2.3.0
# -r requirements/static/ci/common.in
# python-etcd
docker==6.1.3
# via
# -r requirements/static/ci/common.in
# pytest-salt-factories
# via -r requirements/pytest.txt
etcd3-py==0.1.6
# via -r requirements/static/ci/common.in
exceptiongroup==1.1.1
@ -288,7 +286,7 @@ paramiko==3.2.0 ; sys_platform != "win32" and sys_platform != "darwin"
# ncclient
# netmiko
# scp
passlib[bcrypt]==1.7.4
passlib==1.7.4
# via -r requirements/static/ci/common.in
pathspec==0.11.1
# via yamllint
@ -354,7 +352,7 @@ pytest-helpers-namespace==2021.12.29
# pytest-shell-utilities
pytest-httpserver==1.0.8
# via -r requirements/pytest.txt
pytest-salt-factories[docker]==1.0.0rc21 ; sys_platform != "win32"
pytest-salt-factories==1.0.0rc21
# via -r requirements/pytest.txt
pytest-shell-utilities==1.7.0
# via pytest-salt-factories

10
requirements/static/ci/py3.9/linux.txt
View file

@ -42,8 +42,8 @@ autocommand==2.2.2
# jaraco.text
bcrypt==4.0.1
# via
# -r requirements/static/ci/common.in
# paramiko
# passlib
boto3==1.26.152
# via
# -r requirements/static/ci/common.in
@ -125,9 +125,7 @@ dnspython==2.3.0
# -r requirements/static/ci/common.in
# python-etcd
docker==6.1.3
# via
# -r requirements/static/ci/common.in
# pytest-salt-factories
# via -r requirements/pytest.txt
etcd3-py==0.1.6
# via -r requirements/static/ci/common.in
exceptiongroup==1.1.1
@ -316,7 +314,7 @@ paramiko==3.2.0 ; sys_platform != "win32" and sys_platform != "darwin"
# ncclient
# netmiko
# scp
passlib[bcrypt]==1.7.4
passlib==1.7.4
# via -r requirements/static/ci/common.in
pathspec==0.11.1
# via yamllint
@ -389,7 +387,7 @@ pytest-helpers-namespace==2021.12.29
# pytest-shell-utilities
pytest-httpserver==1.0.8
# via -r requirements/pytest.txt
pytest-salt-factories[docker]==1.0.0rc21 ; sys_platform != "win32"
pytest-salt-factories==1.0.0rc21
# via -r requirements/pytest.txt
pytest-shell-utilities==1.7.0
# via pytest-salt-factories

8
requirements/static/ci/py3.9/windows.txt
View file

@ -24,7 +24,7 @@ autocommand==2.2.2
# -c requirements/static/ci/../pkg/py3.9/windows.txt
# jaraco.text
bcrypt==4.0.1
# via passlib
# via -r requirements/static/ci/common.in
boto3==1.26.152
# via
# -r requirements/static/ci/common.in
@ -110,7 +110,7 @@ dnspython==2.3.0
# -r requirements/static/ci/common.in
# python-etcd
docker==6.1.3
# via -r requirements/static/ci/common.in
# via -r requirements/pytest.txt
etcd3-py==0.1.6
# via -r requirements/static/ci/common.in
exceptiongroup==1.1.1
@ -242,7 +242,7 @@ packaging==23.1
# -r requirements/base.txt
# docker
# pytest
passlib[bcrypt]==1.7.4
passlib==1.7.4
# via -r requirements/static/ci/common.in
patch==1.16
# via -r requirements/static/ci/windows.in
@ -311,7 +311,7 @@ pytest-helpers-namespace==2021.12.29
# pytest-shell-utilities
pytest-httpserver==1.0.8
# via -r requirements/pytest.txt
pytest-salt-factories==1.0.0rc21 ; sys_platform == "win32"
pytest-salt-factories==1.0.0rc21
# via -r requirements/pytest.txt
pytest-shell-utilities==1.7.0
# via pytest-salt-factories