Updated test to use importorskip, downgrade pyyaml to 5.3.1 to work around cython 3.0 issues

requirements/base.txt

@@ -1,3 +1,4 @@
+cython
 Jinja2
 jmespath
 msgpack>=0.5,!=0.5.5

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

@@ -400,6 +400,8 @@ cryptography==41.0.2
     #   requests-ntlm
     #   smbprotocol
     #   vcert
+cython==0.29.36
+    # via -r requirements/base.txt
 distlib==0.3.2
     # via virtualenv
 distro==1.6.0

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

@@ -398,6 +398,8 @@ cryptography==41.0.2
     #   paramiko
     #   pyopenssl
     #   vcert
+cython==0.29.36
+    # via -r requirements/base.txt
 distlib==0.3.2
     # via virtualenv
 distro==1.5.0

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

@@ -28,6 +28,10 @@ contextvars==2.4
     # via
     #   -c requirements/static/ci/py3.10/linux.txt
     #   -r requirements/base.txt
+cython==0.29.36
+    # via
+    #   -c requirements/static/ci/py3.10/linux.txt
+    #   -r requirements/base.txt
 distro==1.5.0
     # via
     #   -c requirements/static/ci/py3.10/linux.txt

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

@@ -395,6 +395,8 @@ cryptography==41.0.2
     #   paramiko
     #   pyopenssl
     #   vcert
+cython==0.29.36
+    # via -r requirements/base.txt
 distlib==0.3.2
     # via virtualenv
 distro==1.5.0

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

@@ -403,6 +403,8 @@ cryptography==41.0.2
     #   paramiko
     #   pyopenssl
     #   vcert
+cython==0.29.36
+    # via -r requirements/base.txt
 distlib==0.3.2
     # via virtualenv
 distro==1.6.0

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

@@ -411,6 +411,8 @@ cryptography==41.0.2
     #   paramiko
     #   pyopenssl
     #   vcert
+cython==0.29.36
+    # via -r requirements/base.txt
 distlib==0.3.2
     # via virtualenv
 distro==1.5.0

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

@@ -29,6 +29,8 @@ colorama==0.4.6
     # via pytest
 contextvars==2.4
     # via -r requirements/base.txt
+cython==0.29.36
+    # via -r requirements/base.txt
 distlib==0.3.6
     # via virtualenv
 distro==1.8.0

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

@@ -23,6 +23,8 @@ cherrypy==18.8.0
     # via -r requirements/static/ci/pkgtests.in
 contextvars==2.4
     # via -r requirements/base.txt
+cython==0.29.36
+    # via -r requirements/base.txt
 distlib==0.3.6
     # via virtualenv
 distro==1.8.0

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

@@ -79,6 +79,8 @@ cryptography==41.0.2
     #   moto
     #   pyopenssl
     #   requests-ntlm
+cython==0.29.36
+    # via -r requirements/base.txt
 distlib==0.3.6
     # via virtualenv
 distro==1.5.0

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

@@ -407,6 +407,8 @@ cryptography==41.0.2
     #   requests-ntlm
     #   smbprotocol
     #   vcert
+cython==0.29.36
+    # via -r requirements/base.txt
 distlib==0.3.3
     # via virtualenv
 distro==1.6.0

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

@@ -28,6 +28,10 @@ contextvars==2.4
     # via
     #   -c requirements/static/ci/py3.7/linux.txt
     #   -r requirements/base.txt
+cython==0.29.36
+    # via
+    #   -c requirements/static/ci/py3.7/linux.txt
+    #   -r requirements/base.txt
 distro==1.5.0
     # via
     #   -c requirements/static/ci/py3.7/linux.txt

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

@@ -402,6 +402,8 @@ cryptography==41.0.2
     #   paramiko
     #   pyopenssl
     #   vcert
+cython==0.29.36
+    # via -r requirements/base.txt
 distlib==0.3.2
     # via virtualenv
 distro==1.5.0

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

