revert too many symbol removal

Author: aignas

python/BUILD.bazel

@@ -214,7 +214,6 @@ bzl_library(
     deps = [
         "//python/private:is_standalone_interpreter_bzl",
         "//python/private:py_repositories_bzl",
-        "//python/private:python_register_multi_toolchains_bzl",
         "//python/private:python_register_toolchains_bzl",
         "//python/private:python_repository_bzl",
     ],

python/private/python_register_multi_toolchains.bzl

@@ -45,6 +45,18 @@ py_toolchain_suite(
 )
 """.lstrip()
 
+_WORKSPACE_TOOLCHAINS_BUILD_TEMPLATE = """
+# Generated by python/private/toolchains_repo.bzl
+#
+# These can be registered in the workspace file or passed to --extra_toolchains
+# flag. By default all these toolchains are registered by the
+# python_register_toolchains macro so you don't normally need to interact with
+# these targets.
+
+load("@@{rules_python}//python/private:py_toolchain_suite.bzl", "py_toolchain_suite")
+
+""".lstrip()
+
 _TOOLCHAIN_ALIASES_BUILD_TEMPLATE = """
 # Generated by python/private/toolchains_repo.bzl
 load("@rules_python//python/private:toolchain_aliases.bzl", "toolchain_aliases")
@@ -62,6 +74,42 @@ toolchain_aliases(
 )
 """.lstrip()
 
+_TOOLCHAIN_ALIASES_DEFS_TEMPLATE = """
+# Generated by python/private/toolchains_repo.bzl
+
+load("@@{rules_python}//python:pip.bzl", _compile_pip_requirements = "compile_pip_requirements")
+load("@@{rules_python}//python/private:deprecation.bzl", "with_deprecation")
+load("@@{rules_python}//python/private:text_util.bzl", "render")
+load("@@{rules_python}//python:py_binary.bzl", _py_binary = "py_binary")
+load("@@{rules_python}//python:py_test.bzl", _py_test = "py_test")
+load(
+    "@@{rules_python}//python/entry_points:py_console_script_binary.bzl",
+    _py_console_script_binary = "py_console_script_binary",
+)
+
+def _with_deprecation(kwargs, *, name):
+    kwargs["python_version"] = "{python_version}"
+    return with_deprecation.symbol(
+        kwargs,
+        symbol_name = name,
+        old_load = "@{name}//:defs.bzl",
+        new_load = "@rules_python//python:{{}}.bzl".format(name),
+        snippet = render.call(name, **{{k: repr(v) for k,v in kwargs.items()}})
+    )
+
+def py_binary(**kwargs):
+    return _py_binary(**_with_deprecation(kwargs, name = "py_binary"))
+
+def py_console_script_binary(**kwargs):
+    return _py_console_script_binary(**_with_deprecation(kwargs, name = "py_console_script_binary"))
+
+def py_test(**kwargs):
+    return _py_test(**_with_deprecation(kwargs, name = "py_test"))
+
+def compile_pip_requirements(**kwargs):
+    return _compile_pip_requirements(**_with_deprecation(kwargs, name = "compile_pip_requirements"))
+""".lstrip()
+
 _HOST_TOOLCHAIN_BUILD_CONTENT = """
 # Generated by python/private/toolchains_repo.bzl
 
@@ -83,6 +131,58 @@ assert want_python == got_python, \
     )
 """.lstrip()
 
+_MULTI_TOOLCHAIN_ALIASES_DEFS_TEMPLATE = """
+# Generated by python/private/toolchains_repo.bzl
+
+load("@@{rules_python}//python:pip.bzl", _compile_pip_requirements = "compile_pip_requirements")
+load("@@{rules_python}//python/private:deprecation.bzl", "with_deprecation")
+load("@@{rules_python}//python/private:text_util.bzl", "render")
+load("@@{rules_python}//python:py_binary.bzl", _py_binary = "py_binary")
+load("@@{rules_python}//python:py_test.bzl", _py_test = "py_test")
+load(
+    "@@{rules_python}//python/entry_points:py_console_script_binary.bzl",
+    _py_console_script_binary = "py_console_script_binary",
+)
+
+def _with_deprecation(kwargs, *, name):
+    kwargs["python_version"] = "{python_version}"
+    return with_deprecation.symbol(
+        kwargs,
+        symbol_name = name,
+        old_load = "@{name}//{python_version}:defs.bzl",
+        new_load = "@rules_python//python:{{}}.bzl".format(name),
+        snippet = render.call(name, **{{k: repr(v) for k,v in kwargs.items()}})
+    )
+
+def py_binary(**kwargs):
+    return _py_binary(**_with_deprecation(kwargs, name = "py_binary"))
+
+def py_console_script_binary(**kwargs):
+    return _py_console_script_binary(**_with_deprecation(kwargs, name = "py_console_script_binary"))
+
+def py_test(**kwargs):
+    return _py_test(**_with_deprecation(kwargs, name = "py_test"))
+
+def compile_pip_requirements(**kwargs):
+    return _compile_pip_requirements(**_with_deprecation(kwargs, name = "compile_pip_requirements"))
+""".lstrip()
+
+_MULTI_TOOLCHAIN_ALIASES_PIP_TEMPLATE = """
+# Generated by python/private/toolchains_repo.bzl
+
+load("@@{rules_python}//python:pip.bzl", "pip_parse", _multi_pip_parse = "multi_pip_parse")
+
+def multi_pip_parse(name, requirements_lock, **kwargs):
+    return _multi_pip_parse(
+        name = name,
+        python_versions = {python_versions},
+        requirements_lock = requirements_lock,
+        minor_mapping = {minor_mapping},
+        **kwargs
+    )
+
+""".lstrip()
+
 def python_toolchain_build_file_content(
         prefix,
         python_version,
@@ -168,7 +268,7 @@ toolchains_repo = repository_rule(
         "python_version": attr.string(doc = "The Python version."),
         "set_python_version_constraint": attr.bool(doc = "if target_compatible_with for the toolchain should set the version constraint"),
         "user_repository_name": attr.string(doc = "what the user chose for the base name"),
-        "_rules_python_workspace": attr.label(default = Label("//:MODULE.bazel")),
+        "_rules_python_workspace": attr.label(default = Label("//:WORKSPACE")),
     },
 )
 
@@ -204,7 +304,7 @@ actions.""",
             mandatory = True,
             doc = "The base name for all created repositories, like 'python38'.",
         ),
