pip support for wheel

.travis.yml

@@ -13,7 +13,6 @@ before_install:
 install: pip install nose virtualenv scripttest mock
 script: nosetests
 notifications:
-  irc: "irc.freenode.org#pip"
 branches:
   only:
     - develop

docs/usage.rst

@@ -344,6 +344,43 @@ Examples
   peppercorn      - A library for converting a token stream into [...]
 
 
+pip wheel
+---------
+
+Usage
+*****
+
+.. pip-command-usage:: wheel
+
+
+Description
+***********
+
+.. pip-command-description:: wheel
+
+Options
+*******
+
+**Wheel Options:**
+
+.. pip-command-options:: wheel
+
+**Other Options:**
+
+* :ref:`Package Index Options <Package Index Options>`
+* :ref:`General Options <General Options>`
+
+Examples
+********
+
+1. Build wheels for a requirement (and all it's dependencies), and then install
+
+  ::
+
+    $ pip wheel --wheel-dir=/tmp/wheelhouse SomePackage
+    $ pip install --use-wheel --no-index --find-links=/tmp/wheelhouse SomePackage
+
+
 pip zip
 -------
 

pip/cmdoptions.py

@@ -1,5 +1,6 @@
 """shared options and groups"""
 from optparse import make_option, OptionGroup
+from pip.locations import build_prefix
 
 
 def make_option_group(group, parser):
@@ -62,6 +63,62 @@ def make_option_group(group, parser):
     default=[],
     help='Specific mirror URLs to query when --use-mirrors is used.')
 
+requirements = make_option(
+    '-r', '--requirement',
+    dest='requirements',
+    action='append',
+    default=[],
+    metavar='file',
+    help='Install from the given requirements file. '
+    'This option can be used multiple times.')
+
+use_wheel = make_option(
+    '--use-wheel',
+    dest='use_wheel',
+    action='store_true',
+    help='Find wheel archives when searching indexes and find-links locations.')
+
+download_cache = make_option(
+    '--download-cache',
+    dest='download_cache',
+    metavar='dir',
+    default=None,
+    help='Cache downloaded packages in <dir>.')
+
+no_deps = make_option(
+    '--no-deps', '--no-dependencies',
+    dest='ignore_dependencies',
+    action='store_true',
+    default=False,
+    help="Don't install package dependencies.")
+
+build_dir = make_option(
+    '-b', '--build', '--build-dir', '--build-directory',
+    dest='build_dir',
+    metavar='dir',
+    default=build_prefix,
+    help='Directory to unpack packages into and build in. '
+    'The default in a virtualenv is "<venv path>/build". '
+    'The default for global installs is "<OS temp dir>/pip-build-<username>".')
+
+install_options = make_option(
+    '--install-option',
+    dest='install_options',
+    action='append',
+    metavar='options',
+    help="Extra arguments to be supplied to the setup.py install "
+    "command (use like --install-option=\"--install-scripts=/usr/local/bin\"). "
+    "Use multiple --install-option options to pass multiple options to setup.py install. "
+    "If you are using an option with a directory path, be sure to use absolute path.")
+
+global_options = make_option(
+    '--global-option',
+    dest='global_options',
+    action='append',
+    metavar='options',
+    help="Extra global options to be supplied to the setup.py "
+    "call before the install command.")
+
 
 ##########
 # groups #

pip/commands/__init__.py

@@ -14,6 +14,7 @@
 from pip.commands.uninstall import UninstallCommand
 from pip.commands.unzip import UnzipCommand
 from pip.commands.zip import ZipCommand
+from pip.commands.wheel import WheelCommand
 
 
 commands = {
@@ -28,6 +29,7 @@
     UnzipCommand.name: UnzipCommand,
     ZipCommand.name: ZipCommand,
     ListCommand.name: ListCommand,
+    WheelCommand.name: WheelCommand,
 }
 
 
@@ -38,6 +40,7 @@
     ListCommand,
     ShowCommand,
     SearchCommand,
+    WheelCommand,
     ZipCommand,
     UnzipCommand,
     BundleCommand,

pip/commands/install.py

@@ -4,12 +4,12 @@
 import shutil
 from pip.req import InstallRequirement, RequirementSet, parse_requirements
 from pip.log import logger
-from pip.locations import build_prefix, src_prefix, virtualenv_no_global
+from pip.locations import src_prefix, virtualenv_no_global
 from pip.basecommand import Command
 from pip.index import PackageFinder
 from pip.exceptions import InstallationError, CommandError
 from pip.backwardcompat import home_lib
-from pip.cmdoptions import make_option_group, index_group
+from pip import cmdoptions
 
 
 class InstallCommand(Command):
@@ -52,23 +52,8 @@ def __init__(self, *args, **kw):
             metavar='path/url',
             help='Install a project in editable mode (i.e. setuptools "develop mode") from a local project path or a VCS url.')
 
