Fix pre-commit by changing the pyzmq requirements.

It's now `pyzmq>=20.0.0` on all platforms, and `<=22.0.3` just for windows.

Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>

requirements/static/ci/py3.10/cloud.txt

@@ -753,7 +753,7 @@ pyyaml==5.4.1
     #   junos-eznc
     #   kubernetes
     #   yamlordereddictloader
-pyzmq==23.2.0 ; python_version >= "3.9"
+pyzmq==23.2.0
     # via
     #   -r requirements/zeromq.txt
     #   pytest-salt-factories

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

@@ -752,7 +752,7 @@ pyyaml==5.4.1
     #   kubernetes
     #   yamllint
     #   yamlordereddictloader
-pyzmq==23.2.0 ; python_version >= "3.9"
+pyzmq==23.2.0
     # via
     #   -r requirements/zeromq.txt
     #   pytest-salt-factories

requirements/static/ci/py3.10/docs.txt

@@ -81,7 +81,7 @@ pyyaml==5.4.1
     # via
     #   -c requirements/static/ci/py3.10/linux.txt
     #   -r requirements/base.txt
-pyzmq==23.2.0 ; python_version >= "3.9"
+pyzmq==23.2.0
     # via
     #   -c requirements/static/ci/py3.10/linux.txt
     #   -r requirements/zeromq.txt

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

@@ -749,7 +749,7 @@ pyyaml==5.4.1
     #   kubernetes
     #   yamllint
     #   yamlordereddictloader
-pyzmq==23.2.0 ; python_version >= "3.9"
+pyzmq==23.2.0
     # via
     #   -r requirements/zeromq.txt
     #   pytest-salt-factories

requirements/static/ci/py3.10/lint.txt

@@ -722,7 +722,7 @@ pyyaml==5.4.1
     #   kubernetes
     #   yamllint
     #   yamlordereddictloader
-pyzmq==23.2.0 ; python_version >= "3.9"
+pyzmq==23.2.0
     # via -r requirements/zeromq.txt
 redis-py-cluster==2.1.3
     # via -r requirements/static/ci/linux.in

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

@@ -775,7 +775,7 @@ pyyaml==5.4.1
     #   kubernetes
     #   yamllint
     #   yamlordereddictloader
-pyzmq==23.2.0 ; python_version >= "3.9"
+pyzmq==23.2.0
     # via
     #   -r requirements/zeromq.txt
     #   pytest-salt-factories

requirements/static/ci/py3.10/windows.txt

@@ -318,7 +318,7 @@ pyyaml==5.4.1
     #   clustershell
     #   kubernetes
     #   yamllint
-pyzmq==23.2.0 ; python_version >= "3.9"
+pyzmq==22.0.3 ; sys_platform == "win32"
     # via
     #   -r requirements/zeromq.txt
     #   pytest-salt-factories

requirements/static/ci/py3.6/cloud.txt

@@ -771,7 +771,7 @@ pyyaml==5.4.1
     #   junos-eznc
     #   kubernetes
     #   yamlordereddictloader
-pyzmq==21.0.2 ; python_version < "3.9"
+pyzmq==23.2.0
     # via
     #   -r requirements/zeromq.txt
     #   pytest-salt-factories

requirements/static/ci/py3.6/docs.txt

@@ -85,7 +85,7 @@ pyyaml==5.4.1
     # via
     #   -c requirements/static/ci/py3.6/linux.txt
     #   -r requirements/base.txt
-pyzmq==18.0.1 ; python_version < "3.9"
+pyzmq==23.2.0
     # via
     #   -c requirements/static/ci/py3.6/linux.txt
     #   -r requirements/zeromq.txt

requirements/static/ci/py3.6/lint.txt

@@ -742,7 +742,7 @@ pyyaml==5.4.1
     #   kubernetes
     #   yamllint
     #   yamlordereddictloader
-pyzmq==21.0.2 ; python_version < "3.9"
+pyzmq==23.2.0
     # via -r requirements/zeromq.txt
 redis-py-cluster==2.1.3
     # via -r requirements/static/ci/linux.in

