[Python-modules-commits] r29199 - in packages/python-pip/trunk/debian (4 files)

[barry at users.alioth.debian.org]

    Date: Tuesday, June 3, 2014 @ 22:50:38
  Author: barry
Revision: 29199

  - Add python{,3}-wheel to Recommends in order to enable the `pip
    wheel` command.  (Closes: #733286)
* d/patches
  - de-vendorize.patch: Refreshed.
  - use-venv-wheels.patch: Handle virtualenv created venvs.
  - better-error-message.patch: Added.

Added:
  packages/python-pip/trunk/debian/patches/better-error-message.patch
Modified:
  packages/python-pip/trunk/debian/changelog
  packages/python-pip/trunk/debian/control
  packages/python-pip/trunk/debian/patches/series

Modified: packages/python-pip/trunk/debian/changelog
===================================================================
--- packages/python-pip/trunk/debian/changelog	2014-06-03 22:40:53 UTC (rev 29198)
+++ packages/python-pip/trunk/debian/changelog	2014-06-03 22:50:38 UTC (rev 29199)
@@ -5,8 +5,12 @@
   * d/control:
     - Update python-pip-whl dependencies
     - Add python-docutils to Build-Depends
-  * d/patches/de-vendorize.patch: Refreshed.
-  * d/patches/use-venv-wheels.patch: Handle virtualenv created venvs.
+    - Add python{,3}-wheel to Recommends in order to enable the `pip
+      wheel` command.  (Closes: #733286)
+  * d/patches
+    - de-vendorize.patch: Refreshed.
+    - use-venv-wheels.patch: Handle virtualenv created venvs.
+    - better-error-message.patch: Added.
   * d/pip.dependencies: Added.  (Closes: #749692)
   * d/python-pip-whl.install: Updated.
   * d/README.debian: Added.

Modified: packages/python-pip/trunk/debian/control
===================================================================
--- packages/python-pip/trunk/debian/control	2014-06-03 22:40:53 UTC (rev 29198)
+++ packages/python-pip/trunk/debian/control	2014-06-03 22:50:38 UTC (rev 29199)
@@ -37,7 +37,7 @@
          python-six,
          ${misc:Depends},
          ${python:Depends}
-Recommends: build-essential, python-dev-all (>= 2.6)
+Recommends: build-essential, python-dev-all (>= 2.6), python-wheel
 Description: alternative Python package installer
  pip is a replacement for easy_install, and is intended to be an improved
  Python package installer.  It integrates with virtualenv, doesn't do partial
@@ -56,7 +56,7 @@
          python3-six,
          ${misc:Depends},
          ${python3:Depends}
-Recommends: build-essential, python3-dev (>= 3.2)
+Recommends: build-essential, python3-dev (>= 3.2), python3-wheel
 Description: alternative Python package installer - Python 3 version of the package
  pip is a replacement for easy_install, and is intended to be an improved
  Python package installer.  It integrates with virtualenv, doesn't do partial

Added: packages/python-pip/trunk/debian/patches/better-error-message.patch
===================================================================
--- packages/python-pip/trunk/debian/patches/better-error-message.patch	                        (rev 0)
+++ packages/python-pip/trunk/debian/patches/better-error-message.patch	2014-06-03 22:50:38 UTC (rev 29199)
@@ -0,0 +1,21 @@
+Description: Provide a better, Debian-specific error message when someone
+ tries to run the `pip wheel` command before installing the necessary package.
+Author: Barry Warsaw <barry at debian.org>
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=733286
+Forwarded: not-needed
+
+--- a/pip/commands/wheel.py
++++ b/pip/commands/wheel.py
+@@ -88,7 +88,11 @@
+         try:
+             import wheel.bdist_wheel
+         except ImportError:
+-            raise CommandError("'pip wheel' requires the 'wheel' package. To fix this, run:  pip install wheel")
++            if sys.version_info < (3,):
++                debian_package = 'python-wheel'
++            else:
++                debian_package = 'python3-wheel'
++            raise CommandError("'pip wheel' requires the 'wheel' package. To fix this, run: sudo apt-get install %s" % debian_package)
+ 
+         try:
+             import pkg_resources

Modified: packages/python-pip/trunk/debian/patches/series
===================================================================
--- packages/python-pip/trunk/debian/patches/series	2014-06-03 22:40:53 UTC (rev 29198)
+++ packages/python-pip/trunk/debian/patches/series	2014-06-03 22:50:38 UTC (rev 29199)
@@ -1,3 +1,4 @@
 format_egg_string.patch
 de-vendorize.patch
 use-venv-wheels.patch
+better-error-message.patch