Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Ignore pre-release versions when prompting for upgrade #5470

Closed
wants to merge 2 commits into from
Closed

Ignore pre-release versions when prompting for upgrade #5470

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
245c376
Ignore pre-release versions when prompting for upgrade
TheJokersThief Jun 1, 2018
6b400cf
Add news file fragment
TheJokersThief Jun 1, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions news/5175.bugfix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
No longer prompt for upgrade to pre-release versions of pip.
7 changes: 7 additions & 0 deletions src/pip/_internal/utils/outdated.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,13 @@ def pip_version_check(session, options):
all_candidates = finder.find_all_candidates("pip")
if not all_candidates:
return

all_candidates = [
candidate
for candidate in all_candidates
if candidate.version.pre is None
]

pypi_version = str(
max(all_candidates, key=lambda c: c.version).version
)
Expand Down
14 changes: 9 additions & 5 deletions tests/unit/test_unit_outdated.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,10 @@ class MockPackageFinder(object):
BASE_URL = 'https://pypi.org/simple/pip-{0}.tar.gz'
PIP_PROJECT_NAME = 'pip'
INSTALLATION_CANDIDATES = [
InstallationCandidate(PIP_PROJECT_NAME, '6.9.0',
BASE_URL.format('6.9.0')),
InstallationCandidate(PIP_PROJECT_NAME, '10.0.0b2',
BASE_URL.format('10.0.0b2')),
InstallationCandidate(PIP_PROJECT_NAME, '9.0.3',
BASE_URL.format('9.0.3')),
InstallationCandidate(PIP_PROJECT_NAME, '3.3.1',
BASE_URL.format('3.3.1')),
InstallationCandidate(PIP_PROJECT_NAME, '1.0',
Expand Down Expand Up @@ -69,11 +71,13 @@ def _options():
# Test we return None when installed version is None
('1970-01-01T10:00:00Z', None, '1.0', 'pip', False, False),
# Need an upgrade - upgrade warning should print
('1970-01-01T10:00:00Z', '1.0', '6.9.0', 'pip', True, True),
('1970-01-01T10:00:00Z', '1.0', '9.0.3', 'pip', True, True),
# Upgrade available, pip installed via rpm - warning should not print
('1970-01-01T10:00:00Z', '1.0', '6.9.0', 'rpm', True, False),
('1970-01-01T10:00:00Z', '1.0', '9.0.3', 'rpm', True, False),
# No upgrade - upgrade warning should not print
('1970-01-9T10:00:00Z', '6.9.0', '6.9.0', 'pip', False, False),
('1970-01-9T10:00:00Z', '9.0.3', '9.0.3', 'pip', False, False),
# Pre-release available - upgrade warning should not print
('1970-01-9T10:00:00Z', '9.0.3', '10.0.0b2', 'pip', False, False),
]
)
def test_pip_version_check(monkeypatch, stored_time, installed_ver, new_ver,
Expand Down