diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 7be11bf3382..0fbbfcfaa19 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -242,13 +242,12 @@ repos:
       - id: pip-tools-compile
         alias: compile-darwin-py3.5-zmq-requirements
         name: Darwin Py3.5 ZeroMQ Requirements
-        files: ^(pkg/osx/(req|req_ext|req_pyobjc)\.txt|requirements/((base|zeromq|pytest)\.txt|static/darwin\.in))$
+        files: ^(pkg/osx/(req|req_pyobjc)\.txt|requirements/((base|zeromq|pytest)\.txt|static/darwin\.in))$
         args:
           - -v
           - --py-version=3.5
           - --platform=darwin
           - --include=pkg/osx/req.txt
-          - --include=pkg/osx/req_ext.txt
           - --include=pkg/osx/req_pyobjc.txt
           - --include=requirements/base.txt
           - --include=requirements/zeromq.txt
@@ -258,13 +257,12 @@ repos:
       - id: pip-tools-compile
         alias: compile-darwin-py3.6-zmq-requirements
         name: Darwin Py3.6 ZeroMQ Requirements
-        files: ^(pkg/osx/(req|req_ext|req_pyobjc)\.txt|requirements/((base|zeromq|pytest)\.txt|static/darwin\.in))$
+        files: ^(pkg/osx/(req|req_pyobjc)\.txt|requirements/((base|zeromq|pytest)\.txt|static/darwin\.in))$
         args:
           - -v
           - --py-version=3.6
           - --platform=darwin
           - --include=pkg/osx/req.txt
-          - --include=pkg/osx/req_ext.txt
           - --include=pkg/osx/req_pyobjc.txt
           - --include=requirements/base.txt
           - --include=requirements/zeromq.txt
@@ -274,13 +272,12 @@ repos:
       - id: pip-tools-compile
         alias: compile-darwin-py3.7-zmq-requirements
         name: Darwin Py3.7 ZeroMQ Requirements
-        files: ^(pkg/osx/(req|req_ext|req_pyobjc)\.txt|requirements/((base|zeromq|pytest)\.txt|static/darwin\.in))$
+        files: ^(pkg/osx/(req|req_pyobjc)\.txt|requirements/((base|zeromq|pytest)\.txt|static/darwin\.in))$
         args:
           - -v
           - --py-version=3.7
           - --platform=darwin
           - --include=pkg/osx/req.txt
-          - --include=pkg/osx/req_ext.txt
           - --include=pkg/osx/req_pyobjc.txt
           - --include=requirements/base.txt
           - --include=requirements/zeromq.txt
@@ -290,13 +287,12 @@ repos:
       - id: pip-tools-compile
         alias: compile-darwin-py3.8-zmq-requirements
         name: Darwin Py3.8 ZeroMQ Requirements
-        files: ^(pkg/osx/(req|req_ext)\.txt|requirements/((base|zeromq|pytest)\.txt|static/darwin\.in))$
+        files: ^(pkg/osx/(req|req_pyobjc)\.txt|requirements/((base|zeromq|pytest)\.txt|static/darwin\.in))$
         args:
           - -v
           - --py-version=3.8
           - --platform=darwin
           - --include=pkg/osx/req.txt
-          - --include=pkg/osx/req_ext.txt
           - --include=requirements/base.txt
           - --include=requirements/zeromq.txt
           - --include=requirements/pytest.txt
@@ -305,13 +301,12 @@ repos:
       - id: pip-tools-compile
         alias: compile-darwin-py3.9-zmq-requirements
         name: Darwin Py3.9 ZeroMQ Requirements
-        files: ^(pkg/osx/(req|req_ext)\.txt|requirements/((base|zeromq|pytest)\.txt|static/darwin\.in))$
+        files: ^(pkg/osx/(req|req_pyobjc)\.txt|requirements/((base|zeromq|pytest)\.txt|static/darwin\.in))$
         args:
           - -v
           - --py-version=3.9
           - --platform=darwin
           - --include=pkg/osx/req.txt
-          - --include=pkg/osx/req_ext.txt
           - --include=requirements/base.txt
           - --include=requirements/zeromq.txt
           - --include=requirements/pytest.txt
