consolidate

Author: blink1073

.evergreen/scripts/run_tests.py

@@ -29,19 +29,10 @@
 
 # Ensure C extensions if applicable.
 if not os.environ.get("NO_EXT") and platform.python_implementation() == "CPython":
-    import bson
-    import pymongo
-
-    if not pymongo.has_c() or not bson.has_c():
-        try:
-            from pymongo import _cmessage  # type:ignore[attr-defined] # noqa: F401
-        except Exception as e:
-            LOGGER.exception(e)
-        try:
-            from bson import _cbson  # type:ignore[attr-defined] # noqa: F401
-        except Exception as e:
-            LOGGER.exception(e)
-        sys.exit("could not load C extensions")
+    sys.path.insert(0, str(ROOT / "tools"))
+    from fail_if_no_c import main as fail_if_no_c
+
+    fail_if_no_c()
 
 if os.environ.get("PYMONGOCRYPT_LIB"):
     # Ensure pymongocrypt is working properly.

tools/fail_if_no_c.py

@@ -18,10 +18,11 @@
 """
 from __future__ import annotations
 
-import os
-import subprocess
+import logging
 import sys
-from pathlib import Path
+
+LOGGER = logging.getLogger(__name__)
+logging.basicConfig(level=logging.INFO, format="%(levelname)-8s %(message)s")
 
 sys.path[0:0] = [""]
 
@@ -32,20 +33,9 @@
     try:
         from pymongo import _cmessage  # type:ignore[attr-defined] # noqa: F401
     except Exception as e:
-        print(e)
+        LOGGER.exception(e)
     try:
         from bson import _cbson  # type:ignore[attr-defined] # noqa: F401
     except Exception as e:
-        print(e)
+        LOGGER.exception(e)
     sys.exit("could not load C extensions")
-
-if os.environ.get("ENSURE_UNIVERSAL2") == "1":
-    parent_dir = Path(pymongo.__path__[0]).parent
-    for pkg in ["pymongo", "bson", "grifs"]:
-        for so_file in Path(f"{parent_dir}/{pkg}").glob("*.so"):
-            print(f"Checking universal2 compatibility in {so_file}...")
-            output = subprocess.check_output(["file", so_file])  # noqa: S603, S607
-            if "arm64" not in output.decode("utf-8"):
-                sys.exit("Universal wheel was not compiled with arm64 support")
-            if "x86_64" not in output.decode("utf-8"):
-                sys.exit("Universal wheel was not compiled with x86_64 support")