start cleanup

Author: aignas

python/private/common.bzl

@@ -369,29 +369,6 @@ def collect_runfiles(ctx, files = depset()):
         collect_default = True,
     )
 
-def _third_party_first(targets):
-    """Sort targets to allow for deterministic depset merging.
-
-    First return the third party deps so that the depsets get merged in a way to allow
-    traversal so that the first dependency that is met during traversing will be a third party
-    dep.
-
-    This is because the DAG is going from first-party deps to third-party deps and usually
-    no third-party deps include first-party deps.
-    """
-
-    # this ensures that within the 2 groups of packages the order is maintained
-    pypi_targets = []
-    nonpypi_targets = []
-
-    for target in targets:
-        if PyInfo in target and target[PyInfo].package:
-            pypi_targets.append(target)
-        else:
-            nonpypi_targets.append(target)
-
-    return pypi_targets + nonpypi_targets
-
 def create_py_info(
         ctx,
         *,
@@ -401,7 +378,6 @@ def create_py_info(
         implicit_pyc_files,
         implicit_pyc_source_files,
         imports,
-        package = None,
         venv_symlinks = []):
     """Create PyInfo provider.
 
@@ -420,7 +396,6 @@ def create_py_info(
         implicit_pyc_files: {type}`depset[File]` Implicitly generated pyc files
             that a binary can choose to include.
         imports: depset of strings; the import path values to propagate.
-        package: TODO
         venv_symlinks: {type}`list[VenvSymlinkEntry]` instances for
             symlinks to create in the consuming binary's venv.
 
@@ -442,9 +417,8 @@ def create_py_info(
     py_info.imports.add(imports)
     py_info.merge_has_py2_only_sources(ctx.attr.srcs_version in ("PY2", "PY2ONLY"))
     py_info.merge_has_py3_only_sources(ctx.attr.srcs_version in ("PY3", "PY3ONLY"))
-    py_info.set_package(package)
 
-    for target in _third_party_first(ctx.attr.deps):
+    for target in ctx.attr.deps:
         # PyInfo may not be present e.g. cc_library rules.
         if PyInfo in target or (BuiltinPyInfo != None and BuiltinPyInfo in target):
             py_info.merge(_get_py_info(target))
@@ -456,7 +430,7 @@ def create_py_info(
                 if f.extension == "py":
                     py_info.transitive_sources.add(f)
                 py_info.merge_uses_shared_libraries(cc_helper.is_valid_shared_library_artifact(f))
-    for target in _third_party_first(ctx.attr.pyi_deps):
+    for target in ctx.attr.pyi_deps:
         # PyInfo may not be present e.g. cc_library rules.
         if PyInfo in target or (BuiltinPyInfo != None and BuiltinPyInfo in target):
             py_info.merge(_get_py_info(target))

python/private/py_executable.bzl

@@ -687,13 +687,10 @@ def _build_link_map(entries):
         kind_map = link_map.setdefault(entry.kind, {})
 
         if version_by_pkg.setdefault(entry.package, entry.version) != entry.version:
-            # We ignore duplicates by design. The dependency closer to the
-            # binary gets precedence due to how we merge the third_party dependencies
-            # first.
+            # We ignore duplicates by design.
             continue
         elif entry.venv_path in kind_map:
-            # NOTE @aignas 2025-06-05: This branch should be hit only for first party
-            # packages, maybe we should error here?
+            # We ignore duplicates by design.
             continue
         else:
             kind_map[entry.venv_path] = entry.link_to_path

python/private/py_info.bzl

@@ -107,7 +107,6 @@ def _PyInfo_init(
         has_py2_only_sources = False,
         has_py3_only_sources = False,
         direct_pyc_files = depset(),
-        package = None,
         transitive_pyc_files = depset(),
         transitive_implicit_pyc_files = depset(),
         transitive_implicit_pyc_source_files = depset(),
@@ -143,7 +142,6 @@ def _PyInfo_init(
         "has_py2_only_sources": has_py2_only_sources,
         "has_py3_only_sources": has_py2_only_sources,
         "imports": imports,
-        "package": package,
         "transitive_implicit_pyc_files": transitive_implicit_pyc_files,
         "transitive_implicit_pyc_source_files": transitive_implicit_pyc_source_files,
         "transitive_original_sources": transitive_original_sources,
@@ -219,15 +217,6 @@ A depset of import path strings to be added to the `PYTHONPATH` of executable
 Python targets. These are accumulated from the transitive `deps`.
 The order of the depset is not guaranteed and may be changed in the future. It
 is recommended to use `default` order (the default).
-""",
-        "package": """
-:type: str
-
-The source third-party dependency name, which is normalized to PEP440 schema with
-`-` replaced with `_`.
-
-::::{versionadded} VERSION_NEXT_FEATURE
-::::
 """,
         "transitive_implicit_pyc_files": """
 :type: depset[File]
@@ -402,7 +391,6 @@ def _PyInfoBuilder_new():
         _has_py2_only_sources = [False],
         _has_py3_only_sources = [False],
         _uses_shared_libraries = [False],
-        _package = [None],
         build = lambda *a, **k: _PyInfoBuilder_build(self, *a, **k),
         build_builtin_py_info = lambda *a, **k: _PyInfoBuilder_build_builtin_py_info(self, *a, **k),
         direct_original_sources = builders.DepsetBuilder(),
@@ -422,7 +410,6 @@ def _PyInfoBuilder_new():
         set_has_py2_only_sources = lambda *a, **k: _PyInfoBuilder_set_has_py2_only_sources(self, *a, **k),
         set_has_py3_only_sources = lambda *a, **k: _PyInfoBuilder_set_has_py3_only_sources(self, *a, **k),
         set_uses_shared_libraries = lambda *a, **k: _PyInfoBuilder_set_uses_shared_libraries(self, *a, **k),
-        set_package = lambda *a, **k: _PyInfoBuilder_set_package(self, *a, **k),
         transitive_implicit_pyc_files = builders.DepsetBuilder(),
         transitive_implicit_pyc_source_files = builders.DepsetBuilder(),
         transitive_original_sources = builders.DepsetBuilder(),
@@ -547,19 +534,6 @@ def _PyInfoBuilder_set_uses_shared_libraries(self, value):
     self._uses_shared_libraries[0] = value
     return self
 
-def _PyInfoBuilder_set_package(self, value):
-    """Sets `uses_shared_libraries` to `value`.
-
-    Args:
-        self: implicitly added.
-        value: {type}`str` The value to set.
-
-    Returns:
-        {type}`PyInfoBuilder` self
-    """
-    self._package[0] = value
-    return self
-
 def _PyInfoBuilder_merge(self, *infos, direct = []):
     """Merge other PyInfos into this PyInfo.
 
@@ -662,7 +636,6 @@ def _PyInfoBuilder_build(self):
             direct_original_sources = self.direct_original_sources.build(),
             direct_pyc_files = self.direct_pyc_files.build(),
             direct_pyi_files = self.direct_pyi_files.build(),
-            package = self._package[0],
             transitive_implicit_pyc_files = self.transitive_implicit_pyc_files.build(),
             transitive_implicit_pyc_source_files = self.transitive_implicit_pyc_source_files.build(),
             transitive_original_sources = self.transitive_original_sources.build(),
@@ -723,5 +696,4 @@ PyInfoBuilder = struct(
     set_has_py2_only_sources = _PyInfoBuilder_set_has_py2_only_sources,
     set_has_py3_only_sources = _PyInfoBuilder_set_has_py3_only_sources,
     set_uses_shared_libraries = _PyInfoBuilder_set_uses_shared_libraries,
-    set_package = _PyInfoBuilder_set_package,
 )

python/private/py_library.bzl

@@ -86,7 +86,7 @@ under the binary's venv site-packages directory that should be made available (i
 namespace packages](
 https://packaging.python.org/en/latest/guides/packaging-namespace-packages/#native-namespace-packages).
 However, the *content* of the files cannot be taken into account, merely their
-presence or absense. Stated another way: [pkgutil-style namespace packages](
+presence or absence. Stated another way: [pkgutil-style namespace packages](
 https://packaging.python.org/en/latest/guides/packaging-namespace-packages/#pkgutil-style-namespace-packages)
 won't be understood as namespace packages; they'll be seen as regular packages. This will
 likely lead to conflicts with other targets that contribute to the namespace.
@@ -100,9 +100,9 @@ more information.
 :::{versionadded} 1.4.0
 :::
 :::{versionchanged} VERSION_NEXT_FEATURE
-The topological order has been reverted and instead we merge the depsets for all of the
-targets in the {attr}`py_library.deps` in a particular way - first merging depsets
-of the third-party PyPI dependencies and then merging the first-party dependencies.
+The topological order has been removed and if 2 different versions of the same PyPI
+package are observed, the behaviour has no guarantees except that it is deterministic
+and that only one package version will be included.
 :::
 """,
         ),
@@ -174,7 +174,6 @@ def py_library_impl(ctx, *, semantics):
         required_pyc_files = required_pyc_files,
         implicit_pyc_files = implicit_pyc_files,
         implicit_pyc_source_files = implicit_pyc_source_files,
-        package = package,
         imports = imports,
         venv_symlinks = venv_symlinks,
     )

tests/modules/other/simple_v1/site-packages/simple_v1_extras/__init__.py

@@ -29,15 +29,6 @@ def test_imported_from_venv(self):
         self.assert_imported_from_venv("single_file")
         self.assert_imported_from_venv("simple")
 
-    def test_pyi_is_included(self):
-        self.assert_imported_from_venv("simple")
-        module = importlib.import_module("simple")
-        module_path = Path(module.__file__)
-
-        # this has been not included through data but through `pyi_srcs`
-        pyi_files = [p.name for p in module_path.parent.glob("*.pyi")]
-        self.assertIn("__init__.pyi", pyi_files)
-
     def test_data_is_included(self):
         self.assert_imported_from_venv("simple")
         module = importlib.import_module("simple")
@@ -47,13 +38,13 @@ def test_data_is_included(self):
 
         # Ensure that packages from simple v1 are not present
         files = [p.name for p in site_packages.glob("*")]
-        self.assertIn("simple.libs", files)
+        self.assertIn("simple_v1_extras", files)
 
     def test_override_pkg(self):
         self.assert_imported_from_venv("simple")
         module = importlib.import_module("simple")
         self.assertEqual(
-            "2.0.0",
+            "1.0.0",
             module.__version__,
         )
 
@@ -65,13 +56,13 @@ def test_dirs_from_replaced_package_are_not_present(self):
         site_packages = module_path.parent.parent
         dist_info_dirs = [p.name for p in site_packages.glob("*.dist-info")]
         self.assertEqual(
-            ["simple-2.0.0.dist-info"],
+            ["simple-1.0.0.dist-info"],
             dist_info_dirs,
         )
 
         # Ensure that packages from simple v1 are not present
         files = [p.name for p in site_packages.glob("*")]
-        self.assertNotIn("simple_v1_extras", files)
+        self.assertNotIn("simple.libs", files)
 
     def test_data_from_another_pkg_is_included_via_copy_file(self):
         self.assert_imported_from_venv("simple")