-        "_rules_python_workspace": attr.label(default = Label("//:MODULE.bazel")),
+        "_rules_python_workspace": attr.label(default = Label("//:WORKSPACE")),
     },
     environ = [REPO_DEBUG_ENV_VAR],
 )
@@ -352,7 +452,37 @@ Major.Minor.Micro format. Keyed by index in `platforms`.
 """,
         ),
         "_rule_name": attr.string(default = "host_compatible_python_repo"),
-        "_rules_python_workspace": attr.label(default = Label("//:MODULE.bazel")),
+        "_rules_python_workspace": attr.label(default = Label("//:WORKSPACE")),
+    },
+)
+
+def _multi_toolchain_aliases_impl(rctx):
+    rules_python = rctx.attr._rules_python_workspace.repo_name
+
+    for python_version, repository_name in rctx.attr.python_versions.items():
+        file = "{}/defs.bzl".format(python_version)
+        rctx.file(file, content = _MULTI_TOOLCHAIN_ALIASES_DEFS_TEMPLATE.format(
+            repository_name = repository_name,
+            name = rctx.attr.name,
+            python_version = python_version,
+            rules_python = rules_python,
+        ))
+        rctx.file("{}/BUILD.bazel".format(python_version), "")
+
+    pip_bzl = _MULTI_TOOLCHAIN_ALIASES_PIP_TEMPLATE.format(
+        python_versions = rctx.attr.python_versions.keys(),
+        minor_mapping = render.indent(render.dict(rctx.attr.minor_mapping), indent = " " * 8).lstrip(),
+        rules_python = rules_python,
+    )
+    rctx.file("pip.bzl", content = pip_bzl)
+    rctx.file("BUILD.bazel", "")
+
+multi_toolchain_aliases = repository_rule(
+    _multi_toolchain_aliases_impl,
+    attrs = {
+        "minor_mapping": attr.string_dict(doc = "The mapping between `X.Y` and `X.Y.Z` python version values"),
+        "python_versions": attr.string_dict(doc = "The Python versions."),
+        "_rules_python_workspace": attr.label(default = Label("//:WORKSPACE")),
     },
 )
 

python/private/toolchains_repo.bzl

@@ -21,12 +21,10 @@ load(
     _is_standalone_interpreter = "is_standalone_interpreter",
 )
 load("//python/private:py_repositories.bzl", _py_repositories = "py_repositories")
-load("//python/private:python_register_multi_toolchains.bzl", _python_register_multi_toolchains = "python_register_multi_toolchains")
 load("//python/private:python_register_toolchains.bzl", _python_register_toolchains = "python_register_toolchains")
 load("//python/private:python_repository.bzl", _python_repository = "python_repository")
 
 py_repositories = _py_repositories
-python_register_multi_toolchains = _python_register_multi_toolchains
 python_register_toolchains = _python_register_toolchains
 
 # Useful for documentation, but is not intended for public use - the python