diff -Nru python-oslo.upgradecheck-0.2.1/AUTHORS python-oslo.upgradecheck-0.3.1/AUTHORS --- python-oslo.upgradecheck-0.2.1/AUTHORS 2019-02-28 18:05:48.000000000 +0000 +++ python-oslo.upgradecheck-0.3.1/AUTHORS 2019-07-18 02:35:36.000000000 +0000 @@ -2,7 +2,10 @@ Charles Short Chris Dent Doug Hellmann +Ghanshyam Mann Matt Riedemann +OpenStack Release Bot +Sean McGinnis Slawek Kaplonski Stephen Finucane jacky06 diff -Nru python-oslo.upgradecheck-0.2.1/ChangeLog python-oslo.upgradecheck-0.3.1/ChangeLog --- python-oslo.upgradecheck-0.2.1/ChangeLog 2019-02-28 18:05:48.000000000 +0000 +++ python-oslo.upgradecheck-0.3.1/ChangeLog 2019-07-18 02:35:36.000000000 +0000 @@ -1,6 +1,21 @@ CHANGES ======= +0.3.1 +----- + + +0.3.0 +----- + +* Address nits from json change +* Enable JSON results output +* Sync Sphinx requirement +* Replace git.openstack.org URLs with opendev.org URLs +* OpenDev Migration Patch +* Dropping the py35 testing +* Update master for stable/stein + 0.2.1 ----- diff -Nru python-oslo.upgradecheck-0.2.1/debian/changelog python-oslo.upgradecheck-0.3.1/debian/changelog --- python-oslo.upgradecheck-0.2.1/debian/changelog 2019-07-11 09:54:55.000000000 +0000 +++ python-oslo.upgradecheck-0.3.1/debian/changelog 2019-07-30 20:21:08.000000000 +0000 @@ -1,3 +1,11 @@ +python-oslo.upgradecheck (0.3.1-0ubuntu1~ubuntu19.10.1~ppa201907301621) eoan; urgency=medium + + * New upstream release for OpenStack Train. + * d/control: Align (Build-)Depends with upstream. + * No-change backport to eoan + + -- Corey Bryant Tue, 30 Jul 2019 16:21:08 -0400 + python-oslo.upgradecheck (0.2.1-0ubuntu2) eoan; urgency=medium * d/control: Drop BDI's on python-* packages. diff -Nru python-oslo.upgradecheck-0.2.1/debian/control python-oslo.upgradecheck-0.3.1/debian/control --- python-oslo.upgradecheck-0.2.1/debian/control 2019-07-11 09:54:55.000000000 +0000 +++ python-oslo.upgradecheck-0.3.1/debian/control 2019-07-30 19:48:56.000000000 +0000 @@ -19,13 +19,13 @@ python3-babel (>= 1.3), python3-hacking (>= 0.10.0), python3-openstackdocstheme (>= 1.18.1), - python3-oslo.config (>= 5.2.0), + python3-oslo.config (>= 1:5.2.0), python3-oslo.i18n (>= 3.15.3), python3-oslosphinx (>= 2.5.0), - python3-oslotest (>= 1.5.1), + python3-oslotest (>= 1:1.5.1), python3-prettytable (>= 0.7.1), python3-reno (>= 2.5.0), - python3-stestr, + python3-stestr (>= 2.0.0), python3-subunit, python3-testrepository, Standards-Version: 4.1.2 @@ -38,7 +38,7 @@ Architecture: all Depends: python3-babel (>= 1.3), - python3-oslo.config (>= 5.2.0), + python3-oslo.config (>= 1:5.2.0), python3-oslo.i18n (>= 3.15.3), python3-prettytable (>= 0.7.1), ${misc:Depends}, diff -Nru python-oslo.upgradecheck-0.2.1/doc/source/index.rst python-oslo.upgradecheck-0.3.1/doc/source/index.rst --- python-oslo.upgradecheck-0.2.1/doc/source/index.rst 2019-02-28 18:03:16.000000000 +0000 +++ python-oslo.upgradecheck-0.3.1/doc/source/index.rst 2019-07-18 02:34:52.000000000 +0000 @@ -1,6 +1,6 @@ -=================== - oslo.upgradecheck -=================== +================= +oslo.upgradecheck +================= Common code for writing OpenStack upgrade checks. diff -Nru python-oslo.upgradecheck-0.2.1/HACKING.rst python-oslo.upgradecheck-0.3.1/HACKING.rst --- python-oslo.upgradecheck-0.2.1/HACKING.rst 2019-02-28 18:03:16.000000000 +0000 +++ python-oslo.upgradecheck-0.3.1/HACKING.rst 2019-07-18 02:34:52.000000000 +0000 @@ -1,4 +1,4 @@ oslo.upgradecheck Style Commandments -====================================================== +==================================== Read the OpenStack Style Commandments https://docs.openstack.org/hacking/latest/ diff -Nru python-oslo.upgradecheck-0.2.1/oslo_upgradecheck/upgradecheck.py python-oslo.upgradecheck-0.3.1/oslo_upgradecheck/upgradecheck.py --- python-oslo.upgradecheck-0.2.1/oslo_upgradecheck/upgradecheck.py 2019-02-28 18:03:16.000000000 +0000 +++ python-oslo.upgradecheck-0.3.1/oslo_upgradecheck/upgradecheck.py 2019-07-18 02:34:52.000000000 +0000 @@ -13,6 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. +import json import sys import textwrap import traceback @@ -24,6 +25,8 @@ from oslo_upgradecheck._i18n import _ +CONF = None + class Code(enum.IntEnum): """Status codes for the upgrade check command""" @@ -103,8 +106,6 @@ if result.code > return_code: return_code = result.code - # TODO(bnemec): Consider using cliff for this so we can output in - # different formats like JSON or CSV. # We're going to build a summary table that looks like: # +----------------------------------------------------+ # | Upgrade Check Results | @@ -118,25 +119,42 @@ # | Details: There is no placement-api endpoint in the | # | service catalog. | # +----------------------------------------------------+ - # NOTE(bnemec): We use six.text_type on the translated string to - # force immediate translation if lazy translation is in use. - # See lp1801761 for details. - t = prettytable.PrettyTable([six.text_type(self.display_title)], - hrules=prettytable.ALL) - t.align = 'l' - for name, result in check_results: - cell = ( - _('Check: %(name)s\n' - 'Result: %(result)s\n' - 'Details: %(details)s') % - { - 'name': name, - 'result': UPGRADE_CHECK_MSG_MAP[result.code], - 'details': self._get_details(result), - } - ) - t.add_row([cell]) - print(t) + + # Since registering opts can be overridden by consuming code, we can't + # assume that our locally defined option exists. + if (hasattr(CONF, 'command') and hasattr(CONF.command, 'json') and + CONF.command.json): + # NOTE(bnemec): We use six.text_type on the translated string to + # force immediate translation if lazy translation is in use. + # See lp1801761 for details. + output = {'name': six.text_type(self.display_title), 'checks': []} + for name, result in check_results: + output['checks'].append( + {'check': name, + 'result': result.code, + 'details': result.details} + ) + print(json.dumps(output)) + else: + # NOTE(bnemec): We use six.text_type on the translated string to + # force immediate translation if lazy translation is in use. + # See lp1801761 for details. + t = prettytable.PrettyTable([six.text_type(self.display_title)], + hrules=prettytable.ALL) + t.align = 'l' + for name, result in check_results: + cell = ( + _('Check: %(name)s\n' + 'Result: %(result)s\n' + 'Details: %(details)s') % + { + 'name': name, + 'result': UPGRADE_CHECK_MSG_MAP[result.code], + 'details': self._get_details(result), + } + ) + t.add_row([cell]) + print(t) return return_code @@ -154,6 +172,11 @@ upgrade_action = subparsers.add_parser('upgrade') upgrade_action.add_argument('check') upgrade_action.set_defaults(action_fn=upgrade_command.check) + upgrade_action.add_argument( + '--json', + action='store_true', + help='Output the results in JSON format. Default is to print ' + 'results in human readable table format.') opt = cfg.SubCommandOpt('command', handler=add_parsers) conf.register_cli_opt(opt) @@ -194,6 +217,7 @@ the search behavior in oslo.config. """ + global CONF register_cli_options(conf, upgrade_command) conf( @@ -201,5 +225,5 @@ project=project, default_config_files=default_config_files, ) - + CONF = conf return run(conf) diff -Nru python-oslo.upgradecheck-0.2.1/oslo.upgradecheck.egg-info/pbr.json python-oslo.upgradecheck-0.3.1/oslo.upgradecheck.egg-info/pbr.json --- python-oslo.upgradecheck-0.2.1/oslo.upgradecheck.egg-info/pbr.json 2019-02-28 18:05:48.000000000 +0000 +++ python-oslo.upgradecheck-0.3.1/oslo.upgradecheck.egg-info/pbr.json 2019-07-18 02:35:36.000000000 +0000 @@ -1 +1 @@ -{"git_version": "fa57185", "is_release": true} \ No newline at end of file +{"git_version": "5f182fe", "is_release": true} \ No newline at end of file diff -Nru python-oslo.upgradecheck-0.2.1/oslo.upgradecheck.egg-info/PKG-INFO python-oslo.upgradecheck-0.3.1/oslo.upgradecheck.egg-info/PKG-INFO --- python-oslo.upgradecheck-0.2.1/oslo.upgradecheck.egg-info/PKG-INFO 2019-02-28 18:05:48.000000000 +0000 +++ python-oslo.upgradecheck-0.3.1/oslo.upgradecheck.egg-info/PKG-INFO 2019-07-18 02:35:36.000000000 +0000 @@ -1,14 +1,14 @@ Metadata-Version: 1.1 Name: oslo.upgradecheck -Version: 0.2.1 +Version: 0.3.1 Summary: Common code for writing OpenStack upgrade checks Home-page: http://launchpad.net/oslo Author: OpenStack Author-email: openstack-discuss@lists.openstack.org License: UNKNOWN -Description: =================================== +Description: ================= oslo.upgradecheck - =================================== + ================= Common code for writing OpenStack upgrade checks @@ -19,7 +19,7 @@ * Free software: Apache license * Documentation: https://docs.openstack.org/oslo.upgradecheck/latest/ - * Source: https://git.openstack.org/cgit/openstack/oslo.upgradecheck + * Source: https://opendev.org/openstack/oslo.upgradecheck * Bugs: https://bugs.launchpad.net/oslo.upgradecheck @@ -33,5 +33,4 @@ 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 diff -Nru python-oslo.upgradecheck-0.2.1/oslo.upgradecheck.egg-info/SOURCES.txt python-oslo.upgradecheck-0.3.1/oslo.upgradecheck.egg-info/SOURCES.txt --- python-oslo.upgradecheck-0.2.1/oslo.upgradecheck.egg-info/SOURCES.txt 2019-02-28 18:05:48.000000000 +0000 +++ python-oslo.upgradecheck-0.3.1/oslo.upgradecheck.egg-info/SOURCES.txt 2019-07-18 02:35:36.000000000 +0000 @@ -34,9 +34,10 @@ oslo_upgradecheck/upgradecheck.py oslo_upgradecheck/tests/__init__.py oslo_upgradecheck/tests/test_upgradecheck.py -releasenotes/notes/.placeholder +releasenotes/notes/json-output-78a9e19588b7b1e1.yaml releasenotes/source/conf.py releasenotes/source/index.rst +releasenotes/source/stein.rst releasenotes/source/unreleased.rst releasenotes/source/_static/.placeholder releasenotes/source/_templates/.placeholder \ No newline at end of file diff -Nru python-oslo.upgradecheck-0.2.1/PKG-INFO python-oslo.upgradecheck-0.3.1/PKG-INFO --- python-oslo.upgradecheck-0.2.1/PKG-INFO 2019-02-28 18:05:48.000000000 +0000 +++ python-oslo.upgradecheck-0.3.1/PKG-INFO 2019-07-18 02:35:36.000000000 +0000 @@ -1,14 +1,14 @@ Metadata-Version: 1.1 Name: oslo.upgradecheck -Version: 0.2.1 +Version: 0.3.1 Summary: Common code for writing OpenStack upgrade checks Home-page: http://launchpad.net/oslo Author: OpenStack Author-email: openstack-discuss@lists.openstack.org License: UNKNOWN -Description: =================================== +Description: ================= oslo.upgradecheck - =================================== + ================= Common code for writing OpenStack upgrade checks @@ -19,7 +19,7 @@ * Free software: Apache license * Documentation: https://docs.openstack.org/oslo.upgradecheck/latest/ - * Source: https://git.openstack.org/cgit/openstack/oslo.upgradecheck + * Source: https://opendev.org/openstack/oslo.upgradecheck * Bugs: https://bugs.launchpad.net/oslo.upgradecheck @@ -33,5 +33,4 @@ 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 diff -Nru python-oslo.upgradecheck-0.2.1/README.rst python-oslo.upgradecheck-0.3.1/README.rst --- python-oslo.upgradecheck-0.2.1/README.rst 2019-02-28 18:03:16.000000000 +0000 +++ python-oslo.upgradecheck-0.3.1/README.rst 2019-07-18 02:34:52.000000000 +0000 @@ -1,6 +1,6 @@ -=================================== +================= oslo.upgradecheck -=================================== +================= Common code for writing OpenStack upgrade checks @@ -11,5 +11,5 @@ * Free software: Apache license * Documentation: https://docs.openstack.org/oslo.upgradecheck/latest/ -* Source: https://git.openstack.org/cgit/openstack/oslo.upgradecheck +* Source: https://opendev.org/openstack/oslo.upgradecheck * Bugs: https://bugs.launchpad.net/oslo.upgradecheck diff -Nru python-oslo.upgradecheck-0.2.1/releasenotes/notes/json-output-78a9e19588b7b1e1.yaml python-oslo.upgradecheck-0.3.1/releasenotes/notes/json-output-78a9e19588b7b1e1.yaml --- python-oslo.upgradecheck-0.2.1/releasenotes/notes/json-output-78a9e19588b7b1e1.yaml 1970-01-01 00:00:00.000000000 +0000 +++ python-oslo.upgradecheck-0.3.1/releasenotes/notes/json-output-78a9e19588b7b1e1.yaml 2019-07-18 02:34:52.000000000 +0000 @@ -0,0 +1,7 @@ +--- +features: + - | + oslo.upgradecheck now supports the command line flag ``--json`` to have + the upgrade check results output in a compact, machine readable JSON + format. The default output without this flag remains a human readable + table of the results. diff -Nru python-oslo.upgradecheck-0.2.1/releasenotes/source/index.rst python-oslo.upgradecheck-0.3.1/releasenotes/source/index.rst --- python-oslo.upgradecheck-0.2.1/releasenotes/source/index.rst 2019-02-28 18:03:16.000000000 +0000 +++ python-oslo.upgradecheck-0.3.1/releasenotes/source/index.rst 2019-07-18 02:34:52.000000000 +0000 @@ -5,3 +5,4 @@ :maxdepth: 1 unreleased + stein diff -Nru python-oslo.upgradecheck-0.2.1/releasenotes/source/stein.rst python-oslo.upgradecheck-0.3.1/releasenotes/source/stein.rst --- python-oslo.upgradecheck-0.2.1/releasenotes/source/stein.rst 1970-01-01 00:00:00.000000000 +0000 +++ python-oslo.upgradecheck-0.3.1/releasenotes/source/stein.rst 2019-07-18 02:34:52.000000000 +0000 @@ -0,0 +1,6 @@ +=================================== + Stein Series Release Notes +=================================== + +.. release-notes:: + :branch: stable/stein diff -Nru python-oslo.upgradecheck-0.2.1/setup.cfg python-oslo.upgradecheck-0.3.1/setup.cfg --- python-oslo.upgradecheck-0.2.1/setup.cfg 2019-02-28 18:05:48.000000000 +0000 +++ python-oslo.upgradecheck-0.3.1/setup.cfg 2019-07-18 02:35:36.000000000 +0000 @@ -16,7 +16,6 @@ Programming Language :: Python :: 2 Programming Language :: Python :: 2.7 Programming Language :: Python :: 3 - Programming Language :: Python :: 3.5 Programming Language :: Python :: 3.6 [files] diff -Nru python-oslo.upgradecheck-0.2.1/test-requirements.txt python-oslo.upgradecheck-0.3.1/test-requirements.txt --- python-oslo.upgradecheck-0.2.1/test-requirements.txt 2019-02-28 18:03:16.000000000 +0000 +++ python-oslo.upgradecheck-0.3.1/test-requirements.txt 2019-07-18 02:34:52.000000000 +0000 @@ -7,6 +7,7 @@ stestr>=2.0.0 # These are needed for docs generation -sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD +sphinx!=1.6.6,!=1.6.7,>=1.6.2,<2.0.0;python_version=='2.7' # BSD +sphinx!=1.6.6,!=1.6.7,>=1.6.2;python_version>='3.4' # BSD reno>=2.5.0 openstackdocstheme>=1.18.1 diff -Nru python-oslo.upgradecheck-0.2.1/tox.ini python-oslo.upgradecheck-0.3.1/tox.ini --- python-oslo.upgradecheck-0.2.1/tox.ini 2019-02-28 18:03:16.000000000 +0000 +++ python-oslo.upgradecheck-0.3.1/tox.ini 2019-07-18 02:34:52.000000000 +0000 @@ -12,7 +12,7 @@ OS_STDOUT_CAPTURE=1 OS_STDERR_CAPTURE=1 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/branch/master/upper-constraints.txt} -r{toxinidir}/test-requirements.txt -r{toxinidir}/requirements.txt commands = stestr run --slowest {posargs}