fix: correct the implementation of multi_pip_parse

aignas · aignas · commit e890a5ad2663 · 2023-08-11T11:20:14.000+09:00
diff --git a/examples/multi_python_versions/WORKSPACE b/examples/multi_python_versions/WORKSPACE
@@ -38,13 +38,13 @@ multi_pip_parse(
     default_version = default_python_version,
     python_interpreter_target = {
         "3.10": interpreter_3_10,
-        "3.11": interpreter_3_11,
+        "3.11.1": interpreter_3_11,
         "3.8": interpreter_3_8,
         "3.9": interpreter_3_9,
     },
     requirements_lock = {
         "3.10": "//requirements:requirements_lock_3_10.txt",
-        "3.11": "//requirements:requirements_lock_3_11.txt",
+        "3.11.1": "//requirements:requirements_lock_3_11.txt",
         "3.8": "//requirements:requirements_lock_3_8.txt",
         "3.9": "//requirements:requirements_lock_3_9.txt",
     },
diff --git a/examples/multi_python_versions/libs/my_lib/__init__.py b/examples/multi_python_versions/libs/my_lib/__init__.py
@@ -16,4 +16,12 @@
 
 
 def websockets_is_for_python_version(sanitized_version_check):
-    return f"pypi_{sanitized_version_check}_websockets" in websockets.__file__
+    # We are checking that the name of the repository folders
+    # match the expexted generated names. If we update the folder
+    # structure or naming we will need to modify this test
+    if f"pypi_{sanitized_version_check}_websockets" in websockets.__file__:
+        return True
+
+    raise RuntimeError(
+        f"Expected version '{sanitized_version_check}' was not in {websockets.__file__}"
+    )
diff --git a/python/pip.bzl b/python/pip.bzl
@@ -185,7 +185,7 @@ _process_requirements(
     repo_prefix = "{pypi_repository}_",
 )""".format(
             pypi_repository = pypi_repository,
-            python_version = version_label(python_version, sep = "."),
+            python_version = python_version,
             sanitized_python_version = sanitized_python_version,
         )
         process_requirements_calls.append(process_requirements_call)
@@ -246,7 +246,7 @@ def install_deps(**whl_library_kwargs):
         load_statements = "\n".join(load_statements),
         process_requirements_calls = "\n".join(process_requirements_calls),
         rules_python = rules_python,
-        default_version = rctx.attr.default_version,
+        default_version = full_version(rctx.attr.default_version),
     )
     rctx.file("requirements.bzl", requirements_bzl)
     rctx.file("BUILD.bazel", "exports_files(['requirements.bzl'])")
