diff --git a/requirements/base.txt b/requirements/base.txt index 8d5cc0fc4c0f..63e524d22384 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -3,9 +3,7 @@ jmespath msgpack>=0.5,!=0.5.5 PyYAML MarkupSafe -requests>=2.31.0 ; python_version >= "3.7" -requests<=2.27.1 ; python_version == "3.6" -requests<=2.25.1 ; python_version == "3.5" +requests>=1.0.0 distro>=1.0.1 contextvars psutil>=5.0.0 diff --git a/requirements/static/ci/py3.10/cloud.txt b/requirements/static/ci/py3.10/cloud.txt index 92040882dc62..96be05ea7776 100644 --- a/requirements/static/ci/py3.10/cloud.txt +++ b/requirements/static/ci/py3.10/cloud.txt @@ -755,7 +755,7 @@ requests-ntlm==1.1.0 # via pywinrm requests-oauthlib==1.3.0 # via msrest -requests==2.31.0 ; python_version >= "3.7" +requests==2.31.0 # via # -r requirements/base.txt # -r requirements/static/ci/common.in diff --git a/requirements/static/ci/py3.10/darwin.txt b/requirements/static/ci/py3.10/darwin.txt index e64fdd42454b..eb471cbf6011 100644 --- a/requirements/static/ci/py3.10/darwin.txt +++ b/requirements/static/ci/py3.10/darwin.txt @@ -751,7 +751,7 @@ pyzmq==23.2.0 ; python_version >= "3.6" # pytest-salt-factories requests-oauthlib==1.3.0 # via msrest -requests==2.31.0 ; python_version >= "3.7" +requests==2.31.0 # via # -r requirements/base.txt # -r requirements/static/ci/common.in diff --git a/requirements/static/ci/py3.10/docs.txt b/requirements/static/ci/py3.10/docs.txt index a97516184f5f..76e28d5c9413 100644 --- a/requirements/static/ci/py3.10/docs.txt +++ b/requirements/static/ci/py3.10/docs.txt @@ -728,7 +728,7 @@ redis==3.5.3 # via redis-py-cluster requests-oauthlib==1.3.0 # via msrest -requests==2.31.0 ; python_version >= "3.7" +requests==2.31.0 # via # -r requirements/base.txt # -r requirements/static/ci/common.in diff --git a/requirements/static/ci/py3.10/freebsd.txt b/requirements/static/ci/py3.10/freebsd.txt index 7c078e12452a..a2eccc60b7f8 100644 --- a/requirements/static/ci/py3.10/freebsd.txt +++ b/requirements/static/ci/py3.10/freebsd.txt @@ -747,7 +747,7 @@ pyzmq==23.2.0 ; python_version >= "3.6" # pytest-salt-factories requests-oauthlib==1.3.0 # via msrest -requests==2.31.0 ; python_version >= "3.7" +requests==2.31.0 # via # -r requirements/base.txt # -r requirements/static/ci/common.in diff --git a/requirements/static/ci/py3.10/lint.txt b/requirements/static/ci/py3.10/lint.txt index af027dfab852..ffcbf496ef53 100644 --- a/requirements/static/ci/py3.10/lint.txt +++ b/requirements/static/ci/py3.10/lint.txt @@ -727,7 +727,7 @@ redis==3.5.3 # via redis-py-cluster requests-oauthlib==1.3.0 # via msrest -requests==2.31.0 ; python_version >= "3.7" +requests==2.31.0 # via # -r requirements/base.txt # -r requirements/static/ci/common.in diff --git a/requirements/static/ci/py3.10/linux.txt b/requirements/static/ci/py3.10/linux.txt index 612cabbf5c87..1217c0925a4c 100644 --- a/requirements/static/ci/py3.10/linux.txt +++ b/requirements/static/ci/py3.10/linux.txt @@ -782,7 +782,7 @@ redis==3.5.3 # via redis-py-cluster requests-oauthlib==1.3.0 # via msrest -requests==2.31.0 ; python_version >= "3.7" +requests==2.31.0 # via # -r requirements/base.txt # -r requirements/static/ci/common.in diff --git a/requirements/static/ci/py3.5/linux.txt b/requirements/static/ci/py3.5/linux.txt index cd224abefb83..560ab0df0111 100644 --- a/requirements/static/ci/py3.5/linux.txt +++ b/requirements/static/ci/py3.5/linux.txt @@ -814,7 +814,7 @@ redis==3.5.3 # via redis-py-cluster requests-oauthlib==1.3.0 # via msrest -requests==2.25.1 ; python_version == "3.5" +requests==2.25.1 # via # -r requirements/base.txt # -r requirements/static/ci/common.in diff --git a/requirements/static/ci/py3.6/cloud.txt b/requirements/static/ci/py3.6/cloud.txt index bfe9af9325c4..be1bc344e21a 100644 --- a/requirements/static/ci/py3.6/cloud.txt +++ b/requirements/static/ci/py3.6/cloud.txt @@ -777,7 +777,7 @@ requests-ntlm==1.1.0 # via pywinrm requests-oauthlib==1.3.0 # via msrest -requests==2.25.1 ; python_version == "3.6" +requests==2.25.1 # via # -r requirements/base.txt # -r requirements/static/ci/common.in diff --git a/requirements/static/ci/py3.6/docs.txt b/requirements/static/ci/py3.6/docs.txt index 3a8e34cc3a74..3a2c32fbaa81 100644 --- a/requirements/static/ci/py3.6/docs.txt +++ b/requirements/static/ci/py3.6/docs.txt @@ -750,7 +750,7 @@ redis==3.5.3 # via redis-py-cluster requests-oauthlib==1.3.0 # via msrest -requests==2.25.1 ; python_version == "3.6" +requests==2.25.1 # via # -r requirements/base.txt # -r requirements/static/ci/common.in diff --git a/requirements/static/ci/py3.6/lint.txt b/requirements/static/ci/py3.6/lint.txt index d4ef3e342d1b..2946e3602bab 100644 --- a/requirements/static/ci/py3.6/lint.txt +++ b/requirements/static/ci/py3.6/lint.txt @@ -751,7 +751,7 @@ redis==3.5.3 # via redis-py-cluster requests-oauthlib==1.3.0 # via msrest -requests==2.26.0 ; python_version == "3.6" +requests==2.26.0 # via # -r requirements/base.txt # -r requirements/static/ci/common.in diff --git a/requirements/static/ci/py3.6/linux.txt b/requirements/static/ci/py3.6/linux.txt index 3b1e742b78aa..1c81008cda06 100644 --- a/requirements/static/ci/py3.6/linux.txt +++ b/requirements/static/ci/py3.6/linux.txt @@ -804,7 +804,7 @@ redis==3.5.3 # via redis-py-cluster requests-oauthlib==1.3.0 # via msrest -requests==2.25.1 ; python_version == "3.6" +requests==2.25.1 # via # -r requirements/base.txt # -r requirements/static/ci/common.in diff --git a/requirements/static/ci/py3.7/cloud.txt b/requirements/static/ci/py3.7/cloud.txt index 5ce026d6c4a0..3ab03b5188b7 100644 --- a/requirements/static/ci/py3.7/cloud.txt +++ b/requirements/static/ci/py3.7/cloud.txt @@ -799,7 +799,7 @@ requests-ntlm==1.1.0 # via pywinrm requests-oauthlib==1.3.0 # via msrest -requests==2.31.0 ; python_version >= "3.7" +requests==2.31.0 # via # -r requirements/base.txt # -r requirements/static/ci/common.in diff --git a/requirements/static/ci/py3.7/docs.txt b/requirements/static/ci/py3.7/docs.txt index 6d261cf7fbe9..2b69b8d562a2 100644 --- a/requirements/static/ci/py3.7/docs.txt +++ b/requirements/static/ci/py3.7/docs.txt @@ -771,7 +771,7 @@ redis==3.5.3 # via redis-py-cluster requests-oauthlib==1.3.0 # via msrest -requests==2.31.0 ; python_version >= "3.7" +requests==2.31.0 # via # -r requirements/base.txt # -r requirements/static/ci/common.in diff --git a/requirements/static/ci/py3.7/freebsd.txt b/requirements/static/ci/py3.7/freebsd.txt index e2f95767f106..5af255219933 100644 --- a/requirements/static/ci/py3.7/freebsd.txt +++ b/requirements/static/ci/py3.7/freebsd.txt @@ -787,7 +787,7 @@ pyzmq==23.2.0 ; python_version >= "3.6" # pytest-salt-factories requests-oauthlib==1.3.0 # via msrest -requests==2.31.0 ; python_version >= "3.7" +requests==2.31.0 # via # -r requirements/base.txt # -r requirements/static/ci/common.in diff --git a/requirements/static/ci/py3.7/lint.txt b/requirements/static/ci/py3.7/lint.txt index 2b42d2212bbc..39c615da5da3 100644 --- a/requirements/static/ci/py3.7/lint.txt +++ b/requirements/static/ci/py3.7/lint.txt @@ -772,7 +772,7 @@ redis==3.5.3 # via redis-py-cluster requests-oauthlib==1.3.0 # via msrest -requests==2.31.0 ; python_version >= "3.7" +requests==2.31.0 # via # -r requirements/base.txt # -r requirements/static/ci/common.in diff --git a/requirements/static/ci/py3.7/linux.txt b/requirements/static/ci/py3.7/linux.txt index fd7feba0e981..153b484c6cbf 100644 --- a/requirements/static/ci/py3.7/linux.txt +++ b/requirements/static/ci/py3.7/linux.txt @@ -820,7 +820,7 @@ redis==3.5.3 # via redis-py-cluster requests-oauthlib==1.3.0 # via msrest -requests==2.31.0 ; python_version >= "3.7" +requests==2.31.0 # via # -r requirements/base.txt # -r requirements/static/ci/common.in diff --git a/requirements/static/ci/py3.8/cloud.txt b/requirements/static/ci/py3.8/cloud.txt index db5085bf72ed..61068ac5053c 100644 --- a/requirements/static/ci/py3.8/cloud.txt +++ b/requirements/static/ci/py3.8/cloud.txt @@ -789,7 +789,7 @@ requests-ntlm==1.1.0 # via pywinrm requests-oauthlib==1.3.0 # via msrest -requests==2.31.0 ; python_version >= "3.7" +requests==2.31.0 # via # -r requirements/base.txt # -r requirements/static/ci/common.in diff --git a/requirements/static/ci/py3.8/docs.txt b/requirements/static/ci/py3.8/docs.txt index be0de480f07c..113c7002d0a6 100644 --- a/requirements/static/ci/py3.8/docs.txt +++ b/requirements/static/ci/py3.8/docs.txt @@ -763,7 +763,7 @@ redis==3.5.3 # via redis-py-cluster requests-oauthlib==1.3.0 # via msrest -requests==2.31.0 ; python_version >= "3.7" +requests==2.31.0 # via # -r requirements/base.txt # -r requirements/static/ci/common.in diff --git a/requirements/static/ci/py3.8/freebsd.txt b/requirements/static/ci/py3.8/freebsd.txt index 85a5a42a51fd..939ec982d684 100644 --- a/requirements/static/ci/py3.8/freebsd.txt +++ b/requirements/static/ci/py3.8/freebsd.txt @@ -778,7 +778,7 @@ pyzmq==23.2.0 ; python_version >= "3.6" # pytest-salt-factories requests-oauthlib==1.3.0 # via msrest -requests==2.31.0 ; python_version >= "3.7" +requests==2.31.0 # via # -r requirements/base.txt # -r requirements/static/ci/common.in diff --git a/requirements/static/ci/py3.8/lint.txt b/requirements/static/ci/py3.8/lint.txt index 9277abed520d..fde5b62903a5 100644 --- a/requirements/static/ci/py3.8/lint.txt +++ b/requirements/static/ci/py3.8/lint.txt @@ -764,7 +764,7 @@ redis==3.5.3 # via redis-py-cluster requests-oauthlib==1.3.0 # via msrest -requests==2.31.0 ; python_version >= "3.7" +requests==2.31.0 # via # -r requirements/base.txt # -r requirements/static/ci/common.in diff --git a/requirements/static/ci/py3.8/linux.txt b/requirements/static/ci/py3.8/linux.txt index d1bd56d32387..67a8485624a7 100644 --- a/requirements/static/ci/py3.8/linux.txt +++ b/requirements/static/ci/py3.8/linux.txt @@ -811,7 +811,7 @@ redis==3.5.3 # via redis-py-cluster requests-oauthlib==1.3.0 # via msrest -requests==2.31.0 ; python_version >= "3.7" +requests==2.31.0 # via # -r requirements/base.txt # -r requirements/static/ci/common.in diff --git a/requirements/static/ci/py3.9/cloud.txt b/requirements/static/ci/py3.9/cloud.txt index fb2b4c6d03c3..8564f90fc770 100644 --- a/requirements/static/ci/py3.9/cloud.txt +++ b/requirements/static/ci/py3.9/cloud.txt @@ -792,7 +792,7 @@ requests-ntlm==1.1.0 # via pywinrm requests-oauthlib==1.3.0 # via msrest -requests==2.31.0 ; python_version >= "3.7" +requests==2.31.0 # via # -r requirements/base.txt # -r requirements/static/ci/common.in diff --git a/requirements/static/ci/py3.9/darwin.txt b/requirements/static/ci/py3.9/darwin.txt index 634d37cac147..9c681d8a8bb4 100644 --- a/requirements/static/ci/py3.9/darwin.txt +++ b/requirements/static/ci/py3.9/darwin.txt @@ -785,7 +785,7 @@ pyzmq==23.2.0 ; python_version >= "3.6" # pytest-salt-factories requests-oauthlib==1.3.0 # via msrest -requests==2.31.0 ; python_version >= "3.7" +requests==2.31.0 # via # -r requirements/base.txt # -r requirements/static/ci/common.in diff --git a/requirements/static/ci/py3.9/docs.txt b/requirements/static/ci/py3.9/docs.txt index 20365b35b241..42dba531832b 100644 --- a/requirements/static/ci/py3.9/docs.txt +++ b/requirements/static/ci/py3.9/docs.txt @@ -764,7 +764,7 @@ redis==3.5.3 # via redis-py-cluster requests-oauthlib==1.3.0 # via msrest -requests==2.31.0 ; python_version >= "3.7" +requests==2.31.0 # via # -r requirements/base.txt # -r requirements/static/ci/common.in diff --git a/requirements/static/ci/py3.9/freebsd.txt b/requirements/static/ci/py3.9/freebsd.txt index cd704be1d755..610259c2293d 100644 --- a/requirements/static/ci/py3.9/freebsd.txt +++ b/requirements/static/ci/py3.9/freebsd.txt @@ -781,7 +781,7 @@ pyzmq==23.2.0 ; python_version >= "3.6" # pytest-salt-factories requests-oauthlib==1.3.0 # via msrest -requests==2.31.0 ; python_version >= "3.7" +requests==2.31.0 # via # -r requirements/base.txt # -r requirements/static/ci/common.in diff --git a/requirements/static/ci/py3.9/lint.txt b/requirements/static/ci/py3.9/lint.txt index 0e921ad27c41..9a70a2f1074c 100644 --- a/requirements/static/ci/py3.9/lint.txt +++ b/requirements/static/ci/py3.9/lint.txt @@ -765,7 +765,7 @@ redis==3.5.3 # via redis-py-cluster requests-oauthlib==1.3.0 # via msrest -requests==2.31.0 ; python_version >= "3.7" +requests==2.31.0 # via # -r requirements/base.txt # -r requirements/static/ci/common.in diff --git a/requirements/static/ci/py3.9/linux.txt b/requirements/static/ci/py3.9/linux.txt index 8c0db4821906..dc44b9a8e3c4 100644 --- a/requirements/static/ci/py3.9/linux.txt +++ b/requirements/static/ci/py3.9/linux.txt @@ -816,7 +816,7 @@ redis==3.5.3 # via redis-py-cluster requests-oauthlib==1.3.0 # via msrest -requests==2.31.0 ; python_version >= "3.7" +requests==2.31.0 # via # -r requirements/base.txt # -r requirements/static/ci/common.in diff --git a/requirements/static/pkg/py3.10/darwin.txt b/requirements/static/pkg/py3.10/darwin.txt index 4509a6f2f95a..ce87a9833415 100644 --- a/requirements/static/pkg/py3.10/darwin.txt +++ b/requirements/static/pkg/py3.10/darwin.txt @@ -90,7 +90,7 @@ pyyaml==6.0.1 # via -r requirements/base.txt pyzmq==23.2.0 ; python_version >= "3.6" # via -r requirements/zeromq.txt -requests==2.31.0 ; python_version >= "3.7" +requests==2.31.0 # via # -r requirements/base.txt # apache-libcloud diff --git a/requirements/static/pkg/py3.10/freebsd.txt b/requirements/static/pkg/py3.10/freebsd.txt index 340febd1dfaf..57c9a1dbe07e 100644 --- a/requirements/static/pkg/py3.10/freebsd.txt +++ b/requirements/static/pkg/py3.10/freebsd.txt @@ -77,7 +77,7 @@ pyyaml==6.0.1 # via -r requirements/base.txt pyzmq==23.2.0 ; python_version >= "3.6" # via -r requirements/zeromq.txt -requests==2.31.0 ; python_version >= "3.7" +requests==2.31.0 # via -r requirements/base.txt setproctitle==1.1.10 # via -r requirements/static/pkg/freebsd.in diff --git a/requirements/static/pkg/py3.10/linux.txt b/requirements/static/pkg/py3.10/linux.txt index 3363481323d0..59ecad320c96 100644 --- a/requirements/static/pkg/py3.10/linux.txt +++ b/requirements/static/pkg/py3.10/linux.txt @@ -77,7 +77,7 @@ pyyaml==6.0.1 # via -r requirements/base.txt pyzmq==23.2.0 ; python_version >= "3.6" # via -r requirements/zeromq.txt -requests==2.31.0 ; python_version >= "3.7" +requests==2.31.0 # via -r requirements/base.txt rpm-vercmp==0.1.2 # via -r requirements/static/pkg/linux.in diff --git a/requirements/static/pkg/py3.5/linux.txt b/requirements/static/pkg/py3.5/linux.txt index f72b043c2f15..7556cbbdea3d 100644 --- a/requirements/static/pkg/py3.5/linux.txt +++ b/requirements/static/pkg/py3.5/linux.txt @@ -76,7 +76,7 @@ pyyaml==5.3.1 # via -r requirements/base.txt pyzmq==19.0.2 ; python_version < "3.6" # via -r requirements/zeromq.txt -requests==2.25.1 ; python_version == "3.5" +requests==2.25.1 # via -r requirements/base.txt rpm-vercmp==0.1.2 # via -r requirements/static/pkg/linux.in diff --git a/requirements/static/pkg/py3.6/linux.txt b/requirements/static/pkg/py3.6/linux.txt index 89d93a2edb45..f49dfbcd7c5b 100644 --- a/requirements/static/pkg/py3.6/linux.txt +++ b/requirements/static/pkg/py3.6/linux.txt @@ -79,7 +79,7 @@ pyyaml==6.0.1 # via -r requirements/base.txt pyzmq==23.2.0 ; python_version >= "3.6" # via -r requirements/zeromq.txt -requests==2.25.1 ; python_version == "3.6" +requests==2.25.1 # via -r requirements/base.txt rpm-vercmp==0.1.2 # via -r requirements/static/pkg/linux.in diff --git a/requirements/static/pkg/py3.7/freebsd.txt b/requirements/static/pkg/py3.7/freebsd.txt index e120db506e80..9e5c89424c1c 100644 --- a/requirements/static/pkg/py3.7/freebsd.txt +++ b/requirements/static/pkg/py3.7/freebsd.txt @@ -77,7 +77,7 @@ pyyaml==6.0.1 # via -r requirements/base.txt pyzmq==23.2.0 ; python_version >= "3.6" # via -r requirements/zeromq.txt -requests==2.31.0 ; python_version >= "3.7" +requests==2.31.0 # via -r requirements/base.txt setproctitle==1.1.10 # via -r requirements/static/pkg/freebsd.in diff --git a/requirements/static/pkg/py3.7/linux.txt b/requirements/static/pkg/py3.7/linux.txt index 148e303522ae..b2ad77682681 100644 --- a/requirements/static/pkg/py3.7/linux.txt +++ b/requirements/static/pkg/py3.7/linux.txt @@ -75,7 +75,7 @@ pyyaml==6.0.1 # via -r requirements/base.txt pyzmq==23.2.0 ; python_version >= "3.6" # via -r requirements/zeromq.txt -requests==2.31.0 ; python_version >= "3.7" +requests==2.31.0 # via -r requirements/base.txt rpm-vercmp==0.1.2 # via -r requirements/static/pkg/linux.in diff --git a/requirements/static/pkg/py3.8/freebsd.txt b/requirements/static/pkg/py3.8/freebsd.txt index 8284d972b368..333bfcf8587b 100644 --- a/requirements/static/pkg/py3.8/freebsd.txt +++ b/requirements/static/pkg/py3.8/freebsd.txt @@ -77,7 +77,7 @@ pyyaml==6.0.1 # via -r requirements/base.txt pyzmq==23.2.0 ; python_version >= "3.6" # via -r requirements/zeromq.txt -requests==2.31.0 ; python_version >= "3.7" +requests==2.31.0 # via -r requirements/base.txt setproctitle==1.1.10 # via -r requirements/static/pkg/freebsd.in diff --git a/requirements/static/pkg/py3.8/linux.txt b/requirements/static/pkg/py3.8/linux.txt index a470ba4b0a4d..d23e802f6415 100644 --- a/requirements/static/pkg/py3.8/linux.txt +++ b/requirements/static/pkg/py3.8/linux.txt @@ -75,7 +75,7 @@ pyyaml==6.0.1 # via -r requirements/base.txt pyzmq==23.2.0 ; python_version >= "3.6" # via -r requirements/zeromq.txt -requests==2.31.0 ; python_version >= "3.7" +requests==2.31.0 # via -r requirements/base.txt rpm-vercmp==0.1.2 # via -r requirements/static/pkg/linux.in diff --git a/requirements/static/pkg/py3.9/darwin.txt b/requirements/static/pkg/py3.9/darwin.txt index a780337dc716..b875bfefc2b1 100644 --- a/requirements/static/pkg/py3.9/darwin.txt +++ b/requirements/static/pkg/py3.9/darwin.txt @@ -92,7 +92,7 @@ pyyaml==6.0.1 # via -r requirements/base.txt pyzmq==23.2.0 ; python_version >= "3.6" # via -r requirements/zeromq.txt -requests==2.31.0 ; python_version >= "3.7" +requests==2.31.0 # via # -r requirements/base.txt # apache-libcloud diff --git a/requirements/static/pkg/py3.9/freebsd.txt b/requirements/static/pkg/py3.9/freebsd.txt index 353035a04114..c101f06b8f88 100644 --- a/requirements/static/pkg/py3.9/freebsd.txt +++ b/requirements/static/pkg/py3.9/freebsd.txt @@ -79,7 +79,7 @@ pyyaml==6.0.1 # via -r requirements/base.txt pyzmq==23.2.0 ; python_version >= "3.6" # via -r requirements/zeromq.txt -requests==2.31.0 ; python_version >= "3.7" +requests==2.31.0 # via -r requirements/base.txt setproctitle==1.1.10 # via -r requirements/static/pkg/freebsd.in diff --git a/requirements/static/pkg/py3.9/linux.txt b/requirements/static/pkg/py3.9/linux.txt index bf0d8b54f954..61ac2f9a3eea 100644 --- a/requirements/static/pkg/py3.9/linux.txt +++ b/requirements/static/pkg/py3.9/linux.txt @@ -77,7 +77,7 @@ pyyaml==6.0.1 # via -r requirements/base.txt pyzmq==23.2.0 ; python_version >= "3.6" # via -r requirements/zeromq.txt -requests==2.31.0 ; python_version >= "3.7" +requests==2.31.0 # via -r requirements/base.txt rpm-vercmp==0.1.2 # via -r requirements/static/pkg/linux.in diff --git a/requirements/zeromq.txt b/requirements/zeromq.txt index e6ea79b525d7..2c1f009e02dc 100644 --- a/requirements/zeromq.txt +++ b/requirements/zeromq.txt @@ -1,7 +1,7 @@ -r base.txt -r crypto.txt -pyzmq<20.0.0; python_version < "3.6" +pyzmq<=20.0.0; python_version < "3.6" pyzmq>=20.0.0; python_version >= "3.6" # We can't use 23+ on Windows until they fix this: # https://github.com/zeromq/pyzmq/issues/1472