feat(legacy): ensure that we are using an X.Y version in pip_multiparse

aignas · aignas · commit 3ecc4dfeda6f · 2023-09-29T22:37:42.000+09:00
diff --git a/python/pip.bzl b/python/pip.bzl
@@ -19,6 +19,7 @@ load("//python/pip_install:requirements.bzl", _compile_pip_requirements = "compi
 load("//python/private:bzlmod_enabled.bzl", "BZLMOD_ENABLED")
 load("//python/private:full_version.bzl", "full_version")
 load("//python/private:render_pkg_aliases.bzl", "NO_MATCH_ERROR_MESSAGE_TEMPLATE")
+load("//python/private:version_label.bzl", "version_label")
 
 compile_pip_requirements = _compile_pip_requirements
 package_annotation = _package_annotation
@@ -369,7 +370,7 @@ def multi_pip_parse(name, default_version, python_versions, python_interpreter_t
         if not python_version in requirements_lock:
             fail("Missing requirements_lock for Python version %s in '%s'" % (python_version, name))
 
-        pip_parse_name = name + "_" + python_version.replace(".", "_")
+        pip_parse_name = name + "_" + version_label(full_version(python_version), sep = "_")
         pip_parse(
             name = pip_parse_name,
             python_interpreter_target = python_interpreter_target[python_version],
diff --git a/python/private/toolchains_repo.bzl b/python/private/toolchains_repo.bzl
@@ -30,6 +30,7 @@ load(
     "PLATFORMS",
     "WINDOWS_NAME",
 )
+load(":full_version.bzl", "full_version")
 load(":which.bzl", "which_with_fail")
 
 def get_repository_name(repository_workspace):
@@ -252,8 +253,12 @@ def _multi_toolchain_aliases_impl(rctx):
     rules_python = rctx.attr._rules_python_workspace.workspace_name
 
     for python_version, repository_name in rctx.attr.python_versions.items():
-        file = "{}/defs.bzl".format(python_version)
-        rctx.file(file, content = """\
+        python_version = full_version(python_version)
+        for is_short in [False, True]:
+            python_version_short, _, _ = python_version.rpartition(".")
+            v = python_version_short if is_short else python_version
+
+            rctx.file("{}/defs.bzl".format(v), content = """\
 # Generated by python/private/toolchains_repo.bzl
 
 load(
@@ -266,16 +271,18 @@ load(
     _py_test = "py_test",
 )
 
+{warning}
 compile_pip_requirements = _compile_pip_requirements
 host_platform = _host_platform
 interpreter = _interpreter
 py_binary = _py_binary
 py_console_script_binary = _py_console_script_binary
 py_test = _py_test
 """.format(
-            repository_name = repository_name,
-        ))
-        rctx.file("{}/BUILD.bazel".format(python_version), "")
+                repository_name = repository_name,
+                warning = "" if is_short else 'print("switch to importing from \"{}:defs.bzl\"")'.format(python_version_short),
+            ))
+            rctx.file("{}/BUILD.bazel".format(v), "")
 
     pip_bzl = """\
 # Generated by python/private/toolchains_repo.bzl
