Merge branch '2.10' into yunkim/backport-9759-to-210

DataDog · Jul 23, 2024 · 2372b8f · 2372b8f
2 parents 0452393 + 378d5b7
commit 2372b8f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/tests/internal/test_packages.py b/tests/internal/test_packages.py
@@ -56,6 +56,10 @@ def test_get_distributions():
             importlib_pkgs.add("importlib-metadata")
         elif pkg.name == "importlib-metadata" and "importlib_metadata" in pkg_resources_ws:
             importlib_pkgs.add("importlib_metadata")
+        elif pkg.name == "importlib-resources" and "importlib_resources" in pkg_resources_ws:
+            importlib_pkgs.add("importlib_resources")
+        elif pkg.name == "importlib_resources" and "importlib-resources" in pkg_resources_ws:
+            importlib_pkgs.add("importlib-resources")
         else:
             importlib_pkgs.add(pkg.name)
 

diff --git a/...nity.test_lcecl_chain_non_dict_input.json → ...unity.test_lcel_chain_non_dict_input.json b/...nity.test_lcecl_chain_non_dict_input.json → ...unity.test_lcel_chain_non_dict_input.json