-        cmd_opts.add_option(
-            '-r', '--requirement',
-            dest='requirements',
-            action='append',
-            default=[],
-            metavar='file',
-            help='Install from the given requirements file. '
-            'This option can be used multiple times.')
-
-        cmd_opts.add_option(
-            '-b', '--build', '--build-dir', '--build-directory',
-            dest='build_dir',
-            metavar='dir',
-            default=build_prefix,
-            help='Directory to unpack packages into and build in. '
-            'The default in a virtualenv is "<venv path>/build". '
-            'The default for global installs is "<OS temp dir>/pip-build-<username>".')
+        cmd_opts.add_option(cmdoptions.requirements)
+        cmd_opts.add_option(cmdoptions.build_dir)
 
         cmd_opts.add_option(
             '-t', '--target',
@@ -84,12 +69,7 @@ def __init__(self, *args, **kw):
             default=None,
             help="Download packages into <dir> instead of installing them, irregardless of what's already installed.")
 
-        cmd_opts.add_option(
-            '--download-cache',
-            dest='download_cache',
-            metavar='dir',
-            default=None,
-            help='Cache downloaded packages in <dir>.')
+        cmd_opts.add_option(cmdoptions.download_cache)
 
         cmd_opts.add_option(
             '--src', '--source', '--source-dir', '--source-directory',
@@ -120,12 +100,7 @@ def __init__(self, *args, **kw):
             action='store_true',
             help='Ignore the installed packages (reinstalling instead).')
 
-        cmd_opts.add_option(
-            '--no-deps', '--no-dependencies',
-            dest='ignore_dependencies',
-            action='store_true',
-            default=False,
-            help="Don't install package dependencies.")
+        cmd_opts.add_option(cmdoptions.no_deps)
 
         cmd_opts.add_option(
             '--no-install',
@@ -140,23 +115,8 @@ def __init__(self, *args, **kw):
             help="Don't download any packages, just install the ones already downloaded "
             "(completes an install run with --no-install).")
 
-        cmd_opts.add_option(
-            '--install-option',
-            dest='install_options',
-            action='append',
-            metavar='options',
-            help="Extra arguments to be supplied to the setup.py install "
-            "command (use like --install-option=\"--install-scripts=/usr/local/bin\"). "
-            "Use multiple --install-option options to pass multiple options to setup.py install. "
-            "If you are using an option with a directory path, be sure to use absolute path.")
-
-        cmd_opts.add_option(
-            '--global-option',
-            dest='global_options',
-            action='append',
-            metavar='options',
-            help="Extra global options to be supplied to the setup.py "
-            "call before the install command.")
+        cmd_opts.add_option(cmdoptions.install_options)
+        cmd_opts.add_option(cmdoptions.global_options)
 
         cmd_opts.add_option(
             '--user',
@@ -177,13 +137,15 @@ def __init__(self, *args, **kw):
             default=None,
             help="Install everything relative to this alternate root directory.")
 
+        cmd_opts.add_option(cmdoptions.use_wheel)
+
         cmd_opts.add_option(
             '--pre',
             action='store_true',
             default=False,
             help="Include pre-release and development versions. By default, pip only finds stable versions.")
 
-        index_opts = make_option_group(index_group, self.parser)
+        index_opts = cmdoptions.make_option_group(cmdoptions.index_group, self.parser)
 
         self.parser.insert_option_group(0, index_opts)
         self.parser.insert_option_group(0, cmd_opts)
@@ -197,7 +159,8 @@ def _build_package_finder(self, options, index_urls):
         return PackageFinder(find_links=options.find_links,
                              index_urls=index_urls,
                              use_mirrors=options.use_mirrors,
-                             mirrors=options.mirrors)
+                             mirrors=options.mirrors,
+                             use_wheel=options.use_wheel)
 
     def run(self, options, args):
         if options.download_dir:
@@ -210,13 +173,16 @@ def run(self, options, args):
             if virtualenv_no_global():
                 raise InstallationError("Can not perform a '--user' install. User site-packages are not visible in this virtualenv.")
             install_options.append('--user')
+
+        temp_target_dir = None
         if options.target_dir:
             options.ignore_installed = True
             temp_target_dir = tempfile.mkdtemp()
             options.target_dir = os.path.abspath(options.target_dir)
             if os.path.exists(options.target_dir) and not os.path.isdir(options.target_dir):
                 raise CommandError("Target path exists but is not a directory, will not continue.")
             install_options.append('--home=' + temp_target_dir)
+
         global_options = options.global_options or []
         index_urls = [options.index_url] + options.extra_index_urls
         if options.no_index:
@@ -235,7 +201,8 @@ def run(self, options, args):
             ignore_installed=options.ignore_installed,
             ignore_dependencies=options.ignore_dependencies,
             force_reinstall=options.force_reinstall,
-            use_user_site=options.use_user_site)
+            use_user_site=options.use_user_site,
+            target_dir=temp_target_dir)
         for name in args:
             requirement_set.add_requirement(
                 InstallRequirement.from_line(name, None, prereleases=options.pre))