diff --git a/pkg/osx/req.txt b/pkg/osx/req.txt
index f61332da398..6d569066af0 100644
--- a/pkg/osx/req.txt
+++ b/pkg/osx/req.txt
@@ -1,4 +1,5 @@
 apache-libcloud==2.4.0
+backports.ssl_match_hostname==3.7.0.1 ; python_version < "3.7"
 certifi
 cffi==1.12.2
 CherryPy==17.4.1
diff --git a/requirements/static/py3.5/darwin.txt b/requirements/static/py3.5/darwin.txt
index 4b068986a8e..1ce7355f6e6 100644
--- a/requirements/static/py3.5/darwin.txt
+++ b/requirements/static/py3.5/darwin.txt
@@ -2,7 +2,7 @@
 # This file is autogenerated by pip-compile
 # To update, run:
 #
-#    pip-compile -o requirements/static/py3.5/darwin.txt -v pkg/osx/req.txt pkg/osx/req_ext.txt pkg/osx/req_pyobjc.txt requirements/base.txt requirements/zeromq.txt requirements/pytest.txt requirements/static/darwin.in
+#    pip-compile -o requirements/static/py3.5/darwin.txt -v pkg/osx/req.txt pkg/osx/req_pyobjc.txt requirements/base.txt requirements/zeromq.txt requirements/pytest.txt requirements/static/darwin.in
 #
 apache-libcloud==2.4.0
 appdirs==1.4.3            # via virtualenv
@@ -11,7 +11,7 @@ asn1crypto==1.3.0         # via certvalidator, cryptography, oscrypto
 attrs==19.1.0             # via pytest
 aws-xray-sdk==0.95        # via moto
 backports.functools-lru-cache==1.5  # via cheroot
-backports.ssl_match_hostname==3.7.0.1
+backports.ssl_match_hostname==3.7.0.1 ; python_version < "3.7"
 bcrypt==3.1.6             # via paramiko
 boto3==1.13.5
 boto==2.49.0
@@ -65,7 +65,6 @@ markupsafe==1.1.1
 mock==3.0.5 ; python_version < "3.6"
 more-itertools==5.0.0
 moto==1.3.7
-msgpack-python==0.5.6
 msgpack==0.5.6
 ncclient==0.6.4           # via junos-eznc
 netaddr==0.7.19           # via junos-eznc
@@ -81,7 +80,7 @@ psutil==5.6.6
 py==1.8.0                 # via pytest
 pyaml==19.4.1             # via moto
 pyasn1-modules==0.2.4     # via google-auth
-pyasn1==0.4.5
+pyasn1==0.4.8
 pycparser==2.19
 pycryptodome==3.8.1       # via python-jose
 pycryptodomex==3.9.7
@@ -101,7 +100,7 @@ python-jose==2.0.2        # via moto
 pytz==2019.1              # via moto, tempora
 pyvmomi==6.7.1.2018.12
 pyyaml==5.1.2
-pyzmq==18.0.1
+pyzmq==18.0.1 ; python_version < "3.8"
 requests==2.21.0
 responses==0.10.6         # via moto
 rfc3987==1.3.8
@@ -110,7 +109,7 @@ s3transfer==0.3.3         # via boto3
 salttesting==2017.6.1
 scp==0.13.2               # via junos-eznc
 setproctitle==1.1.10
-six==1.12.0               # via bcrypt, cassandra-driver, cheroot, cherrypy, cryptography, docker, docker-pycreds, geomet, google-auth, junos-eznc, kubernetes, mock, more-itertools, moto, ncclient, packaging, pathlib2, pynacl, pyopenssl, python-dateutil, python-jose, pyvmomi, responses, salttesting, tempora, textfsm, transitions, vcert, virtualenv, websocket-client
+six==1.14.0
 smmap2==2.0.5             # via gitdb2
 strict-rfc3339==0.7
 tempora==1.14.1           # via portend
diff --git a/requirements/static/py3.6/darwin.txt b/requirements/static/py3.6/darwin.txt
index f3f6a104764..a5d9b3c54f2 100644
--- a/requirements/static/py3.6/darwin.txt
+++ b/requirements/static/py3.6/darwin.txt
@@ -2,7 +2,7 @@
 # This file is autogenerated by pip-compile
 # To update, run:
 #
