From 55272b264e0bc57d908adf79b8ab6ce4ee6aff9a Mon Sep 17 00:00:00 2001 From: Paul Moore Date: Thu, 10 Oct 2013 16:32:05 +0100 Subject: [PATCH] Clarify setuptools requirement message by including the minimum version --- pip/commands/wheel.py | 2 +- pip/index.py | 2 +- pip/wheel.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pip/commands/wheel.py b/pip/commands/wheel.py index 639de1d4e..5531c15d5 100644 --- a/pip/commands/wheel.py +++ b/pip/commands/wheel.py @@ -89,7 +89,7 @@ class WheelCommand(Command): except ImportError: raise CommandError("'pip wheel' requires bdist_wheel from the 'wheel' distribution.") if not wheel_setuptools_support(): - raise CommandError("'pip wheel' requires setuptools with dist-info support.") + raise CommandError("'pip wheel' requires setuptools >= 0.8 for dist-info support.") index_urls = [options.index_url] + options.extra_index_urls if options.no_index: diff --git a/pip/index.py b/pip/index.py index 86b2230fe..eeec8a434 100644 --- a/pip/index.py +++ b/pip/index.py @@ -83,7 +83,7 @@ class PackageFinder(object): def use_wheel(self, value): self._use_wheel = value if self._use_wheel and not wheel_setuptools_support(): - raise InstallationError("pip's wheel support requires setuptools with dist-info support.") + raise InstallationError("pip's wheel support requires setuptools >= 0.8 for dist-info support.") def add_dependency_links(self, links): ## FIXME: this shouldn't be global list this, it should only diff --git a/pip/wheel.py b/pip/wheel.py index 33ba65832..f6e200ed8 100644 --- a/pip/wheel.py +++ b/pip/wheel.py @@ -26,7 +26,7 @@ def wheel_setuptools_support(): """ fulfilled = hasattr(pkg_resources, 'DistInfoDistribution') if not fulfilled: - logger.warn("A setuptools that supports dist-info is required for wheel installs.") + logger.warn("Wheel installs require setuptools >= 0.8 for dist-info support.") return fulfilled def rehash(path, algo='sha256', blocksize=1<<20):