fix: Don't fail in override from a non-root module (bazel-contrib#2566)

This patch enable calls to pypi override from a non-root module without
failing. The call will instead be silently ignored.

Fixes bazel-contrib#2550

---------

Co-authored-by: Ignas Anikevicius <[email protected]>

fix(toolchain) Override coverage rc

Author: mailto-jonas

CHANGELOG.md

@@ -52,7 +52,8 @@ Unreleased changes template.
 
 {#v0-0-0-changed}
 ### Changed
-* Nothing changed.
+* (pypi) {obj}`pip.override` will now be ignored instead of raising an error,
+  fixes [#2550](https://github.com/bazelbuild/rules_python/issues/2550).
 
 {#v0-0-0-fixed}
 ### Fixed

python/private/pypi/extension.bzl

@@ -387,7 +387,9 @@ You cannot use both the additive_build_content and additive_build_content_file a
     for module in module_ctx.modules:
         for attr in module.tags.override:
             if not module.is_root:
-                fail("overrides are only supported in root modules")
+                # Overrides are only supported in root modules. Silently
+                # ignore the override:
+                continue
 
             if not attr.file.endswith(".whl"):
                 fail("Only whl overrides are supported at this time")

python/private/stage2_bootstrap_template.py

@@ -288,29 +288,28 @@ def _maybe_collect_coverage(enable):
         rcfile.write(
             """[run]
 relative_files = True
+omit = 
+            # Pipes can't be read back later, which can cause coverage to
+            # throw an error when trying to get its source code.
+           /dev/fd/* 
+            # The mechanism for finding third-party packages in coverage-py
+            # only works for installed packages, not for runfiles. e.g:
+            #'$HOME/.local/lib/python3.10/site-packages',
+            # '/usr/lib/python',
+            # '/usr/lib/python3.10/site-packages',
+            # '/usr/local/lib/python3.10/dist-packages'
+            # see https://github.com/nedbat/coveragepy/blob/bfb0c708fdd8182b2a9f0fc403596693ef65e475/coverage/inorout.py#L153-L164
+           */external/*
 """
         )
     try:
         cov = coverage.Coverage(
-            config_file=rcfile_name,
+            config_file=os.environ.get("COVERAGE_RCFILE", rcfile_name),
             branch=True,
             # NOTE: The messages arg controls what coverage prints to stdout/stderr,
             # which can interfere with the Bazel coverage command. Enabling message
             # output is only useful for debugging coverage support.
             messages=is_verbose_coverage(),
-            omit=[
-                # Pipes can't be read back later, which can cause coverage to
-                # throw an error when trying to get its source code.
-                "/dev/fd/*",
-                # The mechanism for finding third-party packages in coverage-py
-                # only works for installed packages, not for runfiles. e.g:
-                #'$HOME/.local/lib/python3.10/site-packages',
-                # '/usr/lib/python',
-                # '/usr/lib/python3.10/site-packages',
-                # '/usr/local/lib/python3.10/dist-packages'
-                # see https://github.com/nedbat/coveragepy/blob/bfb0c708fdd8182b2a9f0fc403596693ef65e475/coverage/inorout.py#L153-L164
-                "*/external/*",
-            ],
         )
         cov.start()
         try: