Update dev scripts

4 files changed, 17 insertions, 4 deletions

diff --git a/dev/_import.py b/dev/_import.py
index caad219..d64c028 100644
--- a/dev/_import.py
+++ b/dev/_import.py
@@ -107,10 +107,15 @@ def _preload(require_oscrypto, print_info):
             )
         )
         if require_oscrypto:
+            backend = oscrypto.backend()
+            if backend == 'openssl':
+                from oscrypto._openssl._libcrypto import libcrypto_version
+                backend = '%s (%s)' % (backend, libcrypto_version)
+
             print(
-                'oscrypto: %s backend, %s, %s' % (
-                    oscrypto.backend(),
+                'oscrypto: %s, %s backend, %s' % (
                     oscrypto.__version__,
+                    backend,
                     os.path.dirname(oscrypto.__file__)
                 )
             )
diff --git a/dev/ci-driver.py b/dev/ci-driver.py
index af9d7e4..37c46f9 100644
--- a/dev/ci-driver.py
+++ b/dev/ci-driver.py
@@ -54,6 +54,12 @@ def run(**_):
         else:
             _write_env(env, 'OSCRYPTO_USE_OPENSSL', '/usr/lib/libcrypto.35.dylib,/usr/lib/libssl.35.dylib')
         newline = True
+    if 'openssl3' in options and sys.platform == 'darwin':
+        _write_env(
+            env,
+            'OSCRYPTO_USE_OPENSSL',
+            '/usr/local/opt/openssl@3/lib/libcrypto.dylib,/usr/local/opt/openssl@3/lib/libssl.dylib'
+        )
     if 'winlegacy' in options:
         _write_env(env, 'OSCRYPTO_USE_WINLEGACY', 'true')
         newline = True
diff --git a/dev/ci.py b/dev/ci.py
index 946d5b8..2f4cdb8 100644
--- a/dev/ci.py
+++ b/dev/ci.py
@@ -12,6 +12,8 @@ from ._import import _preload
 deps_dir = os.path.join(build_root, 'modularcrypto-deps')
 if os.path.exists(deps_dir):
     site.addsitedir(deps_dir)
+    # In case any of the deps are installed system-wide
+    sys.path.insert(0, deps_dir)
 
 if sys.version_info[0:2] not in [(2, 6), (3, 2)]:
     from .lint import run as run_lint
diff --git a/dev/deps.py b/dev/deps.py
index 9f558a1..432be79 100644
--- a/dev/deps.py
+++ b/dev/deps.py
@@ -323,7 +323,7 @@ def _extract_package(deps_dir, pkg_path, pkg_dir):
                 zf.close()
         return
 
-    # Source archives may contain a bunch of other things, including mutliple
+    # Source archives may contain a bunch of other things, including multiple
     # packages, so we must use setup.py/setuptool to install/extract it
 
     ar = None
@@ -541,7 +541,7 @@ def _stage_requirements(deps_dir, path):
     Python do not support that
 
     :param deps_dir:
-        A unicode path to a temporary diretory to use for downloads
+        A unicode path to a temporary directory to use for downloads
 
     :param path:
         A unicode filesystem path to a requirements file