requirements/static/ci/py3.6/linux.txt

@@ -795,7 +795,7 @@ pyyaml==5.4.1
     #   kubernetes
     #   yamllint
     #   yamlordereddictloader
-pyzmq==18.0.1 ; python_version < "3.9"
+pyzmq==23.2.0
     # via
     #   -r requirements/zeromq.txt
     #   pytest-salt-factories

requirements/static/ci/py3.7/cloud.txt

@@ -798,7 +798,7 @@ pyyaml==5.4.1
     #   kubernetes
     #   napalm
     #   yamlordereddictloader
-pyzmq==21.0.2 ; python_version < "3.9"
+pyzmq==23.2.0
     # via
     #   -r requirements/zeromq.txt
     #   pytest-salt-factories

requirements/static/ci/py3.7/docs.txt

@@ -85,7 +85,7 @@ pyyaml==5.4.1
     # via
     #   -c requirements/static/ci/py3.7/linux.txt
     #   -r requirements/base.txt
-pyzmq==18.0.1 ; python_version < "3.9"
+pyzmq==23.2.0
     # via
     #   -c requirements/static/ci/py3.7/linux.txt
     #   -r requirements/zeromq.txt

requirements/static/ci/py3.7/freebsd.txt

@@ -788,7 +788,7 @@ pyyaml==5.4.1
     #   napalm
     #   yamllint
     #   yamlordereddictloader
-pyzmq==18.0.1 ; python_version < "3.9"
+pyzmq==23.2.0
     # via
     #   -r requirements/zeromq.txt
     #   pytest-salt-factories

requirements/static/ci/py3.7/lint.txt

@@ -768,7 +768,7 @@ pyyaml==5.4.1
     #   napalm
     #   yamllint
     #   yamlordereddictloader
-pyzmq==21.0.2 ; python_version < "3.9"
+pyzmq==23.2.0
     # via -r requirements/zeromq.txt
 redis-py-cluster==2.1.3
     # via -r requirements/static/ci/linux.in

requirements/static/ci/py3.7/linux.txt

@@ -816,7 +816,7 @@ pyyaml==5.4.1
     #   napalm
     #   yamllint
     #   yamlordereddictloader
-pyzmq==18.0.1 ; python_version < "3.9"
+pyzmq==23.2.0
     # via
     #   -r requirements/zeromq.txt
     #   pytest-salt-factories

requirements/static/ci/py3.7/windows.txt

@@ -331,7 +331,7 @@ pyyaml==5.4.1
     #   clustershell
     #   kubernetes
     #   yamllint
-pyzmq==22.0.3 ; python_version < "3.9" and sys_platform == "win32"
+pyzmq==22.0.3 ; sys_platform == "win32"
     # via
     #   -r requirements/zeromq.txt
     #   pytest-salt-factories

requirements/static/ci/py3.8/cloud.txt

@@ -787,7 +787,7 @@ pyyaml==5.4.1
     #   kubernetes
     #   napalm
     #   yamlordereddictloader
-pyzmq==21.0.2 ; python_version < "3.9"
+pyzmq==23.2.0
     # via
     #   -r requirements/zeromq.txt
     #   pytest-salt-factories

requirements/static/ci/py3.8/docs.txt

@@ -81,7 +81,7 @@ pyyaml==5.4.1
     # via
     #   -c requirements/static/ci/py3.8/linux.txt
     #   -r requirements/base.txt
-pyzmq==19.0.0 ; python_version < "3.9"
+pyzmq==23.2.0
     # via
     #   -c requirements/static/ci/py3.8/linux.txt
     #   -r requirements/zeromq.txt

requirements/static/ci/py3.8/freebsd.txt

@@ -778,7 +778,7 @@ pyyaml==5.4.1
     #   napalm
     #   yamllint
     #   yamlordereddictloader
-pyzmq==19.0.0 ; python_version < "3.9"
+pyzmq==23.2.0
     # via
     #   -r requirements/zeromq.txt
     #   pytest-salt-factories

