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

Adjust a few requirements that got changed during the conflict solving

Browse source 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
This commit is contained in:
Pedro Algarvio 2023-09-25 11:53:57 +01:00
parent 5e093b3b8d
commit f1c619292f
No known key found for this signature in database
GPG key ID: BB36BF6584A298FF
45 changed files with 47 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
requirements/static/ci/py3.10/cloud.txt
View file

@ -67,7 +67,7 @@ smbprotocol==1.10.1
# via
# -r requirements/static/ci/cloud.in
# pypsexec
urllib3==1.26.6
urllib3==1.26.14
# via
# -c requirements/static/ci/py3.10/linux.txt
# requests

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

@ -523,7 +523,7 @@ typing-extensions==4.6.3
# pydantic
# pytest-shell-utilities
# pytest-system-statistics
urllib3==1.26.6
urllib3==1.26.14
# via
# -c requirements/static/ci/../pkg/py3.10/darwin.txt
# botocore

2
requirements/static/ci/py3.10/docs.txt
View file

@ -152,7 +152,7 @@ typing-extensions==4.6.3
# pydantic
uc-micro-py==1.0.2
# via linkify-it-py
urllib3==1.26.6
urllib3==1.26.14
# via
# -c requirements/static/ci/py3.10/linux.txt
# requests

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

@ -515,7 +515,7 @@ typing-extensions==4.6.3
# pydantic
# pytest-shell-utilities
# pytest-system-statistics
urllib3==1.26.6
urllib3==1.26.14
# via
# -c requirements/static/ci/../pkg/py3.10/freebsd.txt
# botocore

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

@ -579,7 +579,7 @@ typing-extensions==4.6.3
# pydantic
# pytest-shell-utilities
# pytest-system-statistics
urllib3==1.26.6
urllib3==1.26.14
# via
# -c requirements/static/ci/../pkg/py3.10/linux.txt
# botocore

2
requirements/static/ci/py3.10/pkgtests-windows.txt
View file

@ -155,7 +155,7 @@ typing-extensions==4.6.3
# pydantic
# pytest-shell-utilities
# pytest-system-statistics
urllib3==2.0.3
urllib3==1.26.14
# via requests
virtualenv==20.23.0
# via pytest-salt-factories

4
requirements/static/ci/py3.10/pkgtests.txt
View file

@ -82,7 +82,7 @@ packaging==23.1
# -r requirements/base.txt
# docker
# pytest
platformdirs==2.6.2
platformdirs==3.5.3
# via virtualenv
pluggy==1.0.0
# via pytest
@ -154,7 +154,7 @@ urllib3==1.26.14
# requests
virtualenv==20.23.0
# via pytest-salt-factories
websocket-client==0.40.0
websocket-client==1.6.3
# via docker
zc.lockfile==3.0.post1
# via cherrypy

2
requirements/static/ci/py3.10/tools.txt
View file

@ -54,7 +54,7 @@ six==1.16.0
# via python-dateutil
typing-extensions==4.6.3
# via python-tools-scripts
urllib3==1.26.16
urllib3==1.26.14
# via
# botocore
# requests

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

@ -465,7 +465,7 @@ typing-extensions==4.6.3
# pydantic
# pytest-shell-utilities
# pytest-system-statistics
urllib3==1.26.6
urllib3==1.26.14
# via
# -c requirements/static/ci/../pkg/py3.10/windows.txt
# -r requirements/windows.txt

2
requirements/static/ci/py3.11/cloud.txt
View file

@ -67,7 +67,7 @@ smbprotocol==1.10.1
# via
# -r requirements/static/ci/cloud.in
# pypsexec
urllib3==1.26.6
urllib3==1.26.14
# via
# -c requirements/static/ci/py3.11/linux.txt
# requests

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

@ -519,7 +519,7 @@ typing-extensions==4.6.3
# pydantic
# pytest-shell-utilities
# pytest-system-statistics
urllib3==1.26.6
urllib3==1.26.14
# via
# -c requirements/static/ci/../pkg/py3.11/darwin.txt
# botocore

2
requirements/static/ci/py3.11/docs.txt
View file

@ -152,7 +152,7 @@ typing-extensions==4.6.3
# pydantic
uc-micro-py==1.0.2
# via linkify-it-py
urllib3==1.26.6
urllib3==1.26.14
# via
# -c requirements/static/ci/py3.11/linux.txt
# requests

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

@ -511,7 +511,7 @@ typing-extensions==4.6.3
# pydantic
# pytest-shell-utilities
# pytest-system-statistics
urllib3==1.26.6
urllib3==1.26.14
# via
# -c requirements/static/ci/../pkg/py3.11/freebsd.txt
# botocore

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

@ -573,7 +573,7 @@ typing-extensions==4.6.3
# pydantic
# pytest-shell-utilities
# pytest-system-statistics
urllib3==1.26.6
urllib3==1.26.14
# via
# -c requirements/static/ci/../pkg/py3.11/linux.txt
# botocore

2
requirements/static/ci/py3.11/pkgtests-windows.txt
View file

