Merge pull request #212 from kulikjak/fix-find_distributions

takluyver · web-flow · commit 3de7fad37912 · 2026-02-18T15:37:34.000Z
Fix find_distributions with non-empty context
diff --git a/src/pyproject_hooks/_in_process/_in_process.py b/src/pyproject_hooks/_in_process/_in_process.py
@@ -113,7 +113,8 @@ def find_distributions(self, context=None):
             # Delayed import: Python 3.7 does not contain importlib.metadata
             from importlib.metadata import DistributionFinder, MetadataPathFinder
 
-            context = DistributionFinder.Context(path=self.backend_path)
+            name = context.name if context else None
+            context = DistributionFinder.Context(name=name, path=self.backend_path)
             return MetadataPathFinder.find_distributions(context=context)
 
 
diff --git a/tests/samples/distribution_mismatch/backend/_pkg-0.0.1.dist-info/METADATA b/tests/samples/distribution_mismatch/backend/_pkg-0.0.1.dist-info/METADATA
@@ -0,0 +1,2 @@
+Name: _pkg
+Version: 0.0.1
diff --git a/tests/samples/distribution_mismatch/backend/intree_backend.py b/tests/samples/distribution_mismatch/backend/intree_backend.py
@@ -0,0 +1,6 @@
+from importlib.metadata import distribution
+
+
+def get_requires_for_build_sdist(config_settings):
+    dist = distribution("setuptools")  # not present in backend-path
+    return [dist.version]
diff --git a/tests/samples/distribution_mismatch/pyproject.toml b/tests/samples/distribution_mismatch/pyproject.toml
@@ -0,0 +1,3 @@
+[build-system]
+build-backend = 'intree_backend'
+backend-path = ['backend']
diff --git a/tests/samples/pkg_intree_metadata/backend/_test_bootstrap-0.0.1.dist-info/METADATA b/tests/samples/pkg_intree_metadata/backend/_test_bootstrap-0.0.1.dist-info/METADATA
diff --git a/tests/samples/pkg_intree_metadata/backend/_test_bootstrap-0.0.1.dist-info/entry_points.txt b/tests/samples/pkg_intree_metadata/backend/_test_bootstrap-0.0.1.dist-info/entry_points.txt
diff --git a/tests/test_inplace_hooks.py b/tests/test_inplace_hooks.py
@@ -100,6 +100,13 @@ def test_intree_backend_importlib_metadata_interoperation():
     ]
 
 
+def test_distribution_mismatch():
+    pytest.importorskip("importlib.metadata")
+
+    hooks = get_hooks("distribution_mismatch")
+    assert hooks.get_requires_for_build_sdist({}) != ["0.0.1"]
+
+
 def install_finder_with_sitecustomize(directory, mapping):
     finder = f"""
         import sys

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+[build-system]`
	`2`	`+build-backend = 'intree_backend'`
	`3`	`+backend-path = ['backend']`