requirements/static/ci/py3.8/lint.txt

@@ -759,7 +759,7 @@ pyyaml==5.4.1
     #   napalm
     #   yamllint
     #   yamlordereddictloader
-pyzmq==21.0.2 ; python_version < "3.9"
+pyzmq==23.2.0
     # via -r requirements/zeromq.txt
 redis-py-cluster==2.1.3
     # via -r requirements/static/ci/linux.in

requirements/static/ci/py3.8/linux.txt

@@ -804,7 +804,7 @@ pyyaml==5.4.1
     #   napalm
     #   yamllint
     #   yamlordereddictloader
-pyzmq==19.0.0 ; python_version < "3.9"
+pyzmq==23.2.0
     # via
     #   -r requirements/zeromq.txt
     #   pytest-salt-factories

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

@@ -319,7 +319,7 @@ pyyaml==5.4.1
     #   clustershell
     #   kubernetes
     #   yamllint
-pyzmq==22.0.3 ; python_version < "3.9" and sys_platform == "win32"
+pyzmq==22.0.3 ; sys_platform == "win32"
     # via
     #   -r requirements/zeromq.txt
     #   pytest-salt-factories

requirements/static/ci/py3.9/cloud.txt

@@ -790,7 +790,7 @@ pyyaml==5.4.1
     #   kubernetes
     #   napalm
     #   yamlordereddictloader
-pyzmq==23.2.0 ; python_version >= "3.9"
+pyzmq==23.2.0
     # via
     #   -r requirements/zeromq.txt
     #   pytest-salt-factories

requirements/static/ci/py3.9/darwin.txt

@@ -784,7 +784,7 @@ pyyaml==5.4.1
     #   napalm
     #   yamllint
     #   yamlordereddictloader
-pyzmq==23.2.0 ; python_version >= "3.9"
+pyzmq==23.2.0
     # via
     #   -r requirements/zeromq.txt
     #   pytest-salt-factories

requirements/static/ci/py3.9/docs.txt

@@ -85,7 +85,7 @@ pyyaml==5.4.1
     # via
     #   -c requirements/static/ci/py3.9/linux.txt
     #   -r requirements/base.txt
-pyzmq==23.2.0 ; python_version >= "3.9"
+pyzmq==23.2.0
     # via
     #   -c requirements/static/ci/py3.9/linux.txt
     #   -r requirements/zeromq.txt

requirements/static/ci/py3.9/freebsd.txt

@@ -781,7 +781,7 @@ pyyaml==5.4.1
     #   napalm
     #   yamllint
     #   yamlordereddictloader
-pyzmq==23.2.0 ; python_version >= "3.9"
+pyzmq==23.2.0
     # via
     #   -r requirements/zeromq.txt
     #   pytest-salt-factories

requirements/static/ci/py3.9/lint.txt

@@ -760,7 +760,7 @@ pyyaml==5.4.1
     #   napalm
     #   yamllint
     #   yamlordereddictloader
-pyzmq==23.2.0 ; python_version >= "3.9"
+pyzmq==23.2.0
     # via -r requirements/zeromq.txt
 redis-py-cluster==2.1.3
     # via -r requirements/static/ci/linux.in

requirements/static/ci/py3.9/linux.txt

@@ -809,7 +809,7 @@ pyyaml==5.4.1
     #   napalm
     #   yamllint
     #   yamlordereddictloader
-pyzmq==23.2.0 ; python_version >= "3.9"
+pyzmq==23.2.0
     # via
     #   -r requirements/zeromq.txt
     #   pytest-salt-factories

requirements/static/ci/py3.9/windows.txt

@@ -320,7 +320,7 @@ pyyaml==5.4.1
     #   clustershell
     #   kubernetes
     #   yamllint
-pyzmq==23.2.0 ; python_version >= "3.9"
+pyzmq==22.0.3 ; sys_platform == "win32"
     # via
     #   -r requirements/zeromq.txt
     #   pytest-salt-factories

requirements/static/pkg/py3.10/darwin.txt

@@ -94,7 +94,7 @@ pytz==2022.1
     # via tempora
 pyyaml==5.4.1
     # via -r requirements/base.txt
-pyzmq==23.2.0 ; python_version >= "3.9"
+pyzmq==23.2.0
     # via -r requirements/zeromq.txt
 requests==2.25.1
     # via

requirements/static/pkg/py3.10/freebsd.txt

@@ -79,7 +79,7 @@ pytz==2022.1
     # via tempora
 pyyaml==5.4.1
     # via -r requirements/base.txt
-pyzmq==23.2.0 ; python_version >= "3.9"
+pyzmq==23.2.0
     # via -r requirements/zeromq.txt
 requests==2.25.1
     # via -r requirements/base.txt

requirements/static/pkg/py3.10/linux.txt

@@ -77,7 +77,7 @@ pytz==2022.1
     # via tempora
 pyyaml==5.4.1
     # via -r requirements/base.txt
-pyzmq==23.2.0 ; python_version >= "3.9"
+pyzmq==23.2.0
     # via -r requirements/zeromq.txt
 requests==2.25.1
     # via -r requirements/base.txt

requirements/static/pkg/py3.10/windows.txt

@@ -109,7 +109,7 @@ pywin32==305
     #   wmi
 pyyaml==5.4.1
     # via -r requirements/base.txt
-pyzmq==23.2.0 ; python_version >= "3.9"
+pyzmq==22.0.3 ; sys_platform == "win32"
     # via -r requirements/zeromq.txt
 requests==2.25.1
     # via

requirements/static/pkg/py3.6/linux.txt

@@ -81,7 +81,7 @@ pytz==2022.1
     # via tempora
 pyyaml==5.4.1
     # via -r requirements/base.txt
-pyzmq==18.0.1 ; python_version < "3.9"
+pyzmq==23.2.0
     # via -r requirements/zeromq.txt
 requests==2.25.1
     # via -r requirements/base.txt

requirements/static/pkg/py3.7/freebsd.txt

@@ -77,7 +77,7 @@ pytz==2022.1
     # via tempora
 pyyaml==5.4.1
     # via -r requirements/base.txt
-pyzmq==18.0.1 ; python_version < "3.9"
+pyzmq==23.2.0
     # via -r requirements/zeromq.txt
 requests==2.25.1
     # via -r requirements/base.txt

requirements/static/pkg/py3.7/linux.txt

@@ -75,7 +75,7 @@ pytz==2022.1
     # via tempora
 pyyaml==5.4.1
     # via -r requirements/base.txt
-pyzmq==18.0.1 ; python_version < "3.9"
+pyzmq==23.2.0
     # via -r requirements/zeromq.txt
 requests==2.25.1
     # via -r requirements/base.txt

requirements/static/pkg/py3.7/windows.txt

@@ -112,7 +112,7 @@ pywin32==305
     #   wmi
 pyyaml==5.4.1
     # via -r requirements/base.txt
-pyzmq==22.0.3 ; python_version < "3.9" and sys_platform == "win32"
+pyzmq==22.0.3 ; sys_platform == "win32"
     # via -r requirements/zeromq.txt
 requests==2.25.1
     # via

requirements/static/pkg/py3.8/freebsd.txt

@@ -77,7 +77,7 @@ pytz==2022.1
     # via tempora
 pyyaml==5.4.1
     # via -r requirements/base.txt
-pyzmq==19.0.0 ; python_version < "3.9"
+pyzmq==23.2.0
     # via -r requirements/zeromq.txt
 requests==2.25.1
     # via -r requirements/base.txt

requirements/static/pkg/py3.8/linux.txt

@@ -75,7 +75,7 @@ pytz==2022.1
     # via tempora
 pyyaml==5.4.1
     # via -r requirements/base.txt
-pyzmq==19.0.0 ; python_version < "3.9"
+pyzmq==23.2.0
     # via -r requirements/zeromq.txt
 requests==2.25.1
     # via -r requirements/base.txt

