Merge branch 'main' into gnufede/enable-incremental-build-hatch

Author: gnufede

setup.py

@@ -96,7 +96,11 @@ def interpose_sccache():
         return
 
     # Check for sccache.  We don't do multi-step failover (e.g., if ${SCCACHE_PATH} is set, but the binary is invalid)
-    sccache_path = Path(os.getenv("SCCACHE_PATH", shutil.which("sccache")))
+    _sccache_path = os.getenv("SCCACHE_PATH", shutil.which("sccache"))
+    if _sccache_path is None:
+        print("WARNING: SCCACHE_PATH is not set, skipping sccache interposition")
+        return
+    sccache_path = Path(_sccache_path)
     if sccache_path.is_file() and os.access(sccache_path, os.X_OK):
         # Both the cmake and rust toolchains allow the caller to interpose sccache into the compiler commands, but this
         # misses calls from native extension builds.  So we do the normal Rust thing, but modify CC and CXX to point to
@@ -159,7 +163,11 @@ def load_module_from_project_file(mod_name, fname):
     import importlib.util
 
     spec = importlib.util.spec_from_file_location(mod_name, fpath)
+    if spec is None:
+        raise ImportError(f"Could not find module {mod_name} in {fpath}")
     mod = importlib.util.module_from_spec(spec)
+    if spec.loader is None:
+        raise ImportError(f"Could not load module {mod_name} from {fpath}")
     spec.loader.exec_module(mod)
     return mod
 
@@ -195,12 +203,12 @@ class LibraryDownload:
     USE_CACHE = os.getenv("DD_SETUP_CACHE_DOWNLOADS", "0").lower() in ("1", "yes", "on", "true")
 
     name = None
-    download_dir = None
+    download_dir = Path.cwd()
     version = None
     url_root = None
-    available_releases = None
+    available_releases = {}
     expected_checksums = None
-    translate_suffix = None
+    translate_suffix = {}
 
     @classmethod
     def download_artifacts(cls):
@@ -221,7 +229,7 @@ def download_artifacts(cls):
                 # https://github.com/pypa/cibuildwheel/blob/main/cibuildwheel/macos.py#L250
                 target_platform = os.getenv("PLAT")
                 # Darwin Universal2 should bundle both architectures
-                if not target_platform.endswith(("universal2", arch)):
+                if target_platform and not target_platform.endswith(("universal2", arch)):
                     continue
             elif CURRENT_OS == "Windows" and (not is_64_bit_python() != arch.endswith("32")):
                 # Win32 can be built on a 64-bit machine so build_platform may not be relevant
@@ -242,7 +250,7 @@ def download_artifacts(cls):
                 archive_name,
             )
 
-            download_dest = cls.CACHE_DIR / archive_name if cls.USE_CACHE else archive_name
+            download_dest = cls.CACHE_DIR / archive_name if cls.USE_CACHE else Path(archive_name)
             if cls.USE_CACHE and not cls.CACHE_DIR.exists():
                 cls.CACHE_DIR.mkdir(parents=True)
 
@@ -296,6 +304,10 @@ def download_artifacts(cls):
     def run(cls):
         cls.download_artifacts()
 
+    @classmethod
+    def get_package_name(cls, arch, os) -> str:
+        raise NotImplementedError()
+
     @classmethod
     def get_archive_name(cls, arch, os):
         return cls.get_package_name(arch, os) + ".tar.gz"
@@ -314,13 +326,13 @@ class LibDDWafDownload(LibraryDownload):
     translate_suffix = {"Windows": (".dll",), "Darwin": (".dylib",), "Linux": (".so",)}
 
     @classmethod
-    def get_package_name(cls, arch, opsys):
-        archive_dir = "lib%s-%s-%s-%s" % (cls.name, cls.version, opsys.lower(), arch)
+    def get_package_name(cls, arch, os):
+        archive_dir = "lib%s-%s-%s-%s" % (cls.name, cls.version, os.lower(), arch)
         return archive_dir
 
     @classmethod
-    def get_archive_name(cls, arch, opsys):
-        os_name = opsys.lower()
+    def get_archive_name(cls, arch, os):
+        os_name = os.lower()
         if os_name == "linux":
             archive_dir = "lib%s-%s-%s-linux-musl.tar.gz" % (cls.name, cls.version, arch)
         else:
@@ -594,7 +606,7 @@ class CMakeExtension(Extension):
     def __init__(
         self,
         name,
-        source_dir=Path("."),
+        source_dir=Path.cwd(),
         cmake_args=[],
         build_args=[],
         install_args=[],
@@ -656,12 +668,13 @@ def check_rust_toolchain():
 DD_BUILD_EXT_EXCLUDES = [_.strip() for _ in os.getenv("DD_BUILD_EXT_EXCLUDES", "").split(",") if _.strip()]
 
 
-def filter_extensions(extensions):
-    # type: (list[Extension]) -> list[Extension]
+def filter_extensions(
+    extensions: t.List[t.Union[Extension, Cython.Distutils.Extension, RustExtension]],
+) -> t.List[t.Union[Extension, Cython.Distutils.Extension, RustExtension]]:
     if not DD_BUILD_EXT_INCLUDES and not DD_BUILD_EXT_EXCLUDES:
         return extensions
 
-    filtered: list[Extension] = []
+    filtered: t.List[t.Union[Extension, Cython.Distutils.Extension, RustExtension]] = []
     for ext in extensions:
         if DD_BUILD_EXT_EXCLUDES and any(fnmatch.fnmatch(ext.name, pattern) for pattern in DD_BUILD_EXT_EXCLUDES):
             print(f"INFO: Excluding extension {ext.name}")
@@ -693,12 +706,6 @@ def get_exts_for(name):
         return []
 
 
-if sys.byteorder == "big":
-    encoding_macros = [("__BIG_ENDIAN__", "1")]
-else:
-    encoding_macros = [("__LITTLE_ENDIAN__", "1")]
-
-
 if CURRENT_OS == "Windows":
     encoding_libraries = ["ws2_32"]
     extra_compile_args = []
@@ -727,7 +734,7 @@ def get_exts_for(name):
 
 
 if not IS_PYSTON:
-    ext_modules = [
+    ext_modules: t.List[t.Union[Extension, Cython.Distutils.Extension, RustExtension]] = [
         Extension(
             "ddtrace.profiling.collector._memalloc",
             sources=[
@@ -858,7 +865,7 @@ def get_exts_for(name):
                     ["ddtrace/internal/_encoding.pyx"],
                     include_dirs=["."],
                     libraries=encoding_libraries,
-                    define_macros=encoding_macros,
+                    define_macros=[(f"__{sys.byteorder.upper()}_ENDIAN__", "1")],
                 ),
                 Extension(
                     "ddtrace.internal.telemetry.metrics_namespaces",