Merge remote-tracking branch 'upstream/main' into add-pip-dep-tag-class

Author: rickeylev

.bazelci/presubmit.yml

@@ -84,6 +84,9 @@ buildifier:
   coverage_targets: ["..."]
 .coverage_targets_example_bzlmod_build_file_generation: &coverage_targets_example_bzlmod_build_file_generation
   coverage_targets: ["//:bzlmod_build_file_generation_test"]
+.coverage_targets_bootstrap: &coverage_targets_bootstrap
+  coverage_targets:
+    - //tests/bootstrap_impls:stdlib_shadowing_system_python_test
 .coverage_targets_example_multi_python: &coverage_targets_example_multi_python
   coverage_targets:
     - //tests:my_lib_3_10_test
@@ -216,6 +219,7 @@ tasks:
     bazel: 7.x
   ubuntu:
     <<: *reusable_config
+    <<: *coverage_targets_bootstrap
     name: "Default: Ubuntu, Bazel {bazel}"
     platform: ubuntu2204
     bazel: ${{ bazel }}

.github/ISSUE_TEMPLATE/release_tracking_template.md

@@ -2,7 +2,7 @@
 name: Release Tracking Issue
 about: Checklist for tracking a new release of rules_python.
 title: 'Release <version>'
-labels: ['type:release']
+labels: ['type: release']
 ---
 # Release tasks
 - [ ] Prepare Release | status=awaiting-preparation
@@ -11,11 +11,28 @@ labels: ['type:release']
 - [ ] Tag Final
 
 ## Backports
-<!-- Items to be cherry-picked into the next RC go here -->
+
+<details>
+<summary><b>How to add backports</b></summary>
+
+To request a backport:
+1. Add a new checklist item under the `## Backports` section.
+2. The format must be: `- [ ] #<PR_NUMBER>` (e.g., `- [ ] #1234`).
+3. Trigger the [Process Backports Workflow](https://github.com/bazel-contrib/rules_python/actions/workflows/process_backports.yml).
+</details>
 
 ---
 *Maintainers: Automation will react to changes on this issue.*
 
+<details>
+<summary><b>Manual Editing</b></summary>
+
+You can manually edit this issue to control the release flow.
+The checklist items use metadata suffix: `| key=value key2=value2`.
+- **Retry Prepare Release**: Reset to `- [ ] Prepare Release | status=awaiting-preparation`.
+- **Force Task Done**: Check the box `- [x]` and add appropriate metadata (e.g. `status=done`).
+</details>
+
 <details>
 <summary><b>Available Commands</b></summary>
 

.github/workflows/check_version_markers.sh

@@ -20,9 +20,8 @@ grep_exit_code=0
 # Exclude CONTRIBUTING.md, RELEASING.md because they document how to use these strings.
 grep --exclude=CONTRIBUTING.md \
   --exclude=RELEASING.md \
-  --exclude=release.py \
-  --exclude=release_test.py \
   --exclude-dir=.* \
+  --exclude-dir=release \
   VERSION_NEXT_ -r || grep_exit_code=$?
 
 if [[ $grep_exit_code -eq 0 ]]; then

.github/workflows/cut_release_branch.yml

@@ -10,8 +10,8 @@ permissions:
 
 jobs:
   cut_branch:
-    # Run only if the issue has the type:release label
-    if: contains(github.event.issue.labels.*.name, 'type:release')
+    # Run only if the issue has the type: release label
+    if: contains(github.event.issue.labels.*.name, 'type: release')
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
@@ -32,6 +32,6 @@ jobs:
       - name: Attempt Branch Creation
         run: |
           bazel run //tools/private/release -- \
-            create-release-branch --issue ${{ github.event.issue.number }}
+            create-release-branch --issue ${{ github.event.issue.number }} --remote origin
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/generate_rc.yml

@@ -34,6 +34,6 @@ jobs:
       - name: Attempt RC Tagging
         run: |
           bazel run //tools/private/release -- \
-            create-rc --issue ${{ inputs.issue }}
+            create-rc --issue ${{ inputs.issue }} --remote origin
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/prepare_release.yml

@@ -31,6 +31,6 @@ jobs:
       - name: Run Release Preparation Pipeline
         run: |
           # Manual trigger: run full preparation
-          bazel run //tools/private/release -- prepare
+          bazel run //tools/private/release -- prepare --no-dry-run
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/process_backports.yml

@@ -14,7 +14,7 @@ permissions:
 
 jobs:
   process_backports:
-    # Always gate GHA runs to ensure we are operating on a type:release labeled issue if metadata is queried
+    # Always gate GHA runs to ensure we are operating on a type: release labeled issue if metadata is queried
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository

.github/workflows/publish.yml

@@ -21,7 +21,7 @@ on:
         type: string
 jobs:
   publish:
-    uses: bazel-contrib/publish-to-bcr/.github/workflows/publish.yaml@v1.1.0
+    uses: bazel-contrib/publish-to-bcr/.github/workflows/publish.yaml@v1.4.1
     with:
       tag_name: ${{ inputs.tag_name }}
       # GitHub repository which is a fork of the upstream where the Pull Request will be opened.

CHANGELOG.md

@@ -29,6 +29,45 @@ Unreleased changes are tracked as individual files in the [news/](./news)
 directory, or view the [latest generated
 changelog](https://rules-python.readthedocs.io/en/latest/changelog.html).
 
+{#v2-2-0}
+## [2.2.0] - 2026-06-30
+
+[2.2.0]: https://github.com/bazel-contrib/rules_python/releases/tag/2.2.0
+
+{#v2-2-0-changed}
+### Changed
+* Renamed most public bzl_library targets from `{foo}_bzl` to `{foo}` to follow
+gazelle naming conventions. Deprecated aliases are left for backwards
+compatibility.
+* (binaries/tests) Added a deprecation warning for targets relying on implicit `__init__.py` creation.
+
+{#v2-2-0-fixed}
+### Fixed
+* Fixed a flaky error on Windows 2022 when looking up the win32 version during
+site initialization by retrying the lookup
+([#3721](https://github.com/bazel-contrib/rules_python/issues/3721)).
+* (coverage) Skip lcov report when no data was collected.
+* (pypi) Fixed `experimental_index_url` checking truthiness before envsubst
+expansion.
+* (rules) Fixed venv output paths for `py_binary` and `py_test` targets whose
+names contain path separators so distinct targets with the same basename no
+longer share the same venv output directory.
+
+{#v2-2-0-added}
+### Added
+* Added {bzl:obj}`features.loadable_symbols` to allow detecting public symbols
+exported by bzl files.
+* Exposed {bzl:obj}`VenvSymlinkEntry` and {bzl:obj}`VenvSymlinkKind` in
+{bzl:target}`//python:py_info.bzl`.
+* (pypi) Added `@pypi` repo: a unified hub of `pip.parse` hubs.
+* (uv) Support for basic `uv.lock` generation via the `lock` rule
+and basic support for importing the `uv.lock` file itself. Since this
+may have bugs, please report this by creating new tickets.
+Work towards [#2787](https://github.com/bazel-contrib/rules_python/issues/2787)
+and [#1975](https://github.com/bazel-contrib/rules_python/issues/1975).
+
+
+
 {#v2-1-0}
 ## [2.1.0] - 2026-06-17
 

docs/api/rules_python/python/config_settings/index.md

@@ -362,7 +362,7 @@ Values:
   specified concrete PyPI hub (corresponding to a
   {obj}`pip.parse.hub_name` value).
 
-:::{versionadded} VERSION_NEXT_FEATURE
+:::{versionadded} 2.2.0
 :::
 ::::