Merge branch 'pr/1552' into check_if_exists_editable

sshravan · Aug 5, 2016 · 73fc56e · 73fc56e
2 parents a88beb1 + 37bed20
commit 73fc56e
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 0 deletions.
diff --git a/pip/req/req_install.py b/pip/req/req_install.py
@@ -1000,6 +1000,12 @@ def check_if_exists(self):
             no_marker = Requirement(str(self.req))
             no_marker.marker = None
             self.satisfied_by = pkg_resources.get_distribution(str(no_marker))
+            if self.editable and self.satisfied_by:
+                self.conflicts_with = self.satisfied_by
+                # when installing editables, nothing pre-existing should ever
+                # satisfy
+                self.satisfied_by = None
+                return True
         except pkg_resources.DistributionNotFound:
             return False
         except pkg_resources.VersionConflict:

diff --git a/tests/functional/test_install.py b/tests/functional/test_install.py
@@ -179,6 +179,32 @@ def test_install_editable_from_git_autobuild_wheel(script, tmpdir):
     _test_install_editable_from_git(script, tmpdir, True)
 
 
+def test_install_editable_uninstalls_existing(data, script, tmpdir):
+    """
+    Test that installing an editable uninstalls a previously installed
+    non-editable version.
+    https://github.com/pypa/pip/issues/1548
+    https://github.com/pypa/pip/pull/1552
+    """
+    to_install = data.packages.join("pip-test-package-0.1.tar.gz")
+    result = script.pip_install_local(to_install)
+    assert 'Successfully installed pip-test-package' in result.stdout
+    result.assert_installed('piptestpackage', editable=False)
+
+    result = script.pip(
+        'install', '-e',
+        '%s#egg=pip-test-package' %
+        local_checkout(
+            'git+http://github.com/pypa/pip-test-package.git',
+            tmpdir.join("cache"),
+        ),
+    )
+    result.assert_installed('pip-test-package', with_files=['.git'])
+    assert 'Found existing installation: pip-test-package 0.1' in result.stdout
+    assert 'Uninstalling pip-test-package:' in result.stdout
+    assert 'Successfully uninstalled pip-test-package' in result.stdout
+
+
 def test_install_editable_from_hg(script, tmpdir):
     """Test cloning from Mercurial."""
     pkg_path = _create_test_package(script, name='testpackage', vcs='hg')