iteration 4

Jackenmen · Mar 20, 2024 · 19de4b8 · 19de4b8
1 parent 2fc76ef
commit 19de4b8
Showing 1 changed file with 31 additions and 34 deletions.
diff --git a/.github/workflows/scripts/merge_requirements.py b/.github/workflows/scripts/merge_requirements.py
@@ -122,68 +122,65 @@ def iter_envs(envs: Iterable[str]) -> Iterable[Tuple[str, str]]:
 
         # At this point I'm wondering why I didn't just go for
         # a more generic boolean algebra simplification (sympy.simplify_logic())...
-        if len(set(map(frozenset, python_versions_per_platform.values()))) == 1:
+        if (
+            len(set(map(frozenset, python_versions_per_platform.values()))) == 1
+            or len(set(map(frozenset, platforms_per_python_version.values()))) == 1
+        ):
             # All platforms have the same Python version set.
             # Let's generate the base Python version marker.
-            python_version_marker = " or ".join(
-                f"python_version == '{env_name}'" for env_name in envs
-                # f"python_version == '{python_version}'"
-                # for python_version in python_versions
-            )
+            python_version_marker = ""
+            if len(python_versions) == len(all_python_versions):
+                # requirement present on all Python versions
+                pass
+            elif len(python_versions) < len(all_python_versions - python_versions):
+                # requirement present on less Python versions than not
+                python_version_marker = " or ".join(
+                    f"python_version == '{env_name}'" for env_name in envs
+                    # f"python_version == '{python_version}'" for python_version in python_versions
+                )
+            else:
+                # requirement present on more Python versions than not
+                python_version_marker = " and ".join(
+                    f"python_version != '{env_name}'" for env_name in all_envs - envs.keys()
+                    # f"python_version != '{python_version}'"
+                    # for python_version in all_python_versions - python_versions
+                )
 
+            platform_marker = ""
             if len(platforms) == len(all_platforms):
                 # requirement present on all platforms
-                env_marker = python_version_marker
+                pass
             elif len(platforms) < len(all_platforms - platforms):
                 # requirement present on less platforms than not
                 platform_marker = " or ".join(
                     f"sys_platform == '{env_name}'" for env_name in envs
                     # f"sys_platform == '{platform}'" for platform in platforms
                 )
-                env_marker = f"({python_version_marker}) and ({platform_marker})"
             else:
                 # requirement present on more platforms than not
                 platform_marker = " and ".join(
                     f"sys_platform != '{env_name}'" for env_name in all_envs - envs.keys()
                     # f"sys_platform != '{platform}'" for platform in all_platforms - platforms
                 )
-                env_marker = f"({python_version_marker}) and ({platform_marker})"
-        elif len(set(map(frozenset, platforms_per_python_version.values()))) == 1:
-            # All Python versions have the same Python version set.
-            # Let's generate the base platform marker
-            platform_marker = " or ".join(
-                f"sys_platform == '{env_name}'" for env_name in envs
-                # f"sys_platform == '{platform}'" for platform in platforms
-            )
 
-            if len(python_versions) == len(all_python_versions):
-                # requirement present on all Python versions
+            if python_version_marker and platform_marker:
+                env_marker = f"({python_version_marker}) and ({platform_marker})"
+            elif python_version_marker:
+                env_marker = python_version_marker
+            elif platform_marker:
                 env_marker = platform_marker
-            elif len(python_versions) < len(all_python_versions - python_versions):
-                # requirement present on less Python versions than not
-                python_version_marker = " or ".join(
-                    f"python_version == '{env_name}'" for env_name in envs
-                    # f"python_version == '{python_version}'" for python_version in python_versions
-                )
-                env_marker = f"({platform_marker}) and ({python_version_marker})"
             else:
-                # requirement present on more Python versions than not
-                python_version_marker = " and ".join(
-                    f"python_version != '{env_name}'" for env_name in all_envs - envs.keys()
-                    # f"python_version != '{python_version}'"
-                    # for python_version in all_python_versions - python_versions
-                )
-                env_marker = f"({platform_marker}) and ({python_version_marker})"
+                env_marker = ""
         else:
             # Fallback to generic case.
 
             if len(envs) < len(all_envs - envs.keys()):
-                platform_marker = " or ".join(
+                env_marker = " or ".join(
                     f"(sys_platform == '{platform}' and python_version == '{python_version}')"
                     for platform, python_version in iter_envs(envs)
                 )
             else:
-                platform_marker = " and ".join(
+                env_marker = " and ".join(
                     f"(sys_platform != '{platform}' and python_version != '{python_version}')"
                     for platform, python_version in iter_envs(all_envs - envs.keys())
                 )