@ -83,7 +83,7 @@ packaging==23.1
# via
# -r requirements/base.txt
# pytest
platformdirs==2.6.2
platformdirs==3.5.3
# via virtualenv
pluggy==1.0.0
# via pytest

4
requirements/static/ci/py3.11/pkgtests.txt
View file

@ -80,7 +80,7 @@ packaging==23.1
# -r requirements/base.txt
# docker
# pytest
platformdirs==2.6.2
platformdirs==3.5.3
# via virtualenv
pluggy==1.0.0
# via pytest
@ -150,7 +150,7 @@ urllib3==1.26.14
# requests
virtualenv==20.23.0
# via pytest-salt-factories
websocket-client==0.40.0
websocket-client==1.6.3
# via docker
zc.lockfile==3.0.post1
# via cherrypy

2
requirements/static/ci/py3.11/tools.txt
View file

@ -52,7 +52,7 @@ s3transfer==0.6.1
# via boto3
six==1.16.0
# via python-dateutil
urllib3==1.26.16
urllib3==1.26.14
# via
# botocore
# requests

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

@ -461,7 +461,7 @@ typing-extensions==4.6.3
# pydantic
# pytest-shell-utilities
# pytest-system-statistics
urllib3==1.26.6
urllib3==1.26.14
# via
# -c requirements/static/ci/../pkg/py3.11/windows.txt
# -r requirements/windows.txt

2
requirements/static/ci/py3.8/cloud.txt
View file

@ -67,7 +67,7 @@ smbprotocol==1.10.1
# via
# -r requirements/static/ci/cloud.in
# pypsexec
urllib3==1.26.6
urllib3==1.26.14
# via
# -c requirements/static/ci/py3.8/linux.txt
# requests

2
requirements/static/ci/py3.8/docs.txt
View file

@ -161,7 +161,7 @@ typing-extensions==4.6.3
# pydantic
uc-micro-py==1.0.2
# via linkify-it-py
urllib3==1.26.6
urllib3==1.26.14
# via
# -c requirements/static/ci/py3.8/linux.txt
# requests

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

@ -519,7 +519,7 @@ typing-extensions==4.6.3
# pydantic
# pytest-shell-utilities
# pytest-system-statistics
urllib3==1.26.6
urllib3==1.26.14
# via
# -c requirements/static/ci/../pkg/py3.8/freebsd.txt
# botocore

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

@ -583,7 +583,7 @@ typing-extensions==4.6.3
# pydantic
# pytest-shell-utilities
# pytest-system-statistics
urllib3==1.26.6
urllib3==1.26.14
# via
# -c requirements/static/ci/../pkg/py3.8/linux.txt
# botocore

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

@ -470,7 +470,7 @@ typing-extensions==4.6.3
# pydantic
# pytest-shell-utilities
# pytest-system-statistics
urllib3==1.26.6
urllib3==1.26.14
# via
# -c requirements/static/ci/../pkg/py3.8/windows.txt
# -r requirements/windows.txt

2
requirements/static/ci/py3.9/cloud.txt
View file

@ -67,7 +67,7 @@ smbprotocol==1.10.1
# via
# -r requirements/static/ci/cloud.in
# pypsexec
urllib3==1.26.6
urllib3==1.26.14
# via
# -c requirements/static/ci/py3.9/linux.txt
# requests

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

@ -523,7 +523,7 @@ typing-extensions==4.6.3
# pydantic
# pytest-shell-utilities
# pytest-system-statistics
urllib3==1.26.6
urllib3==1.26.14
# via
# -c requirements/static/ci/../pkg/py3.9/darwin.txt
# botocore

2
requirements/static/ci/py3.9/docs.txt
View file

@ -156,7 +156,7 @@ typing-extensions==4.6.3
# pydantic
uc-micro-py==1.0.2
# via linkify-it-py
urllib3==1.26.6
urllib3==1.26.14
# via
# -c requirements/static/ci/py3.9/linux.txt
# requests

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

@ -515,7 +515,7 @@ typing-extensions==4.6.3
# pydantic
# pytest-shell-utilities
# pytest-system-statistics
urllib3==1.26.6
urllib3==1.26.14
# via
# -c requirements/static/ci/../pkg/py3.9/freebsd.txt
# botocore

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

@ -581,7 +581,7 @@ typing-extensions==4.6.3
# pydantic
# pytest-shell-utilities
# pytest-system-statistics
urllib3==1.26.6
urllib3==1.26.14
# via
# -c requirements/static/ci/../pkg/py3.9/linux.txt
# botocore

2
requirements/static/ci/py3.9/tools.txt
View file

@ -54,7 +54,7 @@ six==1.16.0
# via python-dateutil
typing-extensions==4.6.3
# via python-tools-scripts
urllib3==1.26.16
urllib3==1.26.14
# via
# botocore
# requests

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

@ -466,7 +466,7 @@ typing-extensions==4.6.3
# pydantic
# pytest-shell-utilities
# pytest-system-statistics
urllib3==1.26.6
urllib3==1.26.14
# via
# -c requirements/static/ci/../pkg/py3.9/windows.txt
# -r requirements/windows.txt

