move tests

Author: aignas

python/private/pypi/parse_requirements.bzl

@@ -148,7 +148,9 @@ def parse_requirements(
 
     options = {}
     requirements = {}
-    for plat, file in requirements_by_platform.items():
+    for file, plats in requirements_by_platform.items():
+        if logger:
+            logger.debug(lambda: "Using {} for {}".format(file, plats))
         contents = ctx.read(file)
 
         # Parse the requirements file directly in starlark to get the information
@@ -181,10 +183,9 @@ def parse_requirements(
                 tokenized_options.append(p)
 
         pip_args = tokenized_options + extra_pip_args
-        if logger:
-            logger.debug(lambda: "Using {} for {}".format(file, plat))
-        requirements[plat] = requirements_dict
-        options[plat] = pip_args
+        for plat in plats:
+            requirements[plat] = requirements_dict
+            options[plat] = pip_args
 
     requirements_by_platform = {}
     reqs_with_env_markers = {}

python/private/pypi/requirements_files_by_platform.bzl

@@ -249,4 +249,12 @@ def requirements_files_by_platform(
                 return None, None
             requirements[p] = file
 
-    return requirements, len(platforms) > 0
+    # Now return a dict that is similar to requirements_by_platform - where we
+    # have labels/files as keys in the dict to minimize the number of times we
+    # may parse the same file.
+
+    ret = {}
+    for plat, file in requirements.items():
+        ret.setdefault(file, []).append(plat)
+
+    return ret, len(platforms) > 0