Hello community, here is the log from the commit of package python-cliff for openSUSE:Factory checked in at 2020-02-18 10:34:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-cliff (Old) and /work/SRC/openSUSE:Factory/.python-cliff.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-cliff" Tue Feb 18 10:34:42 2020 rev:35 rq:774899 version:2.16.0 Changes: -------- --- /work/SRC/openSUSE:Factory/python-cliff/python-cliff.changes 2019-04-12 09:13:28.961643248 +0200 +++ /work/SRC/openSUSE:Factory/.python-cliff.new.26092/python-cliff.changes 2020-02-18 10:34:46.940256126 +0100 @@ -1,0 +2,15 @@ +Fri Dec 20 07:49:59 UTC 2019 - [email protected] + +- update to version 2.16.0 + - Dropping the py35 testing + - add python 3.7 unit test job + - Remove dead files + - OpenDev Migration Patch + - Updates for OpenDev transition + - Change openstack-dev to openstack-discuss + - Pin cmd2 back to <0.9 on all versions + - add argparse conflict handler "ignore" + - Missing carriage return in some cases, using -f json + - Add Python 3 Train unit tests + +------------------------------------------------------------------- Old: ---- cliff-2.14.1.tar.gz New: ---- cliff-2.16.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-cliff.spec ++++++ --- /var/tmp/diff_new_pack.Yh763y/_old 2020-02-18 10:34:47.420257105 +0100 +++ /var/tmp/diff_new_pack.Yh763y/_new 2020-02-18 10:34:47.424257114 +0100 @@ -1,7 +1,7 @@ # # spec file for package python-cliff # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,34 +17,37 @@ Name: python-cliff -Version: 2.14.1 +Version: 2.16.0 Release: 0 Summary: Command Line Interface Formulation Framework License: Apache-2.0 Group: Development/Languages/Python URL: https://launchpad.net/python-cliff -Source0: https://files.pythonhosted.org/packages/source/c/cliff/cliff-2.14.1.tar.gz +Source0: https://files.pythonhosted.org/packages/source/c/cliff/cliff-2.16.0.tar.gz BuildRequires: openstack-macros BuildRequires: python2-PrettyTable BuildRequires: python2-PyYAML BuildRequires: python2-cmd2 +BuildRequires: python2-docutils BuildRequires: python2-mock BuildRequires: python2-pbr BuildRequires: python2-python-subunit BuildRequires: python2-setuptools +BuildRequires: python2-stestr BuildRequires: python2-stevedore -BuildRequires: python2-testrepository BuildRequires: python2-testscenarios BuildRequires: python2-testtools BuildRequires: python2-unicodecsv BuildRequires: python3-PrettyTable BuildRequires: python3-PyYAML +BuildRequires: python3-cmd2 +BuildRequires: python3-docutils BuildRequires: python3-mock BuildRequires: python3-pbr BuildRequires: python3-python-subunit BuildRequires: python3-setuptools +BuildRequires: python3-stestr BuildRequires: python3-stevedore -BuildRequires: python3-testrepository BuildRequires: python3-testscenarios BuildRequires: python3-testtools Requires: python-PrettyTable @@ -67,7 +70,8 @@ %package -n python-cliff-doc Summary: %{summary} - Documentation Group: Documentation/HTML -BuildRequires: python2-Sphinx +BuildRequires: python3-Sphinx +BuildRequires: python3-openstackdocstheme Provides: %{python_module cliff-doc = %{version}} %description -n python-cliff-doc @@ -78,22 +82,20 @@ This package contains documentation files for %{name}. %prep -%autosetup -p1 -n cliff-2.14.1 +%autosetup -p1 -n cliff-2.16.0 %py_req_cleanup %build %python_build -%{__python2} setup.py build_sphinx +PBR_VERSION=2.16.0 PYTHONPATH=. %sphinx_build -b html doc/source doc/build/html rm -rf doc/build/html/.{doctrees,buildinfo} %install %python_install %check -%{python_expand rm -rf .testrepository -$python setup.py test -} +%python_exec -m stestr.cli run %files %{python_files} %license LICENSE ++++++ _service ++++++ --- /var/tmp/diff_new_pack.Yh763y/_old 2020-02-18 10:34:47.452257171 +0100 +++ /var/tmp/diff_new_pack.Yh763y/_new 2020-02-18 10:34:47.452257171 +0100 @@ -1,6 +1,6 @@ <services> <service mode="disabled" name="renderspec"> - <param name="input-template">https://raw.githubusercontent.com/openstack/rpm-packaging/stable/stein/openstack/cliff/cliff.spec.j2</param> + <param name="input-template">https://raw.githubusercontent.com/openstack/rpm-packaging/stable/train/openstack/cliff/cliff.spec.j2</param> <param name="output-name">python-cliff.spec</param> <param name="changelog-email">[email protected]</param> <param name="changelog-provider">gh,openstack,cliff</param> ++++++ cliff-2.14.1.tar.gz -> cliff-2.16.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cliff-2.14.1/.zuul.yaml new/cliff-2.16.0/.zuul.yaml --- old/cliff-2.14.1/.zuul.yaml 2019-03-08 00:56:59.000000000 +0100 +++ new/cliff-2.16.0/.zuul.yaml 2019-09-06 23:28:03.000000000 +0200 @@ -17,7 +17,7 @@ vars: # Set work dir to neutronclient so that if it's triggered by one of the # other repos the tests will run in the same place - zuul_work_dir: src/git.openstack.org/openstack/python-neutronclient + zuul_work_dir: src/opendev.org/openstack/python-neutronclient - project: templates: @@ -26,8 +26,7 @@ - lib-forward-testing-python3 - openstack-lower-constraints-jobs - openstack-python-jobs - - openstack-python35-jobs - - openstack-python36-jobs + - openstack-python3-train-jobs - publish-openstack-docs-pti check: jobs: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cliff-2.14.1/AUTHORS new/cliff-2.16.0/AUTHORS --- old/cliff-2.14.1/AUTHORS 2019-03-08 01:00:05.000000000 +0100 +++ new/cliff-2.16.0/AUTHORS 2019-09-06 23:29:02.000000000 +0200 @@ -25,6 +25,7 @@ Eyal Posener <[email protected]> Feodor Tersin <[email protected]> Flavio Percoco <[email protected]> +Ghanshyam Mann <[email protected]> Hongbin Lu <[email protected]> Ilya Shakhat <[email protected]> James Downs <[email protected]> @@ -76,7 +77,9 @@ Vincent Legoll <[email protected]> Vitalii Kulanov <[email protected]> Yalei Wang <[email protected]> +Yossi Ovadia <[email protected]> Yushiro FURUKAWA <[email protected]> +ZhongShengping <[email protected]> caoyue <[email protected]> dineshbhor <[email protected]> gcmalloc <[email protected]> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cliff-2.14.1/ChangeLog new/cliff-2.16.0/ChangeLog --- old/cliff-2.14.1/ChangeLog 2019-03-08 01:00:05.000000000 +0100 +++ new/cliff-2.16.0/ChangeLog 2019-09-06 23:29:02.000000000 +0200 @@ -1,16 +1,33 @@ CHANGES ======= +2.16.0 +------ + +* Pin cmd2 back to <0.9 on all versions +* Add Python 3 Train unit tests + +2.15.0 +------ + +* Dropping the py35 testing +* Updates for OpenDev transition +* OpenDev Migration Patch +* add python 3.7 unit test job +* Missing carriage return in some cases, using -f json + 2.14.1 ------ * Use template for lower-constraints +* Change openstack-dev to openstack-discuss 2.14.0 ------ * Don't try to run issubclass on non-classes * Removed unused err variable +* Remove dead files * add lib-forward-testing-python3 test job * add python 3.6 unit test job * switch documentation job to new PTI @@ -40,6 +57,7 @@ * Remove the warning of getargspec removal * Align parsed() call with cmd2 versions >= 0.7.3 * Fix cmd2 doc URL +* add argparse conflict handler "ignore" * sphinxext: Warn if namespace or command pattern invalid * Zuul: Remove project name * Updated from global requirements diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cliff-2.14.1/MANIFEST.in new/cliff-2.16.0/MANIFEST.in --- old/cliff-2.14.1/MANIFEST.in 2019-03-08 00:56:59.000000000 +0100 +++ new/cliff-2.16.0/MANIFEST.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,6 +0,0 @@ -include setup.py -recursive-include docs *.rst *.py *.html *.css *.js *.png *.txt -recursive-include demoapp *.py -recursive-include tests *.py -include tox.ini - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cliff-2.14.1/Makefile new/cliff-2.16.0/Makefile --- old/cliff-2.14.1/Makefile 2019-03-08 00:56:59.000000000 +0100 +++ new/cliff-2.16.0/Makefile 1970-01-01 01:00:00.000000000 +0100 @@ -1,21 +0,0 @@ -help: - @echo "release - package and upload a release" - @echo "sdist - package" - @echo "docs - generate HTML documentation" - @echo "clean - remove build artifacts" - -release: docs - rm -rf dist build - python setup.py sdist upload - -sdist: docs - python setup.py sdist - ls -l dist - -clean: - rm -rf dist build *.egg-info - (cd doc && make clean) - -.PHONY: docs -docs: - (cd doc && make clean html) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cliff-2.14.1/PKG-INFO new/cliff-2.16.0/PKG-INFO --- old/cliff-2.14.1/PKG-INFO 2019-03-08 01:00:05.000000000 +0100 +++ new/cliff-2.16.0/PKG-INFO 2019-09-06 23:29:02.000000000 +0200 @@ -1,10 +1,10 @@ Metadata-Version: 1.1 Name: cliff -Version: 2.14.1 +Version: 2.16.0 Summary: Command Line Interface Formulation Framework Home-page: https://docs.openstack.org/cliff/latest/ Author: OpenStack -Author-email: [email protected] +Author-email: [email protected] License: UNKNOWN Description: ======================== Team and repository tags @@ -27,7 +27,7 @@ * Free software: Apache license * Documentation: https://docs.openstack.org/cliff/latest/ - * Source: https://git.openstack.org/cgit/openstack/cliff + * Source: https://opendev.org/openstack/cliff * Bugs: https://bugs.launchpad.net/python-cliff @@ -38,6 +38,7 @@ Classifier: Programming Language :: Python :: 2 Classifier: Programming Language :: Python :: 2.7 Classifier: Programming Language :: Python :: 3 -Classifier: Programming Language :: Python :: 3.5 +Classifier: Programming Language :: Python :: 3.6 +Classifier: Programming Language :: Python :: 3.7 Classifier: Intended Audience :: Developers Classifier: Environment :: Console diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cliff-2.14.1/README.rst new/cliff-2.16.0/README.rst --- old/cliff-2.14.1/README.rst 2019-03-08 00:56:59.000000000 +0100 +++ new/cliff-2.16.0/README.rst 2019-09-06 23:28:03.000000000 +0200 @@ -19,5 +19,5 @@ * Free software: Apache license * Documentation: https://docs.openstack.org/cliff/latest/ -* Source: https://git.openstack.org/cgit/openstack/cliff +* Source: https://opendev.org/openstack/cliff * Bugs: https://bugs.launchpad.net/python-cliff diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cliff-2.14.1/cliff/_argparse.py new/cliff-2.16.0/cliff/_argparse.py --- old/cliff-2.14.1/cliff/_argparse.py 2019-03-08 00:56:59.000000000 +0100 +++ new/cliff-2.16.0/cliff/_argparse.py 2019-09-06 23:28:03.000000000 +0200 @@ -14,11 +14,14 @@ from __future__ import absolute_import from argparse import * # noqa +import argparse import sys +import warnings -if sys.version_info < (3, 5): - class ArgumentParser(ArgumentParser): # noqa +class ArgumentParser(argparse.ArgumentParser): + + if sys.version_info < (3, 5): def __init__(self, *args, **kwargs): self.allow_abbrev = kwargs.pop("allow_abbrev", True) super(ArgumentParser, self).__init__(*args, **kwargs) @@ -28,3 +31,76 @@ return super(ArgumentParser, self)._get_option_tuples( option_string) return () + + # NOTE(dhellmann): We have to override the methods for creating + # groups to return our objects that know how to deal with the + # special conflict handler. + + def add_argument_group(self, *args, **kwargs): + group = _ArgumentGroup(self, *args, **kwargs) + self._action_groups.append(group) + return group + + def add_mutually_exclusive_group(self, **kwargs): + group = _MutuallyExclusiveGroup(self, **kwargs) + self._mutually_exclusive_groups.append(group) + return group + + def _handle_conflict_ignore(self, action, conflicting_actions): + _handle_conflict_ignore( + self, + self._option_string_actions, + action, + conflicting_actions, + ) + + +def _handle_conflict_ignore(container, option_string_actions, + new_action, conflicting_actions): + + # Remember the option strings the new action starts with so we can + # restore them as part of error reporting if we need to. + original_option_strings = new_action.option_strings + + # Remove all of the conflicting option strings from the new action + # and report an error if none are left at the end. + for option_string, action in conflicting_actions: + + # remove the conflicting option from the new action + new_action.option_strings.remove(option_string) + warnings.warn( + ('Ignoring option string {} for new action ' + 'because it conflicts with an existing option.').format( + option_string)) + + # if the option now has no option string, remove it from the + # container holding it + if not new_action.option_strings: + new_action.option_strings = original_option_strings + raise argparse.ArgumentError( + new_action, + ('Cannot resolve conflicting option string, ' + 'all names conflict.'), + ) + + +class _ArgumentGroup(argparse._ArgumentGroup): + + def _handle_conflict_ignore(self, action, conflicting_actions): + _handle_conflict_ignore( + self, + self._option_string_actions, + action, + conflicting_actions, + ) + + +class _MutuallyExclusiveGroup(argparse._MutuallyExclusiveGroup): + + def _handle_conflict_ignore(self, action, conflicting_actions): + _handle_conflict_ignore( + self, + self._option_string_actions, + action, + conflicting_actions, + ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cliff-2.14.1/cliff/command.py new/cliff-2.16.0/cliff/command.py --- old/cliff-2.14.1/cliff/command.py 2019-03-08 00:56:59.000000000 +0100 +++ new/cliff-2.16.0/cliff/command.py 2019-09-06 23:28:03.000000000 +0200 @@ -156,6 +156,7 @@ epilog=self.get_epilog(), prog=prog_name, formatter_class=_SmartHelpFormatter, + conflict_handler='ignore', ) for hook in self._hooks: hook.obj.get_parser(parser) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cliff-2.14.1/cliff/formatters/json_format.py new/cliff-2.16.0/cliff/formatters/json_format.py --- old/cliff-2.14.1/cliff/formatters/json_format.py 2019-03-08 00:56:59.000000000 +0100 +++ new/cliff-2.16.0/cliff/formatters/json_format.py 2019-09-06 23:28:03.000000000 +0200 @@ -52,3 +52,4 @@ } indent = None if parsed_args.noindent else 2 json.dump(one, stdout, indent=indent) + stdout.write('\n') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cliff-2.14.1/cliff/tests/test_command.py new/cliff-2.16.0/cliff/tests/test_command.py --- old/cliff-2.14.1/cliff/tests/test_command.py 2019-03-08 00:56:59.000000000 +0100 +++ new/cliff-2.16.0/cliff/tests/test_command.py 2019-09-06 23:28:03.000000000 +0200 @@ -45,7 +45,9 @@ ) parser.add_argument( '-z', - help='used in TestArgumentParser', + dest='zippy', + default='zippy-default', + help='defined in TestCommand and used in TestArgumentParser', ) return parser @@ -141,10 +143,32 @@ cmd = TestCommand(None, None) parser = cmd.get_parser('NAME') # We should have an exception registering an option with a - # name that already exists because we do not want commands to - # override global options. + # name that already exists because we configure the argument + # parser to ignore conflicts but this option has no other name + # to be used. self.assertRaises( argparse.ArgumentError, parser.add_argument, '-z', ) + + def test_option_name_collision_with_alias(self): + cmd = TestCommand(None, None) + parser = cmd.get_parser('NAME') + # We not should have an exception registering an option with a + # name that already exists because we configure the argument + # parser to ignore conflicts and this option can be added as + # --zero even if the -z is ignored. + parser.add_argument('-z', '--zero') + + def test_resolve_option_with_name_collision(self): + cmd = TestCommand(None, None) + parser = cmd.get_parser('NAME') + parser.add_argument( + '-z', '--zero', + dest='zero', + default='zero-default', + ) + args = parser.parse_args(['-z', 'foo', 'a', 'b']) + self.assertEqual(args.zippy, 'foo') + self.assertEqual(args.zero, 'zero-default') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cliff-2.14.1/cliff.egg-info/PKG-INFO new/cliff-2.16.0/cliff.egg-info/PKG-INFO --- old/cliff-2.14.1/cliff.egg-info/PKG-INFO 2019-03-08 01:00:05.000000000 +0100 +++ new/cliff-2.16.0/cliff.egg-info/PKG-INFO 2019-09-06 23:29:02.000000000 +0200 @@ -1,10 +1,10 @@ Metadata-Version: 1.1 Name: cliff -Version: 2.14.1 +Version: 2.16.0 Summary: Command Line Interface Formulation Framework Home-page: https://docs.openstack.org/cliff/latest/ Author: OpenStack -Author-email: [email protected] +Author-email: [email protected] License: UNKNOWN Description: ======================== Team and repository tags @@ -27,7 +27,7 @@ * Free software: Apache license * Documentation: https://docs.openstack.org/cliff/latest/ - * Source: https://git.openstack.org/cgit/openstack/cliff + * Source: https://opendev.org/openstack/cliff * Bugs: https://bugs.launchpad.net/python-cliff @@ -38,6 +38,7 @@ Classifier: Programming Language :: Python :: 2 Classifier: Programming Language :: Python :: 2.7 Classifier: Programming Language :: Python :: 3 -Classifier: Programming Language :: Python :: 3.5 +Classifier: Programming Language :: Python :: 3.6 +Classifier: Programming Language :: Python :: 3.7 Classifier: Intended Audience :: Developers Classifier: Environment :: Console diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cliff-2.14.1/cliff.egg-info/SOURCES.txt new/cliff-2.16.0/cliff.egg-info/SOURCES.txt --- old/cliff-2.14.1/cliff.egg-info/SOURCES.txt 2019-03-08 01:00:05.000000000 +0100 +++ new/cliff-2.16.0/cliff.egg-info/SOURCES.txt 2019-09-06 23:29:02.000000000 +0200 @@ -5,8 +5,6 @@ CONTRIBUTING.rst ChangeLog LICENSE -MANIFEST.in -Makefile README.rst bandit.yaml lower-constraints.txt @@ -77,7 +75,6 @@ demoapp/cliffdemo/main.py demoapp/cliffdemo/show.py demoapp/cliffdemo/simple.py -doc/Makefile doc/requirements.txt doc/source/conf.py doc/source/index.rst diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cliff-2.14.1/cliff.egg-info/pbr.json new/cliff-2.16.0/cliff.egg-info/pbr.json --- old/cliff-2.14.1/cliff.egg-info/pbr.json 2019-03-08 01:00:05.000000000 +0100 +++ new/cliff-2.16.0/cliff.egg-info/pbr.json 2019-09-06 23:29:02.000000000 +0200 @@ -1 +1 @@ -{"git_version": "99236b4", "is_release": true} \ No newline at end of file +{"git_version": "6b6b186", "is_release": true} \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cliff-2.14.1/cliff.egg-info/requires.txt new/cliff-2.16.0/cliff.egg-info/requires.txt --- old/cliff-2.14.1/cliff.egg-info/requires.txt 2019-03-08 01:00:05.000000000 +0100 +++ new/cliff-2.16.0/cliff.egg-info/requires.txt 2019-09-06 23:29:02.000000000 +0200 @@ -1,4 +1,5 @@ pbr!=2.1.0,>=2.0.0 +cmd2!=0.8.3,<0.9.0,>=0.8.0 PrettyTable<0.8,>=0.7.2 pyparsing>=2.1.0 six>=1.10.0 @@ -6,8 +7,4 @@ PyYAML>=3.12 [:(python_version<'3.0')] -cmd2!=0.8.3,<0.9.0 unicodecsv>=0.8.0 - -[:(python_version>='3.0')] -cmd2!=0.8.3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cliff-2.14.1/doc/Makefile new/cliff-2.16.0/doc/Makefile --- old/cliff-2.14.1/doc/Makefile 2019-03-08 00:56:59.000000000 +0100 +++ new/cliff-2.16.0/doc/Makefile 1970-01-01 01:00:00.000000000 +0100 @@ -1,153 +0,0 @@ -# Makefile for Sphinx documentation -# - -# You can set these variables from the command line. -SPHINXOPTS = -SPHINXBUILD = sphinx-build -PAPER = -BUILDDIR = build - -# Internal variables. -PAPEROPT_a4 = -D latex_paper_size=a4 -PAPEROPT_letter = -D latex_paper_size=letter -ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) source -# the i18n builder cannot share the environment and doctrees with the others -I18NSPHINXOPTS = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) source - -.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest gettext - -help: - @echo "Please use \`make <target>' where <target> is one of" - @echo " html to make standalone HTML files" - @echo " dirhtml to make HTML files named index.html in directories" - @echo " singlehtml to make a single large HTML file" - @echo " pickle to make pickle files" - @echo " json to make JSON files" - @echo " htmlhelp to make HTML files and a HTML help project" - @echo " qthelp to make HTML files and a qthelp project" - @echo " devhelp to make HTML files and a Devhelp project" - @echo " epub to make an epub" - @echo " latex to make LaTeX files, you can set PAPER=a4 or PAPER=letter" - @echo " latexpdf to make LaTeX files and run them through pdflatex" - @echo " text to make text files" - @echo " man to make manual pages" - @echo " texinfo to make Texinfo files" - @echo " info to make Texinfo files and run them through makeinfo" - @echo " gettext to make PO message catalogs" - @echo " changes to make an overview of all changed/added/deprecated items" - @echo " linkcheck to check all external links for integrity" - @echo " doctest to run all doctests embedded in the documentation (if enabled)" - -clean: - -rm -rf $(BUILDDIR)/* - -html: - $(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html - @echo - @echo "Build finished. The HTML pages are in $(BUILDDIR)/html." - -dirhtml: - $(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml - @echo - @echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml." - -singlehtml: - $(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml - @echo - @echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml." - -pickle: - $(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle - @echo - @echo "Build finished; now you can process the pickle files." - -json: - $(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json - @echo - @echo "Build finished; now you can process the JSON files." - -htmlhelp: - $(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp - @echo - @echo "Build finished; now you can run HTML Help Workshop with the" \ - ".hhp project file in $(BUILDDIR)/htmlhelp." - -qthelp: - $(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp - @echo - @echo "Build finished; now you can run "qcollectiongenerator" with the" \ - ".qhcp project file in $(BUILDDIR)/qthelp, like this:" - @echo "# qcollectiongenerator $(BUILDDIR)/qthelp/cliff.qhcp" - @echo "To view the help file:" - @echo "# assistant -collectionFile $(BUILDDIR)/qthelp/cliff.qhc" - -devhelp: - $(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp - @echo - @echo "Build finished." - @echo "To view the help file:" - @echo "# mkdir -p $$HOME/.local/share/devhelp/cliff" - @echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/cliff" - @echo "# devhelp" - -epub: - $(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub - @echo - @echo "Build finished. The epub file is in $(BUILDDIR)/epub." - -latex: - $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex - @echo - @echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex." - @echo "Run \`make' in that directory to run these through (pdf)latex" \ - "(use \`make latexpdf' here to do that automatically)." - -latexpdf: - $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex - @echo "Running LaTeX files through pdflatex..." - $(MAKE) -C $(BUILDDIR)/latex all-pdf - @echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex." - -text: - $(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text - @echo - @echo "Build finished. The text files are in $(BUILDDIR)/text." - -man: - $(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man - @echo - @echo "Build finished. The manual pages are in $(BUILDDIR)/man." - -texinfo: - $(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo - @echo - @echo "Build finished. The Texinfo files are in $(BUILDDIR)/texinfo." - @echo "Run \`make' in that directory to run these through makeinfo" \ - "(use \`make info' here to do that automatically)." - -info: - $(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo - @echo "Running Texinfo files through makeinfo..." - make -C $(BUILDDIR)/texinfo info - @echo "makeinfo finished; the Info files are in $(BUILDDIR)/texinfo." - -gettext: - $(SPHINXBUILD) -b gettext $(I18NSPHINXOPTS) $(BUILDDIR)/locale - @echo - @echo "Build finished. The message catalogs are in $(BUILDDIR)/locale." - -changes: - $(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes - @echo - @echo "The overview file is in $(BUILDDIR)/changes." - -linkcheck: - $(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck - @echo - @echo "Link check complete; look for any errors in the above output " \ - "or in $(BUILDDIR)/linkcheck/output.txt." - -doctest: - $(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest - @echo "Testing of doctests in the sources finished, look at the " \ - "results in $(BUILDDIR)/doctest/output.txt." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cliff-2.14.1/doc/requirements.txt new/cliff-2.16.0/doc/requirements.txt --- old/cliff-2.14.1/doc/requirements.txt 2019-03-08 00:56:59.000000000 +0100 +++ new/cliff-2.16.0/doc/requirements.txt 2019-09-06 23:28:07.000000000 +0200 @@ -1,5 +1,6 @@ # The order of packages is significant, because pip processes them in the order # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. -sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD +sphinx!=1.6.6,!=1.6.7,<2.0.0,>=1.6.2;python_version=='2.7' # BSD +sphinx!=1.6.6,!=1.6.7,!=2.1.0,>=1.6.2;python_version>='3.4' # BSD openstackdocstheme>=1.18.1 # Apache-2.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cliff-2.14.1/doc/source/install/index.rst new/cliff-2.16.0/doc/source/install/index.rst --- old/cliff-2.14.1/doc/source/install/index.rst 2019-03-08 00:56:59.000000000 +0100 +++ new/cliff-2.16.0/doc/source/install/index.rst 2019-09-06 23:28:03.000000000 +0200 @@ -33,7 +33,7 @@ Source Code =========== -The source is hosted on github: https://git.openstack.org/cgit/openstack/cliff +The source is hosted on OpenDev: https://opendev.org/openstack/cliff Reporting Bugs ============== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cliff-2.14.1/requirements.txt new/cliff-2.16.0/requirements.txt --- old/cliff-2.14.1/requirements.txt 2019-03-08 00:56:59.000000000 +0100 +++ new/cliff-2.16.0/requirements.txt 2019-09-06 23:28:07.000000000 +0200 @@ -2,8 +2,7 @@ # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. pbr!=2.1.0,>=2.0.0 # Apache-2.0 -cmd2!=0.8.3,<0.9.0;python_version<'3.0' # MIT -cmd2!=0.8.3;python_version>='3.0' # MIT +cmd2>=0.8.0,!=0.8.3,<0.9.0 # MIT PrettyTable<0.8,>=0.7.2 # BSD pyparsing>=2.1.0 # MIT six>=1.10.0 # MIT diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cliff-2.14.1/setup.cfg new/cliff-2.16.0/setup.cfg --- old/cliff-2.14.1/setup.cfg 2019-03-08 01:00:05.000000000 +0100 +++ new/cliff-2.16.0/setup.cfg 2019-09-06 23:29:02.000000000 +0200 @@ -2,7 +2,7 @@ name = cliff description-file = README.rst author = OpenStack -author-email = [email protected] +author-email = [email protected] summary = Command Line Interface Formulation Framework home-page = https://docs.openstack.org/cliff/latest/ classifier = @@ -12,7 +12,8 @@ Programming Language :: Python :: 2 Programming Language :: Python :: 2.7 Programming Language :: Python :: 3 - Programming Language :: Python :: 3.5 + Programming Language :: Python :: 3.6 + Programming Language :: Python :: 3.7 Intended Audience :: Developers Environment :: Console diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cliff-2.14.1/test-requirements.txt new/cliff-2.16.0/test-requirements.txt --- old/cliff-2.14.1/test-requirements.txt 2019-03-08 00:56:59.000000000 +0100 +++ new/cliff-2.16.0/test-requirements.txt 2019-09-06 23:28:07.000000000 +0200 @@ -12,7 +12,8 @@ # sphinx is required in test-requirements in addition to doc/requirements # because there is a sphinx extension that has tests -sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD +sphinx!=1.6.6,!=1.6.7,<2.0.0,>=1.6.2;python_version=='2.7' # BSD +sphinx!=1.6.6,!=1.6.7,!=2.1.0,>=1.6.2;python_version>='3.4' # BSD # Bandit security code scanner bandit>=1.1.0 # Apache-2.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cliff-2.14.1/tox.ini new/cliff-2.16.0/tox.ini --- old/cliff-2.14.1/tox.ini 2019-03-08 00:56:59.000000000 +0100 +++ new/cliff-2.16.0/tox.ini 2019-09-06 23:28:03.000000000 +0200 @@ -1,6 +1,6 @@ [tox] minversion = 2.0 -envlist = py35,py27,pep8 +envlist = py27,py37,pep8 [testenv] setenv = @@ -16,7 +16,7 @@ python setup.py test --coverage --coverage-package-name=cliff --slowest --testr-args='{posargs}' coverage report --show-missing deps = - -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} + -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/upper-constraints.txt} -r{toxinidir}/test-requirements.txt -r{toxinidir}/requirements.txt
