Skip to content

Commit

Permalink
Fix install warning message about mismatched versions
Browse files Browse the repository at this point in the history
  • Loading branch information
benoit-pierre authored and xavfernandez committed Oct 7, 2017
1 parent df083c7 commit 2243562
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 2 deletions.
1 change: 1 addition & 0 deletions news/4655.bugfix
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix warning message on mismatched versions during installation.
2 changes: 1 addition & 1 deletion src/pip/_internal/req/req_install.py
Original file line number Diff line number Diff line change
Expand Up @@ -595,7 +595,7 @@ def assert_source_matches_version(self):
logger.warning(
'Requested %s, but installing version %s',
self,
self.installed_version,
version,
)
else:
logger.debug(
Expand Down
16 changes: 15 additions & 1 deletion tests/unit/test_req.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
from pip._internal.req.req_install import parse_editable
from pip._internal.resolve import Resolver
from pip._internal.utils.misc import read_text_file
from tests.lib import assert_raises_regexp, requirements_file
from tests.lib import DATA_DIR, assert_raises_regexp, requirements_file


class TestRequirementSet(object):
Expand Down Expand Up @@ -601,3 +601,17 @@ def test_exclusive_environment_markers():
req_set.add_requirement(eq26)
req_set.add_requirement(ne26)
assert req_set.has_requirement('Django')


def test_mismatched_versions(caplog, tmpdir):
original_source = os.path.join(DATA_DIR, 'src', 'simplewheel-1.0')
source_dir = os.path.join(tmpdir, 'simplewheel')
shutil.copytree(original_source, source_dir)
req = InstallRequirement(req=Requirement('simplewheel==2.0'),
comes_from=None, source_dir=source_dir)
req.run_egg_info()
req.assert_source_matches_version()
assert caplog.records[-1].message == (
'Requested simplewheel==2.0, '
'but installing version 1.0'
)

0 comments on commit 2243562

Please sign in to comment.