tests: adapt tests to cosmetic changes caused by poetry-core#821

python-poetry · Jan 20, 2025 · 2f577d7 · 2f577d7
1 parent f907d2d
commit 2f577d7
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 27 deletions.
diff --git a/poetry.lock b/poetry.lock
diff --git a/tests/puzzle/test_solver.py b/tests/puzzle/test_solver.py
@@ -2027,42 +2027,29 @@ def test_solver_duplicate_dependencies_with_overlapping_markers_complex(
                 ' and platform_machine == "arm64" or python_version >= "3.10"'
             ),
             (
-                'numpy (>=1.19.3) ; python_version >= "3.9" and python_version < "3.10"'
-                ' and platform_system != "Darwin" or python_version >= "3.9"'
-                ' and python_version < "3.10" and platform_machine != "arm64"'
-                ' or platform_system == "Linux" and python_version < "3.10"'
-                ' and platform_machine == "aarch64" and python_version >= "3.6"'
+                'numpy (>=1.19.3) ; python_version >= "3.6"'
+                ' and (platform_system == "Linux" or python_version >= "3.9")'
+                ' and python_version < "3.10"'
+                ' and (platform_system != "Darwin" or platform_machine != "arm64")'
+                ' and (platform_machine == "aarch64" or python_version >= "3.9")'
             ),
             (
                 'numpy (>=1.17.3) ; python_version < "3.9"'
-                ' and platform_system != "Darwin" and platform_system != "Linux"'
-                ' and python_version >= "3.8" or python_version < "3.9"'
-                ' and platform_system != "Darwin" and python_version >= "3.8"'
-                ' and platform_machine != "aarch64" or python_version < "3.9"'
-                ' and platform_machine != "arm64" and python_version >= "3.8"'
-                ' and platform_system != "Linux" or python_version < "3.9"'
-                ' and platform_machine != "arm64" and platform_machine != "aarch64"'
+                ' and (platform_system != "Darwin" or platform_machine != "arm64")'
                 ' and python_version >= "3.8"'
+                ' and (platform_system != "Linux" or platform_machine != "aarch64")'
             ),
             (
                 'numpy (>=1.14.5) ; python_version < "3.8"'
-                ' and platform_system != "Darwin" and platform_system != "Linux"'
-                ' and python_version >= "3.7" or python_version < "3.8"'
-                ' and platform_system != "Darwin" and python_version >= "3.7"'
-                ' and platform_machine != "aarch64" or python_version < "3.8"'
-                ' and platform_machine != "arm64" and python_version >= "3.7"'
-                ' and platform_system != "Linux" or python_version < "3.8"'
-                ' and platform_machine != "arm64" and platform_machine != "aarch64"'
+                ' and (platform_system != "Darwin" or platform_machine != "arm64")'
                 ' and python_version >= "3.7"'
+                ' and (platform_system != "Linux" or platform_machine != "aarch64")'
             ),
             (
-                'numpy (>=1.13.3) ; python_version < "3.6" or python_version < "3.7"'
-                ' and platform_system != "Darwin" and platform_system != "Linux"'
-                ' or python_version < "3.7" and platform_system != "Darwin"'
-                ' and platform_machine != "aarch64" or python_version < "3.7"'
-                ' and platform_machine != "arm64" and platform_system != "Linux"'
-                ' or python_version < "3.7" and platform_machine != "arm64"'
-                ' and platform_machine != "aarch64"'
+                'numpy (>=1.13.3) ; python_version < "3.7"'
+                ' and (python_version < "3.6" or platform_system != "Darwin"'
+                ' or platform_machine != "arm64") and (python_version < "3.6"'
+                ' or platform_system != "Linux" or platform_machine != "aarch64")'
             ),
         },
     )