-#    pip-compile -o requirements/static/py3.6/darwin.txt -v pkg/osx/req.txt pkg/osx/req_ext.txt pkg/osx/req_pyobjc.txt requirements/base.txt requirements/zeromq.txt requirements/pytest.txt requirements/static/darwin.in
+#    pip-compile -o requirements/static/py3.6/darwin.txt -v pkg/osx/req.txt pkg/osx/req_pyobjc.txt requirements/base.txt requirements/zeromq.txt requirements/pytest.txt requirements/static/darwin.in
 #
 apache-libcloud==2.4.0
 appdirs==1.4.3            # via virtualenv
@@ -11,7 +11,7 @@ asn1crypto==1.3.0         # via certvalidator, cryptography, oscrypto
 attrs==19.1.0             # via pytest
 aws-xray-sdk==0.95        # via moto
 backports.functools-lru-cache==1.5  # via cheroot
-backports.ssl_match_hostname==3.7.0.1
+backports.ssl_match_hostname==3.7.0.1 ; python_version < "3.7"
 bcrypt==3.1.6             # via paramiko
 boto3==1.13.5
 boto==2.49.0
@@ -65,7 +65,6 @@ markupsafe==1.1.1
 mock==3.0.5
 more-itertools==5.0.0
 moto==1.3.7
-msgpack-python==0.5.6
 msgpack==0.5.6
 ncclient==0.6.4           # via junos-eznc
 netaddr==0.7.19           # via junos-eznc
@@ -80,7 +79,7 @@ psutil==5.6.6
 py==1.8.0                 # via pytest
 pyaml==19.4.1             # via moto
 pyasn1-modules==0.2.4     # via google-auth
-pyasn1==0.4.5
+pyasn1==0.4.8
 pycparser==2.19
 pycryptodome==3.8.1       # via python-jose
 pycryptodomex==3.9.7
@@ -100,7 +99,7 @@ python-jose==2.0.2        # via moto
 pytz==2019.1              # via moto, tempora
 pyvmomi==6.7.1.2018.12
 pyyaml==5.1.2
-pyzmq==18.0.1
+pyzmq==18.0.1 ; python_version < "3.8"
 requests==2.21.0
 responses==0.10.6         # via moto
 rfc3987==1.3.8
@@ -109,7 +108,7 @@ s3transfer==0.3.3         # via boto3
 salttesting==2017.6.1
 scp==0.13.2               # via junos-eznc
 setproctitle==1.1.10
-six==1.12.0               # via bcrypt, cassandra-driver, cheroot, cherrypy, cryptography, docker, docker-pycreds, geomet, google-auth, junos-eznc, kubernetes, mock, more-itertools, moto, ncclient, packaging, pynacl, pyopenssl, python-dateutil, python-jose, pyvmomi, responses, salttesting, tempora, textfsm, transitions, vcert, virtualenv, websocket-client
+six==1.14.0
 smmap2==2.0.5             # via gitdb2
 strict-rfc3339==0.7
 tempora==1.14.1           # via portend
diff --git a/requirements/static/py3.7/darwin.txt b/requirements/static/py3.7/darwin.txt
index a01692ede39..d0c21c13c41 100644
--- a/requirements/static/py3.7/darwin.txt
+++ b/requirements/static/py3.7/darwin.txt
@@ -2,7 +2,7 @@
 # This file is autogenerated by pip-compile
 # To update, run:
 #
-#    pip-compile -o requirements/static/py3.7/darwin.txt -v pkg/osx/req.txt pkg/osx/req_ext.txt pkg/osx/req_pyobjc.txt requirements/base.txt requirements/zeromq.txt requirements/pytest.txt requirements/static/darwin.in
+#    pip-compile -o requirements/static/py3.7/darwin.txt -v pkg/osx/req.txt pkg/osx/req_pyobjc.txt requirements/base.txt requirements/zeromq.txt requirements/pytest.txt requirements/static/darwin.in
 #
 apache-libcloud==2.4.0
 appdirs==1.4.3            # via virtualenv
@@ -11,7 +11,6 @@ asn1crypto==1.3.0         # via certvalidator, cryptography, oscrypto
 attrs==19.1.0             # via pytest
 aws-xray-sdk==0.95        # via moto
 backports.functools-lru-cache==1.5  # via cheroot
