Psyko-rebased branch feature/freeze-subset-recursively on top of develop.

Author: benoitbryon

pip/commands/freeze.py

@@ -10,9 +10,10 @@
 from pip.compat import stdlib_pkgs
 from pip.req import InstallRequirement
 from pip.basecommand import Command
-from pip.utils import get_installed_distributions
+from pip.utils import get_installed_distributions, get_recursive_dependencies
 from pip._vendor import pkg_resources
 
+
 # packages to exclude from freeze output
 freeze_excludes = stdlib_pkgs + ['setuptools', 'pip', 'distribute']
 
@@ -28,7 +29,7 @@ class FreezeCommand(Command):
     """
     name = 'freeze'
     usage = """
-      %prog [options]"""
+      %prog [options] [PACKAGE PACKAGE...]"""
     summary = 'Output installed packages in requirements format.'
     log_stream = "ext://sys.stderr"
 
@@ -95,6 +96,13 @@ def run(self, options, args):
         for link in find_links:
             f.write('-f %s\n' % link)
         installations = {}
+
+        only_dists = []
+        if args:
+            only_dists = args
+            only_dists.extend(get_recursive_dependencies(*only_dists))
+            only_dists = [name.lower() for name in only_dists]
+
         for dist in get_installed_distributions(local_only=local_only,
                                                 skip=freeze_excludes,
                                                 user_only=user_only):

pip/commands/show.py

@@ -4,6 +4,7 @@
 import os
 
 from pip.basecommand import Command
+from pip.utils import get_recursive_dependencies
 from pip._vendor import pkg_resources
 
 
@@ -85,6 +86,8 @@ def print_results(distributions, list_all_files):
         logger.info("Version: %s" % dist['version'])
         logger.info("Location: %s" % dist['location'])
         logger.info("Requires: %s" % ', '.join(dist['requires']))
+        logger.info("Requires recursive: %s" % ', '.join(
+            get_recursive_dependencies(dist['name'])))
         if list_all_files:
             logger.info("Files:")
             if dist['files'] is not None:

pip/utils/__init__.py

@@ -424,6 +424,25 @@ def get_installed_distributions(local_only=True,
             ]
 
 
+def get_recursive_dependencies(*names):
+    """Return set of dependencies of dists in ``names``, recursively."""
+    dependencies = set()
+    installed = dict(
+        [(p.project_name.lower(), p) for p in pkg_resources.working_set])
+    query_names = [name.lower() for name in names]
+    for pkg in query_names:
+        try:
+            dist = installed[pkg]
+        except KeyError:
+            pass  # pkg is not installed.
+        else:
+            for dep in dist.requires():
+                name = dep.project_name
+                dependencies.add(name)
+                dependencies.update(get_recursive_dependencies(name))
+    return dependencies
+
+
 def egg_link_path(dist):
     """
     Return the path for the .egg-link file if it exists, otherwise, None.

tests/functional/test_show.py

@@ -9,12 +9,13 @@ def test_show(script):
     """
     result = script.pip('show', 'pip')
     lines = result.stdout.split('\n')
-    assert len(lines) == 6
+    assert len(lines) == 7
     assert lines[0] == '---', lines[0]
     assert lines[1] == 'Name: pip', lines[1]
     assert lines[2] == 'Version: %s' % __version__, lines[2]
     assert lines[3].startswith('Location: '), lines[3]
     assert lines[4] == 'Requires: '
+    assert lines[5] == 'Requires recursive: '
 
 
 def test_show_with_files_not_found(script, data):
@@ -26,14 +27,15 @@ def test_show_with_files_not_found(script, data):
     script.pip('install', '-e', editable)
     result = script.pip('show', '-f', 'SetupPyUTF8')
     lines = result.stdout.split('\n')
-    assert len(lines) == 8
+    assert len(lines) == 9
     assert lines[0] == '---', lines[0]
     assert lines[1] == 'Name: SetupPyUTF8', lines[1]
     assert lines[2] == 'Version: 0.0.0', lines[2]
     assert lines[3].startswith('Location: '), lines[3]
     assert lines[4] == 'Requires: ', lines[4]
-    assert lines[5] == 'Files:', lines[5]
-    assert lines[6] == 'Cannot locate installed-files.txt', lines[6]
+    assert lines[5] == 'Requires recursive: ', lines[5]
+    assert lines[6] == 'Files:', lines[6]
+    assert lines[7] == 'Cannot locate installed-files.txt', lines[7]
 
 
 def test_show_with_files_from_wheel(script, data):