Fix the request and pyzmq requirements

Author: Megan Wilhite

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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