requirements/static/pkg/py3.8/windows.txt

@@ -110,7 +110,7 @@ pywin32==305
     #   wmi
 pyyaml==5.4.1
     # via -r requirements/base.txt
-pyzmq==22.0.3 ; python_version < "3.9" and sys_platform == "win32"
+pyzmq==22.0.3 ; sys_platform == "win32"
     # via -r requirements/zeromq.txt
 requests==2.25.1
     # via

requirements/static/pkg/py3.9/darwin.txt

@@ -94,7 +94,7 @@ pytz==2022.1
     # via tempora
 pyyaml==5.4.1
     # via -r requirements/base.txt
-pyzmq==23.2.0 ; python_version >= "3.9"
+pyzmq==23.2.0
     # via -r requirements/zeromq.txt
 requests==2.25.1
     # via

requirements/static/pkg/py3.9/freebsd.txt

@@ -79,7 +79,7 @@ pytz==2022.1
     # via tempora
 pyyaml==5.4.1
     # via -r requirements/base.txt
-pyzmq==23.2.0 ; python_version >= "3.9"
+pyzmq==23.2.0
     # via -r requirements/zeromq.txt
 requests==2.25.1
     # via -r requirements/base.txt

requirements/static/pkg/py3.9/linux.txt

@@ -77,7 +77,7 @@ pytz==2022.1
     # via tempora
 pyyaml==5.4.1
     # via -r requirements/base.txt
-pyzmq==23.2.0 ; python_version >= "3.9"
+pyzmq==23.2.0
     # via -r requirements/zeromq.txt
 requests==2.25.1
     # via -r requirements/base.txt

requirements/static/pkg/py3.9/windows.txt

@@ -110,7 +110,7 @@ pywin32==305
     #   wmi
 pyyaml==5.4.1
     # via -r requirements/base.txt
-pyzmq==23.2.0 ; python_version >= "3.9"
+pyzmq==22.0.3 ; sys_platform == "win32"
     # via -r requirements/zeromq.txt
 requests==2.25.1
     # via

requirements/zeromq.txt

@@ -1,10 +1,7 @@
 -r base.txt
 -r crypto.txt
 
-pyzmq<=20.0.0 ; python_version < "3.6"
-pyzmq>=17.0.0 ; python_version < "3.9"
-pyzmq>19.0.2 ; python_version >= "3.9"
-
+pyzmq>=20.0.0
 # We can't use 23+ on Windows until they fix this:
 # https://github.com/zeromq/pyzmq/issues/1472
-pyzmq>=20.0.0, <=22.0.3 ; python_version < "3.9" and sys_platform == 'win32'
+pyzmq>=20.0.0, <=22.0.3 ; sys_platform == "win32"

salt/utils/master.py

@@ -568,7 +568,7 @@ class CacheTimer(Thread):
         count = 0
         log.debug("ConCache-Timer started")
         while not self.stopped.wait(1):
-            socket.send(salt.payload.dumps(count))
+            socket.send(salt.payload.dumps(count))  # pylint: disable=missing-kwoa
 
             count += 1
             if count >= 60:
@@ -733,7 +733,7 @@ class ConnectedCache(Process):
                     if msg == "minions":
                         # Send reply back to client
                         reply = salt.payload.dumps(self.minions)
-                        creq_in.send(reply)
+                        creq_in.send(reply)  # pylint: disable=missing-kwoa
 
             # check for next cache-update from workers
             if socks.get(cupd_in) == zmq.POLLIN:

tests/pytests/functional/test_payload.py

@@ -58,7 +58,7 @@ class EchoServer:
                         msg_deserialized["load"]["sleep"],
                     )
                     time.sleep(msg_deserialized["load"]["sleep"])
-                socket.send(message)
+                socket.send(message)  # pylint: disable=missing-kwoa
             except zmq.ZMQError as exc:
                 if exc.errno == errno.EAGAIN:
                     continue