Hello community, here is the log from the commit of package python-cliff for openSUSE:Factory checked in at 2015-03-11 09:58:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-cliff (Old) and /work/SRC/openSUSE:Factory/.python-cliff.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-cliff" Changes: -------- --- /work/SRC/openSUSE:Factory/python-cliff/python-cliff.changes 2015-01-09 20:50:36.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python-cliff.new/python-cliff.changes 2015-03-11 09:58:41.000000000 +0100 @@ -1,0 +2,15 @@ +Tue Mar 10 08:52:12 UTC 2015 - [email protected] + +- update to 1.10.1: + * Document print_help_if_requested method + * Allow to call initialize_app when running --help + * Hide prompt in batch/pipe mode + * Correct completion in interactive mode + * Fix pep8 tests for lambda + * Updated from global requirements + * Fix git repo urls in tox.ini + * Add deprecated attribute to commands + * Workflow documentation is now in infra-manual +- Adjust Requires according to requirements.txt + +------------------------------------------------------------------- Old: ---- cliff-1.9.0.tar.gz New: ---- cliff-1.10.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-cliff.spec ++++++ --- /var/tmp/diff_new_pack.1eU1Bx/_old 2015-03-11 09:58:42.000000000 +0100 +++ /var/tmp/diff_new_pack.1eU1Bx/_new 2015-03-11 09:58:42.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package python-cliff # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: python-cliff -Version: 1.9.0 +Version: 1.10.1 Release: 0 Url: https://github.com/dreamhost/cliff Summary: Command Line Interface Formulation Framework @@ -47,7 +47,7 @@ %endif Requires: python-cmd2 >= 0.6.7 Requires: python-pyparsing >= 2.0.1 -Requires: python-six >= 1.7.0 +Requires: python-six >= 1.9.0 Requires: python-stevedore >= 1.1.0 %if 0%{?suse_version} && 0%{?suse_version} <= 1110 %{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} ++++++ cliff-1.9.0.tar.gz -> cliff-1.10.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cliff-1.9.0/AUTHORS new/cliff-1.10.1/AUTHORS --- old/cliff-1.9.0/AUTHORS 2014-12-02 17:18:43.000000000 +0100 +++ new/cliff-1.10.1/AUTHORS 2015-03-09 14:58:50.000000000 +0100 @@ -1,4 +1,5 @@ Andrea Frittoli <[email protected]> +Cedric Brandily <[email protected]> ChangBo Guo(gcb) <[email protected]> Christian Berendt <[email protected]> Christophe CHAUVET <[email protected]> @@ -24,6 +25,7 @@ Ryan Petrello <[email protected]> Sascha Peilicke <[email protected]> Terry Howe <[email protected]> +TerryHowe <[email protected]> Tomaz Muraus <[email protected]> Yalei Wang <[email protected]> heavenshell <[email protected]> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cliff-1.9.0/CONTRIBUTING.rst new/cliff-1.10.1/CONTRIBUTING.rst --- old/cliff-1.9.0/CONTRIBUTING.rst 2014-12-02 17:18:15.000000000 +0100 +++ new/cliff-1.10.1/CONTRIBUTING.rst 2015-03-09 14:58:33.000000000 +0100 @@ -1,7 +1,7 @@ Changes to cliff should be submitted for review via the Gerrit tool, following the workflow documented at: - http://wiki.openstack.org/GerritWorkflow + http://docs.openstack.org/infra/manual/developers.html#development-workflow Pull requests submitted through GitHub will be ignored. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cliff-1.9.0/ChangeLog new/cliff-1.10.1/ChangeLog --- old/cliff-1.9.0/ChangeLog 2014-12-02 17:18:43.000000000 +0100 +++ new/cliff-1.10.1/ChangeLog 2015-03-09 14:58:50.000000000 +0100 @@ -1,6 +1,23 @@ CHANGES ======= +1.10.1 +------ + +* Document print_help_if_requested method + +1.10.0 +------ + +* Allow to call initialize_app when running --help +* Hide prompt in batch/pipe mode +* Correct completion in interactive mode +* Fix pep8 tests for lambda +* Updated from global requirements +* Fix git repo urls in tox.ini +* Add deprecated attribute to commands +* Workflow documentation is now in infra-manual + 1.9.0 ----- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cliff-1.9.0/PKG-INFO new/cliff-1.10.1/PKG-INFO --- old/cliff-1.9.0/PKG-INFO 2014-12-02 17:18:43.000000000 +0100 +++ new/cliff-1.10.1/PKG-INFO 2015-03-09 14:58:50.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: cliff -Version: 1.9.0 +Version: 1.10.1 Summary: Command Line Interface Formulation Framework Home-page: https://launchpad.net/python-cliff Author: Doug Hellmann diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cliff-1.9.0/cliff/app.py new/cliff-1.10.1/cliff/app.py --- old/cliff-1.9.0/cliff/app.py 2014-12-02 17:18:15.000000000 +0100 +++ new/cliff-1.10.1/cliff/app.py 2015-03-09 14:58:33.000000000 +0100 @@ -64,7 +64,8 @@ def __init__(self, description, version, command_manager, stdin=None, stdout=None, stderr=None, - interactive_app_factory=InteractiveApp): + interactive_app_factory=InteractiveApp, + deferred_help=False): """Initialize the application. """ self.command_manager = command_manager @@ -72,6 +73,7 @@ self.command_manager.add_command('complete', CompleteCommand) self._set_streams(stdin, stdout, stderr) self.interactive_app_factory = interactive_app_factory + self.deferred_help = deferred_help self.parser = self.build_option_parser(description, version) self.interactive_mode = False self.interpreter = None @@ -86,10 +88,9 @@ # works around a problem with Python 2.6 fixed in 2.7 and # later (http://hg.python.org/cpython/rev/e60ef17561dc/). lang, encoding = locale.getdefaultlocale() - encoding = (getattr(sys.stdout, 'encoding', None) - or encoding - or self.DEFAULT_OUTPUT_ENCODING - ) + encoding = (getattr(sys.stdout, 'encoding', None) or + encoding or + self.DEFAULT_OUTPUT_ENCODING) self.stdin = stdin or codecs.getreader(encoding)(sys.stdin) self.stdout = stdout or codecs.getwriter(encoding)(sys.stdout) self.stderr = stderr or codecs.getwriter(encoding)(sys.stderr) @@ -144,13 +145,21 @@ const=0, help='suppress output except warnings and errors', ) - parser.add_argument( - '-h', '--help', - action=HelpAction, - nargs=0, - default=self, # tricky - help="show this help message and exit", - ) + if self.deferred_help: + parser.add_argument( + '-h', '--help', + dest='deferred_help', + action='store_true', + help="show this help message and exit", + ) + else: + parser.add_argument( + '-h', '--help', + action=HelpAction, + nargs=0, + default=self, # tricky + help="show this help message and exit", + ) parser.add_argument( '--debug', default=False, @@ -186,6 +195,19 @@ root_logger.addHandler(console) return + def print_help_if_requested(self): + """Print help and exits if deferred help is enabled and requested. + + '--help' shows the help message and exits: + * without calling initialize_app if not self.deferred_help (default), + * after initialize_app call if self.deferred_help, + * during initialize_app call if self.deferred_help and subclass calls + explicitly this method in initialize_app. + """ + if self.deferred_help and self.options.deferred_help: + action = HelpAction(None, None, default=self) + action(self.parser, self.parser, None, None) + def run(self, argv): """Equivalent to the main program for the application. @@ -197,6 +219,7 @@ self.configure_logging() self.interactive_mode = not remainder self.initialize_app(remainder) + self.print_help_if_requested() except Exception as err: if hasattr(self, 'options'): debug = self.options.debug diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cliff-1.9.0/cliff/command.py new/cliff-1.10.1/cliff/command.py --- old/cliff-1.9.0/cliff/command.py 2014-12-02 17:18:15.000000000 +0100 +++ new/cliff-1.10.1/cliff/command.py 2015-03-09 14:58:33.000000000 +0100 @@ -13,6 +13,9 @@ :param app: Application instance invoking the command. :paramtype app: cliff.app.App """ + + deprecated = False + def __init__(self, app, app_args): self.app = app self.app_args = app_args diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cliff-1.9.0/cliff/help.py new/cliff-1.10.1/cliff/help.py --- old/cliff-1.9.0/cliff/help.py 2014-12-02 17:18:15.000000000 +0100 +++ new/cliff-1.10.1/cliff/help.py 2015-03-09 14:58:33.000000000 +0100 @@ -27,6 +27,8 @@ continue try: cmd = factory(app, None) + if cmd.deprecated: + continue except Exception as err: app.stdout.write('Could not instantiate %r: %s\n' % (ep, err)) if namespace.debug: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cliff-1.9.0/cliff/interactive.py new/cliff-1.10.1/cliff/interactive.py --- old/cliff-1.9.0/cliff/interactive.py 2014-12-02 17:18:15.000000000 +0100 +++ new/cliff-1.10.1/cliff/interactive.py 2015-03-09 14:58:33.000000000 +0100 @@ -5,6 +5,7 @@ import logging import logging.handlers import shlex +import sys import cmd2 @@ -34,7 +35,11 @@ def __init__(self, parent_app, command_manager, stdin, stdout): self.parent_app = parent_app - self.prompt = '(%s) ' % parent_app.NAME + if not hasattr(sys.stdin, 'isatty') or sys.stdin.isatty(): + self.prompt = '(%s) ' % parent_app.NAME + else: + # batch/pipe mode + self.prompt = '' self.command_manager = command_manager cmd2.Cmd.__init__(self, 'tab', stdin=stdin, stdout=stdout) @@ -47,17 +52,33 @@ line_parts = shlex.split(line.parsed.raw) self.parent_app.run_subcommand(line_parts) - def completedefault(self, text, line, begidx, endidx): - # Tab-completion for commands known to the command manager. - # Does not handle options on the commands. - if not text: - completions = sorted(n for n, v in self.command_manager) - else: - completions = sorted(n for n, v in self.command_manager - if n.startswith(text) - ) + def completenames(self, text, *ignored): + """Tab-completion for command prefix without completer delimiter. + + This method returns cmd style and cliff style commands matching + provided command prefix (text). + """ + completions = cmd2.Cmd.completenames(self, text, *ignored) + completions += self._complete_prefix(text) return completions + def completedefault(self, text, line, begidx, endidx): + """Default tab-completion for command prefix with completer delimiter. + + This method filters only cliff style commands matching provided + command prefix (line) as cmd2 style commands cannot contain spaces. + This method returns text + missing command part of matching commands. + This method does not handle options in cmd2/cliff style commands, you + must define complete_$method to handle them. + """ + return [x[begidx:] for x in self._complete_prefix(line)] + + def _complete_prefix(self, prefix): + """Returns cliff style commands with a specific prefix.""" + if not prefix: + return [n for n, v in self.command_manager] + return [n for n, v in self.command_manager if n.startswith(prefix)] + def help_help(self): # Use the command manager to get instructions for "help" self.default('help help') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cliff-1.9.0/cliff/tests/test_app.py new/cliff-1.10.1/cliff/tests/test_app.py --- old/cliff-1.9.0/cliff/tests/test_app.py 2014-12-02 17:18:15.000000000 +0100 +++ new/cliff-1.10.1/cliff/tests/test_app.py 2015-03-09 14:58:33.000000000 +0100 @@ -15,7 +15,7 @@ from cliff.commandmanager import CommandManager -def make_app(): +def make_app(**kwargs): cmd_mgr = CommandManager('cliff.tests') # Register a command that succeeds @@ -38,6 +38,7 @@ '1', cmd_mgr, stderr=mock.Mock(), # suppress warning messages + **kwargs ) return app, command @@ -254,7 +255,8 @@ ) stdout = StringIO() - getdefaultlocale = lambda: ('ignored', 'utf-8') + + getdefaultlocale = mock.Mock(return_value=('ignored', 'utf-8')) with mock.patch('sys.stdout', stdout): with mock.patch('locale.getdefaultlocale', getdefaultlocale): @@ -281,7 +283,7 @@ ) stdout = StringIO() - getdefaultlocale = lambda: ('ignored', None) + getdefaultlocale = mock.Mock(return_value=('ignored', None)) with mock.patch('sys.stdout', stdout): with mock.patch('locale.getdefaultlocale', getdefaultlocale): @@ -309,7 +311,7 @@ stdout = StringIO() stdout.encoding = 'utf-8' - getdefaultlocale = lambda: ('ignored', 'utf-16') + getdefaultlocale = mock.Mock(return_value=('ignored', 'utf-16')) with mock.patch('sys.stdout', stdout): with mock.patch('locale.getdefaultlocale', getdefaultlocale): @@ -336,7 +338,7 @@ ) stderr = StringIO() - getdefaultlocale = lambda: ('ignored', 'utf-8') + getdefaultlocale = mock.Mock(return_value=('ignored', 'utf-8')) with mock.patch('sys.stderr', stderr): with mock.patch('locale.getdefaultlocale', getdefaultlocale): @@ -365,7 +367,7 @@ stdout = StringIO() stdout.encoding = 'utf-8' stderr = StringIO() - getdefaultlocale = lambda: ('ignored', 'utf-16') + getdefaultlocale = mock.Mock(return_value=('ignored', 'utf-16')) with mock.patch('sys.stdout', stdout): with mock.patch('sys.stderr', stderr): @@ -376,6 +378,29 @@ assert data == actual +def _test_help(deferred_help): + app, _ = make_app(deferred_help=deferred_help) + with mock.patch.object(app, 'initialize_app') as init: + with mock.patch('cliff.help.HelpAction.__call__', + side_effect=SystemExit(0)) as helper: + try: + app.run(['--help']) + except SystemExit: + pass + else: + raise Exception('Exception was not thrown') + assert helper.called + assert init.called == deferred_help + + +def test_help(): + _test_help(False) + + +def test_deferred_help(): + _test_help(True) + + def test_unknown_cmd(): app, command = make_app() assert app.run(['hell']) == 2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cliff-1.9.0/cliff/tests/test_help.py new/cliff-1.10.1/cliff/tests/test_help.py --- old/cliff-1.9.0/cliff/tests/test_help.py 2014-12-02 17:18:15.000000000 +0100 +++ new/cliff-1.10.1/cliff/tests/test_help.py 2015-03-09 14:58:33.000000000 +0100 @@ -91,3 +91,22 @@ pass help_text = stdout.getvalue() assert 'usage: test help [-h]' in help_text + + +def test_list_deprecated_commands(): + # FIXME(dhellmann): Are commands tied too closely to the app? Or + # do commands know too much about apps by using them to get to the + # command manager? + stdout = StringIO() + app = App('testing', '1', + utils.TestCommandManager(utils.TEST_NAMESPACE), + stdout=stdout) + app.NAME = 'test' + try: + app.run(['--help']) + except SystemExit: + pass + help_output = stdout.getvalue() + assert 'two words' in help_output + assert 'three word command' in help_output + assert 'old cmd' not in help_output diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cliff-1.9.0/cliff/tests/test_interactive.py new/cliff-1.10.1/cliff/tests/test_interactive.py --- old/cliff-1.9.0/cliff/tests/test_interactive.py 1970-01-01 01:00:00.000000000 +0100 +++ new/cliff-1.10.1/cliff/tests/test_interactive.py 2015-03-09 14:58:33.000000000 +0100 @@ -0,0 +1,62 @@ +# -*- encoding: utf-8 -*- + +from cliff.interactive import InteractiveApp + + +class FakeApp(object): + NAME = 'Fake' + + +def make_interactive_app(*command_names): + fake_command_manager = [(x, None) for x in command_names] + return InteractiveApp(FakeApp, fake_command_manager, + stdin=None, stdout=None) + + +def _test_completenames(expecteds, prefix): + app = make_interactive_app('hips', 'hippo', 'nonmatching') + assert set(app.completenames(prefix)) == set(expecteds) + + +def test_cmd2_completenames(): + # cmd2.Cmd define do_help method + _test_completenames(['help'], 'he') + + +def test_cliff_completenames(): + _test_completenames(['hips', 'hippo'], 'hip') + + +def test_no_completenames(): + _test_completenames([], 'taz') + + +def test_both_completenames(): + # cmd2.Cmd define do_hi and do_history methods + _test_completenames(['hi', 'history', 'hips', 'hippo'], 'hi') + + +def _test_completedefault(expecteds, line, begidx): + command_names = set(['show file', 'show folder', 'show long', 'list all']) + app = make_interactive_app(*command_names) + observeds = app.completedefault(None, line, begidx, None) + assert set(observeds) == set(expecteds) + assert set([line[:begidx] + x for x in observeds]) <= command_names + + +def test_empty_text_completedefault(): + # line = 'show ' + begidx = 5 implies text = '' + _test_completedefault(['file', 'folder', ' long'], 'show ', 5) + + +def test_nonempty_text_completedefault2(): + # line = 'show f' + begidx = 6 implies text = 'f' + _test_completedefault(['file', 'folder'], 'show f', 5) + + +def test_long_completedefault(): + _test_completedefault(['long'], 'show ', 6) + + +def test_no_completedefault(): + _test_completedefault([], 'taz ', 4) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cliff-1.9.0/cliff/tests/utils.py new/cliff-1.10.1/cliff/tests/utils.py --- old/cliff-1.9.0/cliff/tests/utils.py 2014-12-02 17:18:15.000000000 +0100 +++ new/cliff-1.10.1/cliff/tests/utils.py 2015-03-09 14:58:33.000000000 +0100 @@ -22,9 +22,15 @@ return +class TestDeprecatedCommand(TestCommand): + + deprecated = True + + class TestCommandManager(CommandManager): def load_commands(self, namespace): if namespace == TEST_NAMESPACE: for key in ('one', 'two words', 'three word command'): self.add_command(key, TestCommand) + self.add_command('old cmd', TestDeprecatedCommand) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cliff-1.9.0/cliff.egg-info/PKG-INFO new/cliff-1.10.1/cliff.egg-info/PKG-INFO --- old/cliff-1.9.0/cliff.egg-info/PKG-INFO 2014-12-02 17:18:43.000000000 +0100 +++ new/cliff-1.10.1/cliff.egg-info/PKG-INFO 2015-03-09 14:58:50.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: cliff -Version: 1.9.0 +Version: 1.10.1 Summary: Command Line Interface Formulation Framework Home-page: https://launchpad.net/python-cliff Author: Doug Hellmann diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cliff-1.9.0/cliff.egg-info/SOURCES.txt new/cliff-1.10.1/cliff.egg-info/SOURCES.txt --- old/cliff-1.9.0/cliff.egg-info/SOURCES.txt 2014-12-02 17:18:43.000000000 +0100 +++ new/cliff-1.10.1/cliff.egg-info/SOURCES.txt 2015-03-09 14:58:50.000000000 +0100 @@ -28,6 +28,7 @@ cliff.egg-info/dependency_links.txt cliff.egg-info/entry_points.txt cliff.egg-info/not-zip-safe +cliff.egg-info/pbr.json cliff.egg-info/requires.txt cliff.egg-info/top_level.txt cliff/formatters/__init__.py @@ -44,6 +45,7 @@ cliff/tests/test_formatters_shell.py cliff/tests/test_formatters_value.py cliff/tests/test_help.py +cliff/tests/test_interactive.py cliff/tests/test_lister.py cliff/tests/test_show.py cliff/tests/utils.py diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cliff-1.9.0/cliff.egg-info/pbr.json new/cliff-1.10.1/cliff.egg-info/pbr.json --- old/cliff-1.9.0/cliff.egg-info/pbr.json 1970-01-01 01:00:00.000000000 +0100 +++ new/cliff-1.10.1/cliff.egg-info/pbr.json 2015-03-09 14:58:50.000000000 +0100 @@ -0,0 +1 @@ +{"git_version": "b703ad3", "is_release": true} \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cliff-1.9.0/cliff.egg-info/requires.txt new/cliff-1.10.1/cliff.egg-info/requires.txt --- old/cliff-1.9.0/cliff.egg-info/requires.txt 2014-12-02 17:18:43.000000000 +0100 +++ new/cliff-1.10.1/cliff.egg-info/requires.txt 2015-03-09 14:58:50.000000000 +0100 @@ -3,5 +3,5 @@ cmd2>=0.6.7 PrettyTable>=0.7,<0.8 pyparsing>=2.0.1 -six>=1.7.0 -stevedore>=1.1.0 # Apache-2.0 \ No newline at end of file +six>=1.9.0 +stevedore>=1.1.0 # Apache-2.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cliff-1.9.0/doc/source/developers.rst new/cliff-1.10.1/doc/source/developers.rst --- old/cliff-1.9.0/doc/source/developers.rst 2014-12-02 17:18:15.000000000 +0100 +++ new/cliff-1.10.1/doc/source/developers.rst 2015-03-09 14:58:33.000000000 +0100 @@ -10,7 +10,7 @@ Changes to cliff should be submitted for review via the Gerrit tool, following the workflow documented at -http://wiki.openstack.org/GerritWorkflow +http://docs.openstack.org/infra/manual/developers.html#development-workflow Pull requests submitted through GitHub will be ignored. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cliff-1.9.0/requirements.txt new/cliff-1.10.1/requirements.txt --- old/cliff-1.9.0/requirements.txt 2014-12-02 17:18:15.000000000 +0100 +++ new/cliff-1.10.1/requirements.txt 2015-03-09 14:58:33.000000000 +0100 @@ -6,5 +6,5 @@ cmd2>=0.6.7 PrettyTable>=0.7,<0.8 pyparsing>=2.0.1 -six>=1.7.0 +six>=1.9.0 stevedore>=1.1.0 # Apache-2.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cliff-1.9.0/tox.ini new/cliff-1.10.1/tox.ini --- old/cliff-1.9.0/tox.ini 2014-12-02 17:18:15.000000000 +0100 +++ new/cliff-1.10.1/tox.ini 2015-03-09 14:58:33.000000000 +0100 @@ -1,8 +1,9 @@ [tox] -envlist = py33,py34,py26,py27,pypy,pep8 +envlist = py34,py26,py27,pypy,pep8 [testenv] distribute = False +install_command = pip install -U {opts} {packages} commands = nosetests -d --with-coverage --cover-inclusive --cover-package cliff [] deps = -r{toxinidir}/requirements.txt @@ -24,7 +25,7 @@ [testenv:neutronclient-tip] basepython = python2.7 -deps = -egit+http://git.openstack.org/cgit/openstack/python-neutronclient#egg=neutronclient +deps = -egit+https://git.openstack.org/openstack/python-neutronclient#egg=neutronclient commands = {toxinidir}/integration-tests/neutronclient-tip.sh {envdir} [testenv:openstackclient-stable] @@ -33,9 +34,8 @@ [testenv:openstackclient-tip] basepython = python2.7 -deps = -egit+http://git.openstack.org/cgit/openstack/python-openstackclient#egg=openstackclient +deps = -egit+https://git.openstack.org/openstack/python-openstackclient#egg=openstackclient commands = {toxinidir}/integration-tests/openstackclient-tip.sh {envdir} [testenv:docs] commands = python setup.py build_sphinx - -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