@@ -412,6 +412,8 @@ cryptography==41.0.2
     #   paramiko
     #   pyopenssl
     #   vcert
+cython==0.29.36
+    # via -r requirements/base.txt
 distlib==0.3.2
     # via virtualenv
 distro==1.6.0

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

@@ -418,6 +418,8 @@ cryptography==41.0.2
     #   paramiko
     #   pyopenssl
     #   vcert
+cython==0.29.36
+    # via -r requirements/base.txt
 distlib==0.3.2
     # via virtualenv
 distro==1.5.0

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

@@ -85,6 +85,8 @@ cryptography==41.0.2
     #   moto
     #   pyopenssl
     #   requests-ntlm
+cython==0.29.36
+    # via -r requirements/base.txt
 distlib==0.3.2
     # via virtualenv
 distro==1.5.0

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

@@ -405,6 +405,8 @@ cryptography==41.0.2
     #   requests-ntlm
     #   smbprotocol
     #   vcert
+cython==0.29.36
+    # via -r requirements/base.txt
 distlib==0.3.3
     # via virtualenv
 distro==1.6.0

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

@@ -28,6 +28,10 @@ contextvars==2.4
     # via
     #   -c requirements/static/ci/py3.8/linux.txt
     #   -r requirements/base.txt
+cython==0.29.36
+    # via
+    #   -c requirements/static/ci/py3.8/linux.txt
+    #   -r requirements/base.txt
 distro==1.5.0
     # via
     #   -c requirements/static/ci/py3.8/linux.txt

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

@@ -400,6 +400,8 @@ cryptography==41.0.2
     #   paramiko
     #   pyopenssl
     #   vcert
+cython==0.29.36
+    # via -r requirements/base.txt
 distlib==0.3.2
     # via virtualenv
 distro==1.5.0

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

@@ -410,6 +410,8 @@ cryptography==41.0.2
     #   paramiko
     #   pyopenssl
     #   vcert
+cython==0.29.36
+    # via -r requirements/base.txt
 distlib==0.3.2
     # via virtualenv
 distro==1.6.0

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

@@ -416,6 +416,8 @@ cryptography==41.0.2
     #   paramiko
     #   pyopenssl
     #   vcert
+cython==0.29.36
+    # via -r requirements/base.txt
 distlib==0.3.2
     # via virtualenv
 distro==1.5.0

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

@@ -81,6 +81,8 @@ cryptography==41.0.2
     #   moto
     #   pyopenssl
     #   requests-ntlm
+cython==0.29.36
+    # via -r requirements/base.txt
 distlib==0.3.2
     # via virtualenv
 distro==1.5.0

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

@@ -405,6 +405,8 @@ cryptography==41.0.2
     #   requests-ntlm
     #   smbprotocol
     #   vcert
+cython==0.29.36
+    # via -r requirements/base.txt
 distlib==0.3.3
     # via virtualenv
 distro==1.6.0

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

@@ -403,6 +403,8 @@ cryptography==41.0.2
     #   paramiko
     #   pyopenssl
     #   vcert
+cython==0.29.36
+    # via -r requirements/base.txt
 distlib==0.3.2
     # via virtualenv
 distro==1.5.0

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

@@ -28,6 +28,10 @@ contextvars==2.4
     # via
     #   -c requirements/static/ci/py3.9/linux.txt
     #   -r requirements/base.txt
+cython==0.29.36
+    # via
+    #   -c requirements/static/ci/py3.9/linux.txt
+    #   -r requirements/base.txt
 distro==1.5.0
     # via
     #   -c requirements/static/ci/py3.9/linux.txt

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

@@ -400,6 +400,8 @@ cryptography==41.0.2
     #   paramiko
     #   pyopenssl
     #   vcert
+cython==0.29.36
+    # via -r requirements/base.txt
 distlib==0.3.2
     # via virtualenv
 distro==1.5.0

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