2
requirements/static/pkg/py3.10/darwin.txt
View file

@ -115,7 +115,7 @@ tornado==6.3.2
# via -r requirements/base.txt
typing-extensions==4.6.3
# via pydantic
urllib3==1.26.6
urllib3==1.26.14
# via requests
vultr==1.0.1
# via -r requirements/darwin.txt

2
requirements/static/pkg/py3.10/freebsd.txt
View file

@ -102,7 +102,7 @@ tornado==6.3.2
# via -r requirements/base.txt
typing-extensions==4.6.3
# via pydantic
urllib3==1.26.6
urllib3==1.26.14
# via requests
zc.lockfile==3.0.post1
# via cherrypy

2
requirements/static/pkg/py3.10/linux.txt
View file

@ -102,7 +102,7 @@ tornado==6.3.2
# via -r requirements/base.txt
typing-extensions==4.6.3
# via pydantic
urllib3==1.26.6
urllib3==1.26.14
# via requests
zc.lockfile==3.0.post1
# via cherrypy

2
requirements/static/pkg/py3.10/windows.txt
View file

@ -129,7 +129,7 @@ tornado==6.3.2
# via -r requirements/base.txt
typing-extensions==4.6.3
# via pydantic
urllib3==1.26.6
urllib3==1.26.14
# via
# -r requirements/windows.txt
# requests

2
requirements/static/pkg/py3.11/darwin.txt
View file

@ -115,7 +115,7 @@ tornado==6.3.2
# via -r requirements/base.txt
typing-extensions==4.6.3
# via pydantic
urllib3==1.26.6
urllib3==1.26.14
# via requests
vultr==1.0.1
# via -r requirements/darwin.txt

2
requirements/static/pkg/py3.11/freebsd.txt
View file

@ -102,7 +102,7 @@ tornado==6.3.2
# via -r requirements/base.txt
typing-extensions==4.6.3
# via pydantic
urllib3==1.26.6
urllib3==1.26.14
# via requests
zc.lockfile==3.0.post1
# via cherrypy

2
requirements/static/pkg/py3.11/linux.txt
View file

@ -102,7 +102,7 @@ tornado==6.3.2
# via -r requirements/base.txt
typing-extensions==4.6.3
# via pydantic
urllib3==1.26.6
urllib3==1.26.14
# via requests
zc.lockfile==3.0.post1
# via cherrypy

2
requirements/static/pkg/py3.11/windows.txt
View file

@ -129,7 +129,7 @@ tornado==6.3.2
# via -r requirements/base.txt
typing-extensions==4.6.3
# via pydantic
urllib3==1.26.6
urllib3==1.26.14
# via
# -r requirements/windows.txt
# requests

2
requirements/static/pkg/py3.8/freebsd.txt
View file

@ -104,7 +104,7 @@ tornado==6.3.2
# via -r requirements/base.txt
typing-extensions==4.6.3
# via pydantic
urllib3==1.26.6
urllib3==1.26.14
# via requests
zc.lockfile==3.0.post1
# via cherrypy

2
requirements/static/pkg/py3.8/linux.txt
View file

@ -104,7 +104,7 @@ tornado==6.3.2
# via -r requirements/base.txt
typing-extensions==4.6.3
# via pydantic
urllib3==1.26.6
urllib3==1.26.14
# via requests
zc.lockfile==3.0.post1
# via cherrypy

2
requirements/static/pkg/py3.8/windows.txt
View file

@ -132,7 +132,7 @@ tornado==6.3.2
# via -r requirements/base.txt
typing-extensions==4.6.3
# via pydantic
urllib3==1.26.6
urllib3==1.26.14
# via
# -r requirements/windows.txt
# requests

2
requirements/static/pkg/py3.9/darwin.txt
View file

@ -115,7 +115,7 @@ tornado==6.3.2
# via -r requirements/base.txt
typing-extensions==4.6.3
# via pydantic
urllib3==1.26.6
urllib3==1.26.14
# via requests
vultr==1.0.1
# via -r requirements/darwin.txt

2
requirements/static/pkg/py3.9/freebsd.txt
View file

@ -102,7 +102,7 @@ tornado==6.3.2
# via -r requirements/base.txt
typing-extensions==4.6.3
# via pydantic
urllib3==1.26.6
urllib3==1.26.14
# via requests
zc.lockfile==3.0.post1
# via cherrypy

2
requirements/static/pkg/py3.9/linux.txt
View file

@ -102,7 +102,7 @@ tornado==6.3.2
# via -r requirements/base.txt
typing-extensions==4.6.3
# via pydantic
urllib3==1.26.6
urllib3==1.26.14
# via requests
zc.lockfile==3.0.post1
# via cherrypy

2
requirements/static/pkg/py3.9/windows.txt
View file

@ -130,7 +130,7 @@ tornado==6.3.2
# via -r requirements/base.txt
typing-extensions==4.6.3
# via pydantic
urllib3==1.26.6
urllib3==1.26.14
# via
# -r requirements/windows.txt
# requests