Commit cde65768 authored by Éric Araujo's avatar Éric Araujo

Remove unneeded --all option of “pysetup list”.

The command without arguments already prints all installed distributions
found.

In addition, change “releases” for “projects” in the description of the
list action.  Strictly speaking, one installed distribution satisfies
the requirement for a release (i.e. version) of a project, but as
currently only one release per project can be installed at a time, the
two are somewhat equivalent, and “project” is more understandable in
help texts (which call their argument “dist”, by the way..)
parent fb7d2449
...@@ -19,13 +19,12 @@ Finding out what's installed ...@@ -19,13 +19,12 @@ Finding out what's installed
Pysetup makes it easy to find out what Python packages are installed:: Pysetup makes it easy to find out what Python packages are installed::
$ pysetup search virtualenv $ pysetup list virtualenv
virtualenv 1.6 at /opt/python3.3/lib/python3.3/site-packages/virtualenv-1.6-py3.3.egg-info 'virtualenv' 1.6 at '/opt/python3.3/lib/python3.3/site-packages/virtualenv-1.6-py3.3.egg-info'
$ pysetup search --all $ pysetup list
pyverify 0.8.1 at /opt/python3.3/lib/python3.3/site-packages/pyverify-0.8.1.dist-info 'pyverify' 0.8.1 at '/opt/python3.3/lib/python3.3/site-packages/pyverify-0.8.1.dist-info'
virtualenv 1.6 at /opt/python3.3/lib/python3.3/site-packages/virtualenv-1.6-py3.3.egg-info 'virtualenv' 1.6 at '/opt/python3.3/lib/python3.3/site-packages/virtualenv-1.6-py3.3.egg-info'
wsgiref 0.1.2 at /opt/python3.3/lib/python3.3/wsgiref.egg-info
... ...
...@@ -146,9 +145,11 @@ Getting a list of all pysetup actions and global options:: ...@@ -146,9 +145,11 @@ Getting a list of all pysetup actions and global options::
metadata: Display the metadata of a project metadata: Display the metadata of a project
install: Install a project install: Install a project
remove: Remove a project remove: Remove a project
search: Search for a project search: Search for a project in the indexes
list: List installed projects
graph: Display a graph graph: Display a graph
create: Create a Project create: Create a project
generate-setup: Generate a backward-comptatible setup.py
To get more help on an action, use: To get more help on an action, use:
......
...@@ -290,27 +290,23 @@ def _run(dispatcher, args, **kw): ...@@ -290,27 +290,23 @@ def _run(dispatcher, args, **kw):
@action_help("""\ @action_help("""\
Usage: pysetup list dist [dist ...] Usage: pysetup list [dist ...]
or: pysetup list --help or: pysetup list --help
or: pysetup list --all
Print name, version and location for the matching installed distributions. Print name, version and location for the matching installed distributions.
positional arguments: positional arguments:
dist installed distribution name dist installed distribution name; omit to get all distributions
optional arguments:
--all list all installed distributions
""") """)
def _list(dispatcher, args, **kw): def _list(dispatcher, args, **kw):
opts = _parse_args(args[1:], '', ['all']) opts = _parse_args(args[1:], '', [])
dists = get_distributions(use_egg_info=True) dists = get_distributions(use_egg_info=True)
if 'all' in opts or opts['args'] == []: if opts['args']:
results = dists
listall = True
else:
results = (d for d in dists if d.name.lower() in opts['args']) results = (d for d in dists if d.name.lower() in opts['args'])
listall = False listall = False
else:
results = dists
listall = True
number = 0 number = 0
for dist in results: for dist in results:
...@@ -368,7 +364,7 @@ actions = [ ...@@ -368,7 +364,7 @@ actions = [
('install', 'Install a project', _install), ('install', 'Install a project', _install),
('remove', 'Remove a project', _remove), ('remove', 'Remove a project', _remove),
('search', 'Search for a project in the indexes', _search), ('search', 'Search for a project in the indexes', _search),
('list', 'List installed releases', _list), ('list', 'List installed projects', _list),
('graph', 'Display a graph', _graph), ('graph', 'Display a graph', _graph),
('create', 'Create a project', _create), ('create', 'Create a project', _create),
('generate-setup', 'Generate a backward-comptatible setup.py', _generate), ('generate-setup', 'Generate a backward-comptatible setup.py', _generate),
......
...@@ -35,6 +35,7 @@ class InstallDataTestCase(support.TempdirManager, ...@@ -35,6 +35,7 @@ class InstallDataTestCase(support.TempdirManager,
two = os.path.join(pkg_dir, 'two') two = os.path.join(pkg_dir, 'two')
self.write_file(two, 'xxx') self.write_file(two, 'xxx')
# FIXME this creates a literal \{inst2\} directory!
cmd.data_files = {one: '{inst}/one', two: '{inst2}/two'} cmd.data_files = {one: '{inst}/one', two: '{inst2}/two'}
self.assertCountEqual(cmd.get_inputs(), [one, two]) self.assertCountEqual(cmd.get_inputs(), [one, two])
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment