Merge branch 'main' into env_var_urls

CHANGELOG.md

@@ -89,8 +89,6 @@ Unreleased changes template.
   `python_version` attribute is still used to specify the Python version.
 * (pypi) Updated versions of packages: `pip` to 24.3.1 and
   `packaging` to 24.2.
-* (pypi) For pypi-generated targets, `*.pyi` files are included in the
-  `pyi_srcs` attribute instead of the `data` attribute.
 
 {#v1-1-0-deprecations}
 #### Deprecations

docs/BUILD.bazel

@@ -103,6 +103,8 @@ sphinx_stardocs(
         "//python/private:py_runtime_rule_bzl",
         "//python/private:py_test_rule_bzl",
         "//python/private/api:py_common_api_bzl",
+        "//python/private/pypi:config_settings_bzl",
+        "//python/private/pypi:pkg_aliases_bzl",
     ] + ([
         # Bazel 6 + Stardoc isn't able to parse something about the python bzlmod extension
         "//python/extensions:python_bzl",

python/private/pypi/BUILD.bazel

@@ -53,6 +53,32 @@ bzl_library(
     srcs = ["attrs.bzl"],
 )
 
+bzl_library(
+    name = "config_settings_bzl",
+    srcs = ["config_settings.bzl"],
+    deps = [
+        ":flags_bzl",
+        "//python/private:flags_bzl",
+    ],
+)
+
+bzl_library(
+    name = "deps_bzl",
+    srcs = ["deps.bzl"],
+    deps = [
+        "//python/private:bazel_tools_bzl",
+        "//python/private:glob_excludes_bzl",
+    ],
+)
+
+bzl_library(
+    name = "evaluate_markers_bzl",
+    srcs = ["evaluate_markers.bzl"],
+    deps = [
+        ":pypi_repo_utils_bzl",
+    ],
+)
+
 bzl_library(
     name = "extension_bzl",
     srcs = ["extension.bzl"],
@@ -76,29 +102,6 @@ bzl_library(
     ],
 )
 
-bzl_library(
-    name = "config_settings_bzl",
-    srcs = ["config_settings.bzl"],
-    deps = ["flags_bzl"],
-)
-
-bzl_library(
-    name = "deps_bzl",
-    srcs = ["deps.bzl"],
-    deps = [
-        "//python/private:bazel_tools_bzl",
-        "//python/private:glob_excludes_bzl",
-    ],
-)
-
-bzl_library(
-    name = "evaluate_markers_bzl",
-    srcs = ["evaluate_markers.bzl"],
-    deps = [
-        ":pypi_repo_utils_bzl",
-    ],
-)
-
 bzl_library(
     name = "flags_bzl",
     srcs = ["flags.bzl"],
@@ -245,6 +248,18 @@ bzl_library(
     srcs = ["pip_repository_attrs.bzl"],
 )
 
+bzl_library(
+    name = "pkg_aliases_bzl",
+    srcs = ["pkg_aliases.bzl"],
+    deps = [
+        ":labels_bzl",
+        ":parse_whl_name_bzl",
+        ":whl_target_platforms_bzl",
+        "//python/private:text_util_bzl",
+        "@bazel_skylib//lib:selects",
+    ],
+)
+
 bzl_library(
     name = "pypi_repo_utils_bzl",
     srcs = ["pypi_repo_utils.bzl"],