Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-oslo.config for openSUSE:Factory checked in at 2021-12-13 20:44:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-oslo.config (Old) and /work/SRC/openSUSE:Factory/.python-oslo.config.new.2520 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-oslo.config" Mon Dec 13 20:44:44 2021 rev:38 rq:940194 version:8.7.1 Changes: -------- --- /work/SRC/openSUSE:Factory/python-oslo.config/python-oslo.config.changes 2021-05-10 15:39:47.957461300 +0200 +++ /work/SRC/openSUSE:Factory/.python-oslo.config.new.2520/python-oslo.config.changes 2021-12-13 20:50:51.408652594 +0100 @@ -1,0 +2,18 @@ +Tue Oct 26 21:36:55 UTC 2021 - cloud-de...@suse.de + +- update to version 8.7.1 + - remove unicode from code + - Add Python3 xena unit tests + - Adding the missing HostDomain config option + - Add the version parameter. + - Fix formatting of release list + - Move flake8 as a pre-commit local target. + - config-generator yaml format doesn't work with i18n fields + - setup.cfg: Replace dashes with underscores + - update doc url + - Ussuri+ is python3 only + - Remove references to 'sys.version_info' + - Update master for stable/wallaby + - tests: Add test for config file priority order + +------------------------------------------------------------------- Old: ---- oslo.config-8.5.0.tar.gz New: ---- oslo.config-8.7.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-oslo.config.spec ++++++ --- /var/tmp/diff_new_pack.oR6OvE/_old 2021-12-13 20:50:51.824652860 +0100 +++ /var/tmp/diff_new_pack.oR6OvE/_new 2021-12-13 20:50:51.828652862 +0100 @@ -17,14 +17,14 @@ Name: python-oslo.config -Version: 8.5.0 +Version: 8.7.1 Release: 0 Epoch: 0 Summary: OpenStack common configuration library License: Apache-2.0 Group: Development/Languages/Python URL: https://docs.openstack.org/oslo.config -Source0: https://files.pythonhosted.org/packages/source/o/oslo.config/oslo.config-8.5.0.tar.gz +Source0: https://files.pythonhosted.org/packages/source/o/oslo.config/oslo.config-8.7.1.tar.gz BuildRequires: openstack-macros BuildRequires: python3-PyYAML >= 5.1 BuildRequires: python3-debtcollector >= 1.2.0 @@ -90,13 +90,13 @@ Documentation for the oslo-config library. %prep -%autosetup -p1 -n oslo.config-8.5.0 +%autosetup -p1 -n oslo.config-8.7.1 %py_req_cleanup %build %{py3_build} -PBR_VERSION=8.5.0 PYTHONPATH=. \ +PBR_VERSION=8.7.1 PYTHONPATH=. \ %sphinx_build -b html doc/source doc/build/html # remove the sphinx-build leftovers rm -rf doc/build/html/.{doctrees,buildinfo} ++++++ _service ++++++ --- /var/tmp/diff_new_pack.oR6OvE/_old 2021-12-13 20:50:51.860652882 +0100 +++ /var/tmp/diff_new_pack.oR6OvE/_new 2021-12-13 20:50:51.864652885 +0100 @@ -1,8 +1,8 @@ <services> <service mode="disabled" name="renderspec"> - <param name="input-template">https://opendev.org/openstack/rpm-packaging/raw/branch/stable/wallaby/openstack/oslo.config/oslo.config.spec.j2</param> + <param name="input-template">https://opendev.org/openstack/rpm-packaging/raw/master/openstack/oslo.config/oslo.config.spec.j2</param> <param name="output-name">python-oslo.config.spec</param> - <param name="requirements">https://opendev.org/openstack/oslo.config/raw/branch/stable/wallaby/requirements.txt</param> + <param name="requirements">https://opendev.org/openstack/oslo.config/raw/branch/stable/xena/requirements.txt</param> <param name="changelog-email">cloud-de...@suse.de</param> <param name="changelog-provider">gh,openstack,oslo.config</param> </service> ++++++ oslo.config-8.5.0.tar.gz -> oslo.config-8.7.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.config-8.5.0/.pre-commit-config.yaml new/oslo.config-8.7.1/.pre-commit-config.yaml --- old/oslo.config-8.5.0/.pre-commit-config.yaml 2021-03-03 14:41:15.000000000 +0100 +++ new/oslo.config-8.7.1/.pre-commit-config.yaml 2021-07-15 12:21:37.000000000 +0200 @@ -9,7 +9,7 @@ repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: ebc15addedad713c86ef18ae9632c88e187dd0af # v3.1.0 + rev: 9136088a246768144165fcc3ecc3d31bb686920a # v3.3.0 hooks: - id: trailing-whitespace # Replaces or checks mixed line ending @@ -27,9 +27,13 @@ - id: debug-statements - id: check-yaml files: .*\.(yaml|yml)$ - - repo: https://gitlab.com/pycqa/flake8 - rev: 181bb46098dddf7e2d45319ea654b4b4d58c2840 # 3.8.3 + - repo: local hooks: - id: flake8 + name: flake8 additional_dependencies: - hacking>=3.0.1,<3.1.0 + language: python + entry: flake8 + files: '^.*\.py$' + exclude: '^(doc|releasenotes|tools)/.*$' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.config-8.5.0/.zuul.yaml new/oslo.config-8.7.1/.zuul.yaml --- old/oslo.config-8.5.0/.zuul.yaml 2021-03-03 14:41:15.000000000 +0100 +++ new/oslo.config-8.7.1/.zuul.yaml 2021-07-15 12:21:37.000000000 +0200 @@ -2,7 +2,7 @@ templates: - check-requirements - lib-forward-testing-python3 - - openstack-python3-wallaby-jobs + - openstack-python3-xena-jobs - periodic-stable-jobs - publish-openstack-docs-pti - release-notes-jobs-python3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.config-8.5.0/AUTHORS new/oslo.config-8.7.1/AUTHORS --- old/oslo.config-8.5.0/AUTHORS 2021-03-03 14:42:06.000000000 +0100 +++ new/oslo.config-8.7.1/AUTHORS 2021-07-15 12:22:14.000000000 +0200 @@ -123,6 +123,7 @@ OpenStack Release Bot <infra-r...@openstack.org> Paul Belanger <pabelan...@redhat.com> Petr Blaho <petrbl...@gmail.com> +Pierre Riteau <pie...@stackhpc.com> Piyush Raman Srivastava <pirsr...@in.ibm.com> Quan Tian <qt...@vmware.com> Radomir Dopieralski <openst...@sheep.art.pl> @@ -182,6 +183,7 @@ caoyuan <cao.yingj...@gmail.com> caoyuan <cao.y...@99cloud.net> chenxing <chen.x...@99cloud.net> +dengzhaosen <dengzhao...@inspur.com> gengchc2 <geng.changc...@zte.com.cn> hnyang <hny...@fiberhome.com> howardlee <lihongwe...@inspur.com> @@ -198,10 +200,12 @@ ricolin <rico....@easystack.cn> shangxiaobj <shangxia...@inspur.com> skudriashev <skudrias...@griddynamics.com> +songwenping <songwenp...@inspur.com> sonu.kumar <sonu.ku...@nectechnologies.in> ting.wang <ting.w...@easystack.cn> venkatamahesh <venkatamaheshko...@gmail.com> vponomaryov <vponomar...@mirantis.com> +xuanyandong <xuanyand...@inspur.com> yan.haifeng <yanhe...@qq.com> yatinkarel <yka...@redhat.com> zhangboye <zhangb...@inspur.com> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.config-8.5.0/ChangeLog new/oslo.config-8.7.1/ChangeLog --- old/oslo.config-8.5.0/ChangeLog 2021-03-03 14:42:06.000000000 +0100 +++ new/oslo.config-8.7.1/ChangeLog 2021-07-15 12:22:14.000000000 +0200 @@ -1,6 +1,30 @@ CHANGES ======= +8.7.1 +----- + +* config-generator yaml format doesn't work with i18n fields + +8.7.0 +----- + +* Ussuri+ is python3 only +* Add the version parameter +* setup.cfg: Replace dashes with underscores + +8.6.0 +----- + +* Remove references to 'sys.version\_info' +* Adding the missing HostDomain config option +* Fix formatting of release list +* remove unicode from code +* tests: Add test for config file priority order +* Move flake8 as a pre-commit local target +* Add Python3 xena unit tests +* Update master for stable/wallaby + 8.5.0 ----- @@ -15,6 +39,7 @@ * Adding --check-defaults to validator * Use py3 as the default runtime for tox +* update doc url * Add a new type HostDomain * Adding pre-commit * Add Python3 wallaby unit tests diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.config-8.5.0/PKG-INFO new/oslo.config-8.7.1/PKG-INFO --- old/oslo.config-8.5.0/PKG-INFO 2021-03-03 14:42:06.849606500 +0100 +++ new/oslo.config-8.7.1/PKG-INFO 2021-07-15 12:22:15.025269000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: oslo.config -Version: 8.5.0 +Version: 8.7.1 Summary: Oslo Configuration API Home-page: https://docs.openstack.org/oslo.config/latest/ Author: OpenStack diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.config-8.5.0/doc/source/conf.py new/oslo.config-8.7.1/doc/source/conf.py --- old/oslo.config-8.5.0/doc/source/conf.py 2021-03-03 14:41:15.000000000 +0100 +++ new/oslo.config-8.7.1/doc/source/conf.py 2021-07-15 12:21:37.000000000 +0200 @@ -51,7 +51,7 @@ master_doc = 'index' # General information about the project. -copyright = u'2013, OpenStack Foundation' +copyright = '2013, OpenStack Foundation' # If true, '()' will be appended to :func: etc. cross-reference text. add_function_parentheses = True diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.config-8.5.0/oslo.config.egg-info/PKG-INFO new/oslo.config-8.7.1/oslo.config.egg-info/PKG-INFO --- old/oslo.config-8.5.0/oslo.config.egg-info/PKG-INFO 2021-03-03 14:42:06.000000000 +0100 +++ new/oslo.config-8.7.1/oslo.config.egg-info/PKG-INFO 2021-07-15 12:22:14.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: oslo.config -Version: 8.5.0 +Version: 8.7.1 Summary: Oslo Configuration API Home-page: https://docs.openstack.org/oslo.config/latest/ Author: OpenStack diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.config-8.5.0/oslo.config.egg-info/SOURCES.txt new/oslo.config-8.7.1/oslo.config.egg-info/SOURCES.txt --- old/oslo.config-8.5.0/oslo.config.egg-info/SOURCES.txt 2021-03-03 14:42:06.000000000 +0100 +++ new/oslo.config-8.7.1/oslo.config.egg-info/SOURCES.txt 2021-07-15 12:22:14.000000000 +0200 @@ -91,6 +91,7 @@ releasenotes/notes/add-HostDomain-implement-rfc1033-c985a3054f824e9d.yaml releasenotes/notes/add-default-config-dirs-03340ff6689afe94.yaml releasenotes/notes/add-float-min-max-b1a2e16301c8435c.yaml +releasenotes/notes/add-missing-config-option-9ee1992eea750200.yaml releasenotes/notes/add-port_type-8704295c6a56265d.yaml releasenotes/notes/add-reno-71dc832ce29b962f.yaml releasenotes/notes/config-from-environment-3feba7b4cc747d2b.yaml @@ -117,5 +118,6 @@ releasenotes/source/unreleased.rst releasenotes/source/ussuri.rst releasenotes/source/victoria.rst +releasenotes/source/wallaby.rst releasenotes/source/_static/.placeholder releasenotes/source/_templates/.placeholder \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.config-8.5.0/oslo.config.egg-info/pbr.json new/oslo.config-8.7.1/oslo.config.egg-info/pbr.json --- old/oslo.config-8.5.0/oslo.config.egg-info/pbr.json 2021-03-03 14:42:06.000000000 +0100 +++ new/oslo.config-8.7.1/oslo.config.egg-info/pbr.json 2021-07-15 12:22:14.000000000 +0200 @@ -1 +1 @@ -{"git_version": "cfa2564", "is_release": true} \ No newline at end of file +{"git_version": "1a7bd66", "is_release": true} \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.config-8.5.0/oslo_config/cfg.py new/oslo.config-8.7.1/oslo_config/cfg.py --- old/oslo.config-8.5.0/oslo_config/cfg.py 2021-03-03 14:41:15.000000000 +0100 +++ new/oslo.config-8.7.1/oslo_config/cfg.py 2021-07-15 12:21:37.000000000 +0200 @@ -1175,6 +1175,28 @@ **kwargs) +class HostDomainOpt(Opt): + + r"""Option for either an IP or a hostname. + + Like HostAddress with the support of _ character. + + Option with ``type`` :class:`oslo_config.types.HostDomain` + + :param name: the option's name + :param version: one of either ``4``, ``6``, or ``None`` to specify + either version. + :param \*\*kwargs: arbitrary keyword arguments passed to :class:`Opt` + + .. versionadded:: 8.6 + """ + + def __init__(self, name, version=None, **kwargs): + super(HostDomainOpt, self).__init__(name, + type=types.HostDomain(version), + **kwargs) + + class URIOpt(Opt): r"""Opt with URI type diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.config-8.5.0/oslo_config/generator.py new/oslo.config-8.7.1/oslo_config/generator.py --- old/oslo.config-8.5.0/oslo_config/generator.py 2021-03-03 14:41:15.000000000 +0100 +++ new/oslo.config-8.7.1/oslo_config/generator.py 2021-07-15 12:21:37.000000000 +0200 @@ -52,6 +52,7 @@ import yaml from oslo_config import cfg +from oslo_i18n import _message import stevedore.named # noqa LOG = logging.getLogger(__name__) @@ -288,11 +289,9 @@ else: opt_help = opt.help - help_text = u'%s%s (%s)' % (opt_prefix, - opt_help, - opt_type) + help_text = '%s%s (%s)' % (opt_prefix, opt_help, opt_type) else: - help_text = u'(%s)' % opt_type + help_text = '(%s)' % opt_type lines = self._format_help(help_text) if getattr(opt.type, 'min', None) is not None: @@ -725,6 +724,18 @@ return output_data +def i18n_representer(dumper, data): + """oslo_i18n yaml representer + + Returns a translated to the default locale string for yaml.safe_dump + + :param dumper: a SafeDumper instance passed by yaml.safe_dump + :param data: a oslo_i18n._message.Message instance + """ + serializedData = str(data.translation()) + return dumper.represent_str(serializedData) + + def _output_machine_readable(groups, output_file, conf): """Write a machine readable sample config file @@ -738,6 +749,7 @@ """ output_data = _generate_machine_readable_data(groups, conf) if conf.format_ == 'yaml': + yaml.SafeDumper.add_representer(_message.Message, i18n_representer) output_file.write(yaml.safe_dump(output_data, default_flow_style=False)) else: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.config-8.5.0/oslo_config/tests/test_cfg.py new/oslo.config-8.7.1/oslo_config/tests/test_cfg.py --- old/oslo.config-8.5.0/oslo_config/tests/test_cfg.py 2021-03-03 14:41:15.000000000 +0100 +++ new/oslo.config-8.7.1/oslo_config/tests/test_cfg.py 2021-07-15 12:21:37.000000000 +0200 @@ -264,8 +264,10 @@ class FindConfigFilesTestCase(BaseTestCase): def test_find_config_files(self): - config_files = [os.path.expanduser('~/.blaa/blaa.conf'), - '/etc/foo.conf'] + config_files = [ + os.path.expanduser('~/.blaa/blaa.conf'), + '/etc/foo.conf', + ] self.useFixture(fixtures.MonkeyPatch('sys.argv', ['foo'])) self.useFixture(fixtures.MonkeyPatch('os.path.exists', @@ -273,11 +275,42 @@ self.assertEqual(cfg.find_config_files(project='blaa'), config_files) + def test_find_config_files_overrides(self): + """Ensure priority of directories is enforced. + + Ensure we will only ever return two files: $project.conf and + $prog.conf. + """ + config_files = [ + os.path.expanduser('~/.foo/foo.conf'), + # no '~/.foo/bar.conf' to make sure we fall through + os.path.expanduser('~/foo.conf'), + os.path.expanduser('~/bar.conf'), + '/etc/foo/foo.conf', + '/etc/foo/bar.conf', + '/etc/foo.conf', + '/etc/bar.conf', + ] + + self.useFixture(fixtures.MonkeyPatch( + 'os.path.exists', lambda p: p in config_files)) + + expected = [ + os.path.expanduser('~/.foo/foo.conf'), + os.path.expanduser('~/bar.conf'), + ] + actual = cfg.find_config_files(project='foo', prog='bar') + self.assertEqual(expected, actual) + def test_find_config_files_snap(self): - config_files = ['/snap/nova/current/etc/blaa/blaa.conf', - '/var/snap/nova/common/etc/blaa/blaa.conf'] - fake_env = {'SNAP': '/snap/nova/current/', - 'SNAP_COMMON': '/var/snap/nova/common/'} + config_files = [ + '/snap/nova/current/etc/blaa/blaa.conf', + '/var/snap/nova/common/etc/blaa/blaa.conf', + ] + fake_env = { + 'SNAP': '/snap/nova/current/', + 'SNAP_COMMON': '/var/snap/nova/common/', + } self.useFixture(fixtures.MonkeyPatch('sys.argv', ['foo'])) self.useFixture(fixtures.MonkeyPatch('os.path.exists', @@ -788,12 +821,7 @@ self.assertIn('[--config-file PATH]', sys.stdout.getvalue()) def test_version(self): - # In Python 3.4+, argparse prints the version on stdout; before 3.4, it - # printed it on stderr. - if sys.version_info >= (3, 4): - stream_name = 'stdout' - else: - stream_name = 'stderr' + stream_name = 'stdout' self.useFixture(fixtures.MonkeyPatch("sys.%s" % stream_name, io.StringIO())) self.assertRaises(SystemExit, self.conf, ['--version']) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.config-8.5.0/oslo_config/tests/test_generator.py new/oslo.config-8.7.1/oslo_config/tests/test_generator.py --- old/oslo.config-8.5.0/oslo_config/tests/test_generator.py 2021-03-03 14:41:15.000000000 +0100 +++ new/oslo.config-8.7.1/oslo_config/tests/test_generator.py 2021-07-15 12:21:37.000000000 +0200 @@ -1872,5 +1872,32 @@ self.assertEqual(expected, result) +class HostDomainTestCase(base.BaseTestCase): + + opts = [cfg.HostDomainOpt('foo', help='foo option', default='0.0.0.0')] + + def test_host_domain(self): + + config = [("namespace", [("alpha", self.opts)])] + groups = generator._get_groups(config) + + out = io.StringIO() + formatter = build_formatter(out) + generator._output_opts(formatter, 'alpha', groups.pop('alpha')) + result = out.getvalue() + + expected = textwrap.dedent(''' + [alpha] + + # + # From namespace + # + + # foo option (host domain value) + #foo = 0.0.0.0 + ''').lstrip() + self.assertEqual(expected, result) + + GeneratorTestCase.generate_scenarios() MachineReadableGeneratorTestCase.generate_scenarios() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.config-8.5.0/oslo_config/tests/test_get_location.py new/oslo.config-8.7.1/oslo_config/tests/test_get_location.py --- old/oslo.config-8.5.0/oslo_config/tests/test_get_location.py 2021-03-03 14:41:15.000000000 +0100 +++ new/oslo.config-8.7.1/oslo_config/tests/test_get_location.py 2021-07-15 12:21:37.000000000 +0200 @@ -137,7 +137,7 @@ def _write_opt_to_tmp_file(self, group, option, value): filename = tempfile.mktemp() with io.open(filename, 'w', encoding='utf-8') as f: - f.write(textwrap.dedent(u''' + f.write(textwrap.dedent(''' [{group}] {option} = {value} ''').format( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.config-8.5.0/oslo_config/types.py new/oslo.config-8.7.1/oslo_config/types.py --- old/oslo.config-8.5.0/oslo_config/types.py 2021-03-03 14:41:15.000000000 +0100 +++ new/oslo.config-8.7.1/oslo_config/types.py 2021-07-15 12:21:37.000000000 +0200 @@ -871,6 +871,13 @@ # DOMAIN_REGEX is HOSTNAME_REGEX with the _ character added DOMAIN_REGEX = '(?!-)[A-Z0-9-_]{1,63}(?<!-)$' + def __init__(self, version=None, type_name='host domain value'): + """Check for valid version in case an IP address is provided + + """ + + super(HostDomain, self).__init__(version=version, type_name=type_name) + def __call__(self, value): """Checks if is a valid IP/hostname. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.config-8.5.0/oslo_config/validator.py new/oslo.config-8.7.1/oslo_config/validator.py --- old/oslo.config-8.5.0/oslo_config/validator.py 2021-03-03 14:41:15.000000000 +0100 +++ new/oslo.config-8.7.1/oslo_config/validator.py 2021-07-15 12:21:37.000000000 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # Copyright 2018 Red Hat, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.config-8.5.0/releasenotes/notes/add-missing-config-option-9ee1992eea750200.yaml new/oslo.config-8.7.1/releasenotes/notes/add-missing-config-option-9ee1992eea750200.yaml --- old/oslo.config-8.5.0/releasenotes/notes/add-missing-config-option-9ee1992eea750200.yaml 1970-01-01 01:00:00.000000000 +0100 +++ new/oslo.config-8.7.1/releasenotes/notes/add-missing-config-option-9ee1992eea750200.yaml 2021-07-15 12:21:37.000000000 +0200 @@ -0,0 +1,5 @@ +--- +fixes: + - | + Adding the missing ``HostDomain`` config option. Previously this available + type couldn't been imported because no related config option was defined. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.config-8.5.0/releasenotes/source/conf.py new/oslo.config-8.7.1/releasenotes/source/conf.py --- old/oslo.config-8.5.0/releasenotes/source/conf.py 2021-03-03 14:41:15.000000000 +0100 +++ new/oslo.config-8.7.1/releasenotes/source/conf.py 2021-07-15 12:21:37.000000000 +0200 @@ -60,7 +60,7 @@ master_doc = 'index' # General information about the project. -copyright = u'2016, oslo.config Developers' +copyright = '2016, oslo.config Developers' # Release notes do not need a version in the title, they span # multiple versions. @@ -196,8 +196,8 @@ # (source start file, name, description, authors, manual section). man_pages = [ ('index', 'oslo.configreleasenotes', - u'oslo.config Release Notes Documentation', - [u'oslo.config Developers'], 1) + 'oslo.config Release Notes Documentation', + ['oslo.config Developers'], 1) ] # If true, show URL addresses after external links. @@ -211,8 +211,8 @@ # dir menu entry, description, category) texinfo_documents = [ ('index', 'oslo.configReleaseNotes', - u'oslo.config Release Notes Documentation', - u'oslo.config Developers', 'oslo.configReleaseNotes', + 'oslo.config Release Notes Documentation', + 'oslo.config Developers', 'oslo.configReleaseNotes', 'An OpenStack library for parsing configuration options from the command' ' line and configuration files.', 'Miscellaneous'), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.config-8.5.0/releasenotes/source/index.rst new/oslo.config-8.7.1/releasenotes/source/index.rst --- old/oslo.config-8.5.0/releasenotes/source/index.rst 2021-03-03 14:41:15.000000000 +0100 +++ new/oslo.config-8.7.1/releasenotes/source/index.rst 2021-07-15 12:21:37.000000000 +0200 @@ -2,18 +2,19 @@ oslo.config Release Notes =========================== - .. toctree:: - :maxdepth: 1 +.. toctree:: + :maxdepth: 1 - unreleased - victoria - ussuri - train - stein - rocky - queens - pike - ocata - newton - mitaka - liberty + unreleased + wallaby + victoria + ussuri + train + stein + rocky + queens + pike + ocata + newton + mitaka + liberty diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.config-8.5.0/releasenotes/source/wallaby.rst new/oslo.config-8.7.1/releasenotes/source/wallaby.rst --- old/oslo.config-8.5.0/releasenotes/source/wallaby.rst 1970-01-01 01:00:00.000000000 +0100 +++ new/oslo.config-8.7.1/releasenotes/source/wallaby.rst 2021-07-15 12:21:37.000000000 +0200 @@ -0,0 +1,6 @@ +============================ +Wallaby Series Release Notes +============================ + +.. release-notes:: + :branch: stable/wallaby diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.config-8.5.0/setup.cfg new/oslo.config-8.7.1/setup.cfg --- old/oslo.config-8.5.0/setup.cfg 2021-03-03 14:42:06.849606500 +0100 +++ new/oslo.config-8.7.1/setup.cfg 2021-07-15 12:22:15.025269000 +0200 @@ -1,11 +1,11 @@ [metadata] name = oslo.config summary = Oslo Configuration API -description-file = +description_file = README.rst author = OpenStack -author-email = openstack-disc...@lists.openstack.org -home-page = https://docs.openstack.org/oslo.config/latest/ +author_email = openstack-disc...@lists.openstack.org +home_page = https://docs.openstack.org/oslo.config/latest/ python-requires = >=3.6 classifier = Development Status :: 5 - Production/Stable diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.config-8.5.0/tox.ini new/oslo.config-8.7.1/tox.ini --- old/oslo.config-8.5.0/tox.ini 2021-03-03 14:41:15.000000000 +0100 +++ new/oslo.config-8.7.1/tox.ini 2021-07-15 12:21:37.000000000 +0200 @@ -45,7 +45,7 @@ [testenv:docs] whitelist_externals = rm deps = - -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt} + -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} -r{toxinidir}/doc/requirements.txt commands = rm -fr doc/build