@@ -408,6 +408,8 @@ cryptography==41.0.2
     #   paramiko
     #   pyopenssl
     #   vcert
+cython==0.29.36
+    # via -r requirements/base.txt
 distlib==0.3.2
     # via virtualenv
 distro==1.6.0

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

@@ -418,6 +418,8 @@ cryptography==41.0.2
     #   paramiko
     #   pyopenssl
     #   vcert
+cython==0.29.36
+    # via -r requirements/base.txt
 distlib==0.3.2
     # via virtualenv
 distro==1.5.0

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

@@ -81,6 +81,8 @@ cryptography==41.0.2
     #   moto
     #   pyopenssl
     #   requests-ntlm
+cython==0.29.36
+    # via -r requirements/base.txt
 distlib==0.3.2
     # via virtualenv
 distro==1.5.0

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

@@ -22,6 +22,8 @@ cryptography==41.0.2
     # via
     #   -r requirements/darwin.txt
     #   pyopenssl
+cython==0.29.36
+    # via -r requirements/base.txt
 distro==1.5.0
     # via -r requirements/base.txt
 gitdb==4.0.5

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

@@ -18,6 +18,8 @@ contextvars==2.4
     # via -r requirements/base.txt
 cryptography==41.0.2
     # via pyopenssl
+cython==0.29.36
+    # via -r requirements/base.txt
 distro==1.5.0
     # via
     #   -r requirements/base.txt

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

@@ -20,6 +20,8 @@ cryptography==41.0.2
     # via
     #   -r requirements/static/pkg/linux.in
     #   pyopenssl
+cython==0.29.36
+    # via -r requirements/base.txt
 distro==1.5.0
     # via -r requirements/base.txt
 idna==2.8

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

@@ -27,6 +27,8 @@ cryptography==41.0.2
     # via
     #   -r requirements/windows.txt
     #   pyopenssl
+cython==0.29.36
+    # via -r requirements/base.txt
 distro==1.5.0
     # via -r requirements/base.txt
 gitdb==4.0.7

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

@@ -18,6 +18,8 @@ contextvars==2.4
     # via -r requirements/base.txt
 cryptography==41.0.2
     # via pyopenssl
+cython==0.29.36
+    # via -r requirements/base.txt
 distro==1.5.0
     # via
     #   -r requirements/base.txt

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

@@ -20,6 +20,8 @@ cryptography==41.0.2
     # via
     #   -r requirements/static/pkg/linux.in
     #   pyopenssl
+cython==0.29.36
+    # via -r requirements/base.txt
 distro==1.5.0
     # via -r requirements/base.txt
 idna==2.8

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

@@ -27,6 +27,8 @@ cryptography==41.0.2
     # via
     #   -r requirements/windows.txt
     #   pyopenssl
+cython==0.29.36
+    # via -r requirements/base.txt
 distro==1.5.0
     # via -r requirements/base.txt
 gitdb==4.0.7

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

@@ -18,6 +18,8 @@ contextvars==2.4
     # via -r requirements/base.txt
 cryptography==41.0.2
     # via pyopenssl
+cython==0.29.36
+    # via -r requirements/base.txt
 distro==1.5.0
     # via
     #   -r requirements/base.txt

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

@@ -20,6 +20,8 @@ cryptography==41.0.2
     # via
     #   -r requirements/static/pkg/linux.in
     #   pyopenssl
+cython==0.29.36
+    # via -r requirements/base.txt
 distro==1.5.0
     # via -r requirements/base.txt
 idna==2.8

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

@@ -27,6 +27,8 @@ cryptography==41.0.2
     # via
     #   -r requirements/windows.txt
     #   pyopenssl
+cython==0.29.36
+    # via -r requirements/base.txt
 distro==1.5.0
     # via -r requirements/base.txt
 gitdb==4.0.7

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

