Deal with hyphens and underscores in ModuleDirImport (#224)

* Deal with hyphens and underscores in ModuleDirImport

* version

* Skip test

.plzconfig.tool_dev

@@ -8,3 +8,6 @@
 
 [Plugin "python"]
 PexTool = //tools:please_pex_dev
+
+[BuildEnv]
+tool-dev = true

test/BUILD

@@ -171,6 +171,7 @@ python_test(
     name = "distribution_metadata_test",
     srcs = ["distribution_metadata_test.py"],
     deps = [
+        "//third_party/python:google-pasta",
         "//third_party/python:pygments",
     ],
 )

test/distribution_metadata_test.py

@@ -1,4 +1,5 @@
 from importlib.metadata import PackagePath, files, version, distributions
+import os
 import unittest
 
 
@@ -16,3 +17,7 @@ def test_importlib_metadata_files(self):
     def test_importlib_metadata_iteration(self):
         for distribution in distributions():
             self.assertFalse(isinstance(distribution, list))
+
+    @unittest.skipIf(os.getenv("TOOL_DEV", "") != "true", "needs updated please_pex")
+    def test_importlib_metadata_hyphens(self):
+        self.assertEqual(version("google-pasta"), "0.2.0")

tools/ChangeLog

@@ -1,3 +1,7 @@
+Version 1.5.4
+-------------
+    * Handle packages with hyphenated names when loading distribution metadata (#224)
+
 Version 1.5.3
 -------------
     * Updated some deprecated functions on import hooks (#222)

tools/VERSION

@@ -1 +1 @@
-1.5.3
+1.5.4

tools/please_pex/pex/pex_main.py

@@ -203,7 +203,9 @@ def find_distributions(self, context):
         loading the metadata for packages for the indicated ``context``.
         """
         if context.name:
-            return self._distributions.get(context.name, [])
+            # The installed directories have underscores in the place of what might be a hyphen
+            # in the package name (e.g. the package opentelemetry-sdk installs opentelemetry_sdk).
+            return self._distributions.get(context.name.replace("-", "_"), [])
         else:
             return itertools.chain(*self._distributions.values())