-backports.ssl_match_hostname==3.7.0.1
 bcrypt==3.1.6             # via paramiko
 boto3==1.13.5
 boto==2.49.0
@@ -64,7 +63,6 @@ markupsafe==1.1.1
 mock==3.0.5
 more-itertools==5.0.0
 moto==1.3.7
-msgpack-python==0.5.6
 msgpack==0.5.6
 ncclient==0.6.4           # via junos-eznc
 netaddr==0.7.19           # via junos-eznc
@@ -79,7 +77,7 @@ psutil==5.6.6
 py==1.8.0                 # via pytest
 pyaml==19.4.1             # via moto
 pyasn1-modules==0.2.4     # via google-auth
-pyasn1==0.4.5
+pyasn1==0.4.8
 pycparser==2.19
 pycryptodome==3.8.1       # via python-jose
 pycryptodomex==3.9.7
@@ -99,7 +97,7 @@ python-jose==2.0.2        # via moto
 pytz==2019.1              # via moto, tempora
 pyvmomi==6.7.1.2018.12
 pyyaml==5.1.2
-pyzmq==18.0.1
+pyzmq==18.0.1 ; python_version < "3.8"
 requests==2.21.0
 responses==0.10.6         # via moto
 rfc3987==1.3.8
@@ -108,7 +106,7 @@ s3transfer==0.3.3         # via boto3
 salttesting==2017.6.1
 scp==0.13.2               # via junos-eznc
 setproctitle==1.1.10
-six==1.12.0               # via bcrypt, cassandra-driver, cheroot, cherrypy, cryptography, docker, docker-pycreds, geomet, google-auth, junos-eznc, kubernetes, mock, more-itertools, moto, ncclient, packaging, pynacl, pyopenssl, python-dateutil, python-jose, pyvmomi, responses, salttesting, tempora, textfsm, transitions, vcert, virtualenv, websocket-client
+six==1.14.0
 smmap2==2.0.5             # via gitdb2
 strict-rfc3339==0.7
 tempora==1.14.1           # via portend
diff --git a/requirements/static/py3.8/darwin.txt b/requirements/static/py3.8/darwin.txt
index 563bf8e6252..f1da226b0bc 100644
--- a/requirements/static/py3.8/darwin.txt
+++ b/requirements/static/py3.8/darwin.txt
@@ -2,7 +2,7 @@
 # This file is autogenerated by pip-compile
 # To update, run:
 #
-#    pip-compile -o requirements/static/py3.8/darwin.txt -v pkg/osx/req.txt pkg/osx/req_ext.txt requirements/base.txt requirements/zeromq.txt requirements/pytest.txt requirements/static/darwin.in
+#    pip-compile -o requirements/static/py3.8/darwin.txt -v pkg/osx/req.txt requirements/base.txt requirements/zeromq.txt requirements/pytest.txt requirements/static/darwin.in
 #
 apache-libcloud==2.4.0
 appdirs==1.4.3            # via virtualenv
@@ -11,7 +11,6 @@ asn1crypto==1.3.0         # via certvalidator, cryptography, oscrypto
 attrs==19.1.0             # via pytest
 aws-xray-sdk==0.95        # via moto
 backports.functools-lru-cache==1.5  # via cheroot
-backports.ssl_match_hostname==3.7.0.1
 bcrypt==3.1.6             # via paramiko
 boto3==1.13.5
 boto==2.49.0
@@ -63,7 +62,6 @@ markupsafe==1.1.1
 mock==3.0.5
 more-itertools==5.0.0
 moto==1.3.7
-msgpack-python==0.5.6
 msgpack==0.5.6
 ncclient==0.6.4           # via junos-eznc
 netaddr==0.7.19           # via junos-eznc
@@ -78,7 +76,7 @@ psutil==5.6.6
 py==1.8.0                 # via pytest
 pyaml==19.4.1             # via moto
 pyasn1-modules==0.2.4     # via google-auth
-pyasn1==0.4.5
+pyasn1==0.4.8
 pycparser==2.19
 pycryptodome==3.8.1       # via python-jose
 pycryptodomex==3.9.7
@@ -98,7 +96,7 @@ python-jose==2.0.2        # via moto
 pytz==2019.1              # via moto, tempora
 pyvmomi==6.7.1.2018.12
 pyyaml==5.1.2
-pyzmq==19.0.0
+pyzmq==19.0.0 ; python_version >= "3.8"
 requests==2.21.0
 responses==0.10.6         # via moto
 rfc3987==1.3.8
@@ -107,7 +105,7 @@ s3transfer==0.3.3         # via boto3
 salttesting==2017.6.1
 scp==0.13.2               # via junos-eznc
 setproctitle==1.1.10
-six==1.12.0               # via bcrypt, cassandra-driver, cheroot, cherrypy, cryptography, docker, docker-pycreds, geomet, google-auth, junos-eznc, kubernetes, mock, more-itertools, moto, ncclient, packaging, pynacl, pyopenssl, python-dateutil, python-jose, pyvmomi, responses, salttesting, tempora, textfsm, transitions, vcert, virtualenv, websocket-client
+six==1.14.0
 smmap2==2.0.5             # via gitdb2
 strict-rfc3339==0.7
 tempora==1.14.1           # via portend
diff --git a/requirements/static/py3.9/darwin.txt b/requirements/static/py3.9/darwin.txt
index e795fa85ca1..da206d09040 100644
--- a/requirements/static/py3.9/darwin.txt
+++ b/requirements/static/py3.9/darwin.txt
@@ -2,7 +2,7 @@
 # This file is autogenerated by pip-compile
 # To update, run:
 #
-#    pip-compile -o requirements/static/py3.9/darwin.txt -v pkg/osx/req.txt pkg/osx/req_ext.txt requirements/base.txt requirements/zeromq.txt requirements/pytest.txt requirements/static/darwin.in
+#    pip-compile -o requirements/static/py3.9/darwin.txt -v pkg/osx/req.txt requirements/base.txt requirements/zeromq.txt requirements/pytest.txt requirements/static/darwin.in
 #
 apache-libcloud==2.4.0
 appdirs==1.4.3            # via virtualenv
@@ -11,7 +11,6 @@ asn1crypto==1.3.0         # via certvalidator, cryptography, oscrypto
 attrs==19.1.0             # via pytest
 aws-xray-sdk==0.95        # via moto
 backports.functools-lru-cache==1.5  # via cheroot
-backports.ssl_match_hostname==3.7.0.1
 bcrypt==3.1.6             # via paramiko
 boto3==1.13.5
 boto==2.49.0
@@ -63,7 +62,6 @@ markupsafe==1.1.1
 mock==3.0.5
 more-itertools==5.0.0
 moto==1.3.7
-msgpack-python==0.5.6
 msgpack==0.5.6
 ncclient==0.6.4           # via junos-eznc
 netaddr==0.7.19           # via junos-eznc
@@ -78,7 +76,7 @@ psutil==5.6.6
 py==1.8.0                 # via pytest
 pyaml==19.4.1             # via moto
 pyasn1-modules==0.2.4     # via google-auth
-pyasn1==0.4.5
+pyasn1==0.4.8
 pycparser==2.19
 pycryptodome==3.8.1       # via python-jose
 pycryptodomex==3.9.7
@@ -98,7 +96,7 @@ python-jose==2.0.2        # via moto
 pytz==2019.1              # via moto, tempora
 pyvmomi==6.7.1.2018.12
 pyyaml==5.1.2
-pyzmq==19.0.0
+pyzmq==19.0.0 ; python_version >= "3.8"
 requests==2.21.0
 responses==0.10.6         # via moto
 rfc3987==1.3.8
@@ -107,7 +105,7 @@ s3transfer==0.3.3         # via boto3
 salttesting==2017.6.1
 scp==0.13.2               # via junos-eznc
 setproctitle==1.1.10
-six==1.12.0               # via bcrypt, cassandra-driver, cheroot, cherrypy, cryptography, docker, docker-pycreds, geomet, google-auth, junos-eznc, kubernetes, mock, more-itertools, moto, ncclient, packaging, pynacl, pyopenssl, python-dateutil, python-jose, pyvmomi, responses, salttesting, tempora, textfsm, transitions, vcert, virtualenv, websocket-client
+six==1.14.0
 smmap2==3.0.1             # via gitdb2
 smmap==3.0.4              # via smmap2
 strict-rfc3339==0.7