Fix handling of markers in old files (#2482)

python-poetry · Jun 12, 2020 · b398062 · b398062
1 parent d4be652
commit b398062
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/poetry/installation/installer.py b/poetry/installation/installer.py
@@ -446,6 +446,10 @@ def _filter_operations(
             if op.job_type == "uninstall":
                 continue
 
+            if not self._env.is_valid_for_marker(package.marker):
+                op.skip("Not needed for the current environment")
+                continue
+
             if self._update:
                 extras = {}
                 for extra, deps in self._package.extras.items():

diff --git a/tests/installation/test_installer.py b/tests/installation/test_installer.py
@@ -1627,7 +1627,8 @@ def test_installer_can_handle_old_lock_files(
 
     package.add_dependency("pytest", "^3.5", category="dev")
 
-    locker.mock_lock_data(fixture("with-pypi-repository"))
+    locker.locked()
+    locker.mock_lock_data(fixture("old-lock"))
 
     installer = Installer(
         NullIO(), MockEnv(), package, locker, pool, installed=installed