@@ -22,6 +22,8 @@ cryptography==41.0.2
     # via
     #   -r requirements/darwin.txt
     #   pyopenssl
+cython==0.29.36
+    # via -r requirements/base.txt
 distro==1.5.0
     # via -r requirements/base.txt
 gitdb==4.0.5

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

@@ -18,6 +18,8 @@ contextvars==2.4
     # via -r requirements/base.txt
 cryptography==41.0.2
     # via pyopenssl
+cython==0.29.36
+    # via -r requirements/base.txt
 distro==1.5.0
     # via
     #   -r requirements/base.txt

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

@@ -20,6 +20,8 @@ cryptography==41.0.2
     # via
     #   -r requirements/static/pkg/linux.in
     #   pyopenssl
+cython==0.29.36
+    # via -r requirements/base.txt
 distro==1.5.0
     # via -r requirements/base.txt
 idna==2.8

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

@@ -27,6 +27,8 @@ cryptography==41.0.2
     # via
     #   -r requirements/windows.txt
     #   pyopenssl
+cython==0.29.36
+    # via -r requirements/base.txt
 distro==1.5.0
     # via -r requirements/base.txt
 gitdb==4.0.7

salt/utils/nacl.py

@@ -2,9 +2,7 @@
 Common code shared between the nacl module and runner.
 """
 
-
 import base64
-import logging
 import os
 
 import salt.syspaths
@@ -15,9 +13,6 @@ import salt.utils.versions
 import salt.utils.win_dacl
 import salt.utils.win_functions
 
-log = logging.getLogger(__name__)
-
-
 REQ_ERROR = None
 try:
     import nacl.public

tests/pytests/integration/runners/test_nacl.py

@@ -8,21 +8,16 @@ import salt.config
 import salt.utils.stringutils
 from tests.support.mock import patch
 
+pytest.importorskip("nacl.public")
+pytest.importorskip("nacl.secret")
+
+import salt.runners.nacl as nacl
+
 pytestmark = [
     pytest.mark.windows_whitelisted,
 ]
 
-try:
-    import salt.runners.nacl as nacl
 
-    HAS_PYNACL = True
-except (ImportError, OSError, AttributeError):
-    HAS_PYNACL = False
-
-
-@pytest.mark.skipif(
-    not HAS_PYNACL, reason="skipping test_nacl, reason=PyNaCl is unavailable"
-)
 @pytest.fixture(scope="module")
 def minion_opts():
     return salt.config.minion_config(None)

tests/pytests/unit/modules/test_nacl.py

@@ -6,17 +6,12 @@ import pytest
 import salt.utils.stringutils
 from tests.support.mock import patch
 
-try:
-    import salt.modules.nacl as nacl
+pytest.importorskip("nacl.public")
+pytest.importorskip("nacl.secret")
 
-    HAS_PYNACL = True
-except (ImportError, OSError, AttributeError):
-    HAS_PYNACL = False
+import salt.modules.nacl as nacl
 
 
-@pytest.mark.skipif(
-    not HAS_PYNACL, reason="skipping test_nacl, reason=PyNaCl is unavailable"
-)
 @pytest.fixture
 def configure_loader_modules(minion_opts):
     utils = salt.loader.utils(minion_opts)

tests/pytests/unit/utils/test_nacl.py

@@ -9,17 +9,12 @@ import salt.modules.config as config
 import salt.utils.files
 from tests.support.mock import patch
 
-try:
-    import salt.utils.nacl as nacl
+pytest.importorskip("nacl.public")
+pytest.importorskip("nacl.secret")
 
-    HAS_PYNACL = nacl.check_requirements
-except (ImportError, OSError, AttributeError):
-    HAS_PYNACL = False
+import salt.utils.nacl as nacl
 
 
-@pytest.mark.skipif(
-    not HAS_PYNACL, reason="skipping test_nacl, reason=PyNaCl is unavailable"
-)
 @pytest.fixture
 def configure_loader_modules():
     return {