summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonald Stufft <donald@stufft.io>2015-08-22 18:46:32 -0400
committerDonald Stufft <donald@stufft.io>2015-08-22 18:46:32 -0400
commit87497c49fe6d87494947a7fb9f558282298a7ec3 (patch)
tree170d3bc772b0152830ff071cdee5d2cc6d24c160
parent7433d2efc4a6979aa0f44af29e6e4c118ede9068 (diff)
parent76cf020a71b0ed58608d96f7b37973818bc483eb (diff)
downloadpip-87497c49fe6d87494947a7fb9f558282298a7ec3.tar.gz
Merge branch 'develop'
-rwxr-xr-xpip/__init__.py2
-rw-r--r--pip/utils/outdated.py6
2 files changed, 6 insertions, 2 deletions
diff --git a/pip/__init__.py b/pip/__init__.py
index e89c4301a..b04cb00e0 100755
--- a/pip/__init__.py
+++ b/pip/__init__.py
@@ -30,7 +30,7 @@ import pip.cmdoptions
cmdoptions = pip.cmdoptions
# The version as used in the setup.py and the docs conf.py
-__version__ = "7.1.1"
+__version__ = "7.2.0.dev0"
logger = logging.getLogger(__name__)
diff --git a/pip/utils/outdated.py b/pip/utils/outdated.py
index 5549b7865..6365c6c06 100644
--- a/pip/utils/outdated.py
+++ b/pip/utils/outdated.py
@@ -99,7 +99,11 @@ def pip_version_check(session):
the active virtualenv or in the user's USER_CACHE_DIR keyed off the prefix
of the pip script path.
"""
- pip_version = packaging_version.parse(get_installed_version('pip'))
+ installed_version = get_installed_version("pip")
+ if installed_version is None:
+ return
+
+ pip_version = packaging_version.parse(installed_version)
pypi_version = None
try: