Merge commit 'abcc5e9d' into HEAD

Author: philsc

.github/workflows/create_archive_and_notes.sh

@@ -37,22 +37,28 @@ cat > release_notes.txt << EOF
 
 For more detailed setup instructions, see https://rules-python.readthedocs.io/en/latest/getting-started.html
 
+For the user-facing changelog see [here](https://rules-python.readthedocs.io/en/latest/changelog.html#v${TAG//./-})
+
 ## Using Bzlmod
 
 Add to your \`MODULE.bazel\` file:
 
 \`\`\`starlark
 bazel_dep(name = "rules_python", version = "${TAG}")
 
-pip = use_extension("@rules_python//python/extensions:pip.bzl", "pip")
+python = use_extension("@rules_python//python/extensions:python.bzl", "python")
+python.toolchain(
+    python_version = "3.13",
+)
 
+pip = use_extension("@rules_python//python/extensions:pip.bzl", "pip")
 pip.parse(
-    hub_name = "pip",
-    python_version = "3.11",
+    hub_name = "pypi",
+    python_version = "3.13",
     requirements_lock = "//:requirements_lock.txt",
 )
 
-use_repo(pip, "pip")
+use_repo(pip, "pypi")
 \`\`\`
 
 ## Using WORKSPACE

tests/support/sh_py_run_test.bzl

@@ -90,16 +90,14 @@ def _py_reconfig_impl(ctx):
                 default_info.default_runfiles,
             ),
         ),
-        testing.TestEnvironment(
-            environment = ctx.attr.env,
-        ),
+        # Inherit the expanded environment from the inner target.
+        ctx.attr.target[RunEnvironmentInfo],
     ]
 
 def _make_reconfig_rule(**kwargs):
     attrs = {
         "bootstrap_impl": attr.string(),
         "build_python_zip": attr.string(default = "auto"),
-        "env": attr.string_dict(),
         "extra_toolchains": attr.string_list(
             doc = """
 Value for the --extra_toolchains flag.
@@ -138,7 +136,6 @@ def py_reconfig_test(*, name, **kwargs):
     reconfig_kwargs["bootstrap_impl"] = kwargs.pop("bootstrap_impl", None)
     reconfig_kwargs["extra_toolchains"] = kwargs.pop("extra_toolchains", None)
     reconfig_kwargs["python_version"] = kwargs.pop("python_version", None)
-    reconfig_kwargs["env"] = kwargs.get("env")
     reconfig_kwargs["target_compatible_with"] = kwargs.get("target_compatible_with")
     reconfig_kwargs["python_src"] = kwargs.pop("python_src", None)
 
@@ -178,7 +175,7 @@ def sh_py_run_test(*, name, sh_src, py_src, **kwargs):
 
     py_binary_kwargs = {
         key: kwargs.pop(key)
-        for key in ("imports", "deps")
+        for key in ("imports", "deps", "env")
         if key in kwargs
     }