finish fixing the toolchain tests

Author: aignas

examples/bzlmod/libs/my_lib/__init__.py

@@ -19,4 +19,10 @@ def websockets_is_for_python_version(sanitized_version_check):
     # We are checking that the name of the repository folders
     # match the expected generated names. If we update the folder
     # structure or naming we will need to modify this test.
-    return f"_{sanitized_version_check}__websockets" in websockets.__file__
+    want = f"_{sanitized_version_check}_websockets"
+    got_full = websockets.__file__
+    if want not in got_full:
+        print(f"Failed, expected '{want}' to be a substring of '{got_full}'.")
+        return False
+
+    return True

python/private/pip_repo_name.bzl

@@ -29,7 +29,7 @@ def pip_repo_name(prefix, filename, sha256):
     Returns:
         a string that can be used in `whl_library`.
     """
-    parts = [prefix, ""]
+    parts = [prefix]
 
     if not filename.endswith(".whl"):
         # Then the filename is basically foo-3.2.1.<ext>
@@ -47,6 +47,6 @@ def pip_repo_name(prefix, filename, sha256):
         parts.append(abi_tag)
         parts.append(platform_tag)
 
-    parts.append(sha256[:9])
+    parts.append(sha256[:8])
 
     return "_".join(parts)

python/private/py_toolchain_suite.bzl

@@ -40,7 +40,7 @@ def py_toolchain_suite(*, prefix, user_repository_name, python_version, set_pyth
     # string as we cannot have list of bools in build rule attribues.
     # This if statement does not appear to work unless it is in the
     # toolchain file.
-    if set_python_version_constraint == "True":
+    if set_python_version_constraint in ["True", "False"]:
         major_minor, _, _ = python_version.rpartition(".")
 
         match_any = []
@@ -65,6 +65,18 @@ def py_toolchain_suite(*, prefix, user_repository_name, python_version, set_pyth
                     visibility = ["//visibility:private"],
                 )
 
+        if set_python_version_constraint == "False":
+            if flag_values:
+                name = "{prefix}_version_setting_no_python_version".format(prefix = prefix)
+                match_any.append(name)
+                native.config_setting(
+                    name = name,
+                    flag_values = flag_values | {
+                        str(Label("//python/config_settings:python_version")): "",
+                    },
+                    visibility = ["//visibility:private"],
+                )
+
         name = "{prefix}_version_setting_{python_version}".format(
             prefix = prefix,
             python_version = python_version,
@@ -75,17 +87,14 @@ def py_toolchain_suite(*, prefix, user_repository_name, python_version, set_pyth
             match_any = match_any,
             visibility = ["//visibility:private"],
         )
-        target_settings = [name]
-    elif set_python_version_constraint == "False":
-        name = "{prefix}_version_setting_default".format(prefix = prefix)
-        native.config_setting(
-            name = name,
-            flag_values = flag_values | {
-                Label("//python/config_settings:python_version"): "",
-            },
-            visibility = ["//visibility:private"],
-        )
-        target_settings = [name]
+
+        if set_python_version_constraint == "True":
+            target_settings = [name]
+        else:
+            target_settings = select({
+                name: [name],
+                "//conditions:default": [],
+            })
     else:
         fail(("Invalid set_python_version_constraint value: got {} {}, wanted " +
               "either the string 'True' or the string 'False'; " +

tests/private/pip_repo_name/pip_repo_name_tests.bzl

@@ -21,13 +21,13 @@ _tests = []
 
 def _test_simple(env):
     got = pip_repo_name("prefix", "foo-1.2.3-py3-none-any.whl", "deadbeef")
-    env.expect.that_str(got).equals("prefix__foo_py3_none_any_deadbeef")
+    env.expect.that_str(got).equals("prefix_foo_py3_none_any_deadbeef")
 
 _tests.append(_test_simple)
 
 def _test_sdist(env):
     got = pip_repo_name("prefix", "foo-1.2.3.tar.gz", "deadbeef000deadbeef")
-    env.expect.that_str(got).equals("prefix__foo_sdist_deadbeef")
+    env.expect.that_str(got).equals("prefix_foo_sdist_deadbeef")
 
 _tests.append(_test_sdist)
 
@@ -39,7 +39,7 @@ def _test_platform_whl(env):
     )
 
     # We only need the first segment of each
-    env.expect.that_str(got).equals("prefix__foo_cp39_abi3_manylinux_2_5_x86_64_deadbeef")
+    env.expect.that_str(got).equals("prefix_foo_cp39_abi3_manylinux_2_5_x86_64_deadbeef")
 
 _tests.append(_test_platform_whl)