diff --git a/poetry.lock b/poetry.lock index 8f06576e67a..87941004c83 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1052,7 +1052,7 @@ develop = false type = "git" url = "https://github.com/python-poetry/poetry-core.git" reference = "HEAD" -resolved_reference = "b1505c6eef8160ffe4ead25c7bff81317947da1a" +resolved_reference = "d97577e664d59173482a78f70e8f743cc5468851" [[package]] name = "pre-commit" diff --git a/tests/puzzle/test_solver.py b/tests/puzzle/test_solver.py index 6d791baed5d..205972a8848 100644 --- 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")' ), }, )