Hello community, here is the log from the commit of package python-oslo.config for openSUSE:Factory checked in at 2020-10-26 16:16:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-oslo.config (Old) and /work/SRC/openSUSE:Factory/.python-oslo.config.new.3463 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-oslo.config" Mon Oct 26 16:16:31 2020 rev:35 rq:841206 version:8.3.2 Changes: -------- --- /work/SRC/openSUSE:Factory/python-oslo.config/python-oslo.config.changes 2020-06-05 20:15:54.962914591 +0200 +++ /work/SRC/openSUSE:Factory/.python-oslo.config.new.3463/python-oslo.config.changes 2020-10-26 16:17:04.458971851 +0100 @@ -1,0 +2,25 @@ +Fri Oct 9 19:16:51 UTC 2020 - [email protected] + +- update to version 8.3.2 + - Remove six from lower-constraints.txt + - Resolve UnboundLocalError + - Cap flake8 to be < 3.8.0 + - Mark sphinx extensions thread safe + - Fix pygments style + - Update lower-constraints versions + - generator: Handle 'cfg.Opt'-type options + - Add Python3 victoria unit tests + - Remove the unused coding style modules + - Add release notes links to doc index + - docs: Mention other ways of escaping '$' + - drop use of pkg_resources + - Use unittest.mock instead of third party mock + - Update master for stable/ussuri + - Bump bandit version + - Fix unit tests to work with stevedore > 2.0.1 + - Raise hacking minimum to 3.0.1 + - Remove redundant class docstring info + - Align contributing doc with oslo's policy + - Add py38 package metadata + +------------------------------------------------------------------- Old: ---- oslo.config-8.0.2.tar.gz New: ---- oslo.config-8.3.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-oslo.config.spec ++++++ --- /var/tmp/diff_new_pack.Knvoy1/_old 2020-10-26 16:17:05.818972945 +0100 +++ /var/tmp/diff_new_pack.Knvoy1/_new 2020-10-26 16:17:05.822972949 +0100 @@ -17,17 +17,18 @@ Name: python-oslo.config -Version: 8.0.2 +Version: 8.3.2 Release: 0 Summary: OpenStack common configuration library License: Apache-2.0 Group: Development/Languages/Python URL: https://launchpad.net/oslo.config -Source0: https://files.pythonhosted.org/packages/source/o/oslo.config/oslo.config-8.0.2.tar.gz +Source0: https://files.pythonhosted.org/packages/source/o/oslo.config/oslo.config-8.3.2.tar.gz BuildRequires: openstack-macros BuildRequires: python3-PyYAML >= 3.12 BuildRequires: python3-debtcollector >= 1.2.0 BuildRequires: python3-fixtures +BuildRequires: python3-importlib-metadata BuildRequires: python3-mock BuildRequires: python3-netaddr >= 0.7.18 BuildRequires: python3-oslo.i18n >= 3.15.3 @@ -57,6 +58,7 @@ Group: Development/Languages/Python Requires: python3-PyYAML >= 3.12 Requires: python3-debtcollector >= 1.2.0 +Requires: python3-importlib-metadata Requires: python3-netaddr >= 0.7.18 Requires: python3-oslo.i18n >= 3.15.3 Requires: python3-requests >= 2.18.0 @@ -89,13 +91,13 @@ Documentation for the oslo-config library. %prep -%autosetup -p1 -n oslo.config-8.0.2 +%autosetup -p1 -n oslo.config-8.3.2 %py_req_cleanup %build %{py3_build} -PBR_VERSION=8.0.2 PYTHONPATH=. \ +PBR_VERSION=8.3.2 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.Knvoy1/_old 2020-10-26 16:17:05.850972971 +0100 +++ /var/tmp/diff_new_pack.Knvoy1/_new 2020-10-26 16:17:05.854972974 +0100 @@ -1,8 +1,8 @@ <services> <service mode="disabled" name="renderspec"> - <param name="input-template">https://opendev.org/openstack/rpm-packaging/raw/branch/stable/ussuri/openstack/oslo.config/oslo.config.spec.j2</param> + <param name="input-template">https://opendev.org/openstack/rpm-packaging/raw/branch/stable/victoria/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/ussuri/requirements.txt</param> + <param name="requirements">https://opendev.org/openstack/oslo.config/raw/branch/stable/victoria/requirements.txt</param> <param name="changelog-email">[email protected]</param> <param name="changelog-provider">gh,openstack,oslo.config</param> </service> ++++++ oslo.config-8.0.2.tar.gz -> oslo.config-8.3.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.config-8.0.2/.zuul.d/project.yaml new/oslo.config-8.3.2/.zuul.d/project.yaml --- old/oslo.config-8.0.2/.zuul.d/project.yaml 2020-04-07 12:06:02.000000000 +0200 +++ new/oslo.config-8.3.2/.zuul.d/project.yaml 2020-09-11 21:22:00.000000000 +0200 @@ -3,7 +3,7 @@ - check-requirements - lib-forward-testing-python3 - openstack-lower-constraints-jobs - - openstack-python3-ussuri-jobs + - openstack-python3-victoria-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.0.2/AUTHORS new/oslo.config-8.3.2/AUTHORS --- old/oslo.config-8.0.2/AUTHORS 2020-04-07 12:07:09.000000000 +0200 +++ new/oslo.config-8.3.2/AUTHORS 2020-09-11 21:23:13.000000000 +0200 @@ -116,6 +116,7 @@ Miguel Grinberg <[email protected]> Mike Fedosin <[email protected]> Moises Guimaraes de Medeiros <[email protected]> +Moisés Guimarães de Medeiros <[email protected]> Monty Taylor <[email protected]> Natal Ngétal <[email protected]> OpenStack Release Bot <[email protected]> @@ -177,6 +178,7 @@ avnish <[email protected]> bhavani.cr <[email protected]> blue55 <[email protected]> +caoyuan <[email protected]> caoyuan <[email protected]> chenxing <[email protected]> gengchc2 <[email protected]> @@ -199,6 +201,7 @@ venkatamahesh <[email protected]> vponomaryov <[email protected]> yan.haifeng <[email protected]> +yatinkarel <[email protected]> zhangboye <[email protected]> zhangyanxian <[email protected]> zhouxinyong <[email protected]> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.config-8.0.2/CONTRIBUTING.rst new/oslo.config-8.3.2/CONTRIBUTING.rst --- old/oslo.config-8.0.2/CONTRIBUTING.rst 2020-04-07 12:06:02.000000000 +0200 +++ new/oslo.config-8.3.2/CONTRIBUTING.rst 2020-09-11 21:22:00.000000000 +0200 @@ -1,3 +1,8 @@ +If you would like to contribute to the development of oslo's libraries, +first you must take a look to this page: + + https://specs.openstack.org/openstack/oslo-specs/specs/policy/contributing.html + If you would like to contribute to the development of OpenStack, start by following the steps in this page: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.config-8.0.2/ChangeLog new/oslo.config-8.3.2/ChangeLog --- old/oslo.config-8.0.2/ChangeLog 2020-04-07 12:07:09.000000000 +0200 +++ new/oslo.config-8.3.2/ChangeLog 2020-09-11 21:23:13.000000000 +0200 @@ -1,6 +1,46 @@ CHANGES ======= +8.3.2 +----- + +* Bump bandit version + +8.3.1 +----- + +* Fix unit tests to work with stevedore > 2.0.1 + +8.3.0 +----- + +* drop use of pkg\_resources + +8.2.0 +----- + +* Update lower-constraints versions +* Fix pygments style +* generator: Handle 'cfg.Opt'-type options + +8.1.0 +----- + +* Add py38 package metadata +* Raise hacking minimum to 3.0.1 +* Remove the unused coding style modules +* Cap flake8 to be < 3.8.0 +* Align contributing doc with oslo's policy +* Remove six from lower-constraints.txt +* docs: Mention other ways of escaping '$' +* Resolve UnboundLocalError +* Add release notes links to doc index +* Mark sphinx extensions thread safe +* Add Python3 victoria unit tests +* Update master for stable/ussuri +* Remove redundant class docstring info +* Use unittest.mock instead of third party mock + 8.0.2 ----- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.config-8.0.2/PKG-INFO new/oslo.config-8.3.2/PKG-INFO --- old/oslo.config-8.0.2/PKG-INFO 2020-04-07 12:07:09.000000000 +0200 +++ new/oslo.config-8.3.2/PKG-INFO 2020-09-11 21:23:13.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.2 Name: oslo.config -Version: 8.0.2 +Version: 8.3.2 Summary: Oslo Configuration API Home-page: https://docs.openstack.org/oslo.config/latest/ Author: OpenStack @@ -48,6 +48,7 @@ Classifier: Programming Language :: Python :: 3 Classifier: Programming Language :: Python :: 3.6 Classifier: Programming Language :: Python :: 3.7 +Classifier: Programming Language :: Python :: 3.8 Classifier: Programming Language :: Python :: 3 :: Only Classifier: Programming Language :: Python :: Implementation :: CPython Requires-Python: >=3.6 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.config-8.0.2/doc/source/conf.py new/oslo.config-8.3.2/doc/source/conf.py --- old/oslo.config-8.0.2/doc/source/conf.py 2020-04-07 12:06:02.000000000 +0200 +++ new/oslo.config-8.3.2/doc/source/conf.py 2020-09-11 21:22:00.000000000 +0200 @@ -18,9 +18,9 @@ ] # openstackdocstheme options -repository_name = 'openstack/oslo.config' -bug_project = 'oslo.config' -bug_tag = '' +openstackdocs_repo_name = 'openstack/oslo.config' +openstackdocs_bug_project = 'oslo.config' +openstackdocs_bug_tag = '' config_generator_config_file = 'config-generator.conf' @@ -48,7 +48,7 @@ add_module_names = True # The name of the Pygments (syntax highlighting) style to use. -pygments_style = 'sphinx' +pygments_style = 'native' # A list of ignored prefixes for module index sorting. modindex_common_prefix = ['oslo_config.'] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.config-8.0.2/doc/source/configuration/format.rst new/oslo.config-8.3.2/doc/source/configuration/format.rst --- old/oslo.config-8.0.2/doc/source/configuration/format.rst 2020-04-07 12:06:02.000000000 +0200 +++ new/oslo.config-8.3.2/doc/source/configuration/format.rst 2020-09-11 21:22:00.000000000 +0200 @@ -155,7 +155,7 @@ # RabbitMQ HA cluster host:port pairs. (list value) rabbit_hosts = $rabbit_host:$rabbit_port -To avoid substitution, use ``$$``, it is replaced by a single ``$``. +To avoid substitution, escape the ``$`` with ``$$`` or ``\$``. For example, if your LDAP DNS password is ``$xkj432``, specify it, as follows: .. code-block:: ini diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.config-8.0.2/doc/source/index.rst new/oslo.config-8.3.2/doc/source/index.rst --- old/oslo.config-8.0.2/doc/source/index.rst 2020-04-07 12:06:02.000000000 +0200 +++ new/oslo.config-8.3.2/doc/source/index.rst 2020-09-11 21:22:00.000000000 +0200 @@ -16,6 +16,13 @@ cli/index contributor/index + +Release Notes +============= + +Read also the `oslo.config Release Notes +<https://docs.openstack.org/releasenotes/oslo.config/>`_. + Indices and tables ================== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.config-8.0.2/lower-constraints.txt new/oslo.config-8.3.2/lower-constraints.txt --- old/oslo.config-8.0.2/lower-constraints.txt 2020-04-07 12:06:02.000000000 +0200 +++ new/oslo.config-8.3.2/lower-constraints.txt 2020-09-11 21:22:00.000000000 +0200 @@ -1,55 +1,79 @@ alabaster==0.7.10 appdirs==1.3.0 Babel==2.3.4 -bandit==1.4.0 +certifi==2020.4.5.2 +chardet==3.0.4 +cliff==3.1.0 +cmd2==0.8.9 coverage==4.0 debtcollector==1.2.0 +doc8==0.8.1 docutils==0.11 dulwich==0.15.0 +entrypoints==0.3 extras==1.0.0 fixtures==3.0.0 -flake8==2.5.5 +future==0.18.2 gitdb==0.6.4 GitPython==1.0.1 -hacking==2.0.0 +idna==2.5 imagesize==0.7.1 +importlib_metadata==1.7.0 iso8601==0.1.11 Jinja2==2.10 keystoneauth1==3.4.0 linecache2==1.0.0 MarkupSafe==1.0 -mccabe==0.2.1 -mock==3.0.0 +mock==4.0.2 +monotonic==1.5 mox3==0.20.0 +msgpack==1.0.0 mypy==0.720 +mypy-extensions==0.4.3 netaddr==0.7.18 +netifaces==0.10.9 openstackdocstheme==1.20.0 os-client-config==1.28.0 +oslo.context==3.1.0 oslo.i18n==3.15.3 oslo.log==3.36.0 +oslo.serialization==3.2.0 +oslo.utils==4.2.0 oslotest==3.2.0 +packaging==20.4 pbr==2.0.0 -pep8==1.5.7 -pyflakes==0.8.1 +prettytable==0.7.2 Pygments==2.2.0 +pyinotify==0.9.6 +pyparsing==2.4.7 +pyperclip==1.8.0 +python-dateutil==2.8.1 python-mimeparse==1.6.0 python-subunit==1.0.0 pytz==2013.6 PyYAML==3.12 reno==2.5.0 requests==2.18.0 -requests_mock==1.5.0 +requests-mock==1.5.0 requestsexceptions==1.2.0 +restructuredtext-lint==1.3.1 rfc3986==1.2.0 -six==1.10.0 +six==1.15.0 smmap==0.9.0 snowballstemmer==1.2.1 Sphinx==1.8.0 +sphinxcontrib-apidoc==0.3.0 sphinxcontrib-websupport==1.0.1 stestr==2.1.0 stevedore==1.20.0 +testrepository==0.0.20 testscenarios==0.4 testtools==2.2.0 traceback2==1.4.0 +typed-ast==1.4.1 +typing-extensions==3.7.4.2 unittest2==1.1.0 +urllib3==1.21.1 +voluptuous==0.11.7 +wcwidth==0.2.4 wrapt==1.7.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.config-8.0.2/oslo.config.egg-info/PKG-INFO new/oslo.config-8.3.2/oslo.config.egg-info/PKG-INFO --- old/oslo.config-8.0.2/oslo.config.egg-info/PKG-INFO 2020-04-07 12:07:09.000000000 +0200 +++ new/oslo.config-8.3.2/oslo.config.egg-info/PKG-INFO 2020-09-11 21:23:13.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.2 Name: oslo.config -Version: 8.0.2 +Version: 8.3.2 Summary: Oslo Configuration API Home-page: https://docs.openstack.org/oslo.config/latest/ Author: OpenStack @@ -48,6 +48,7 @@ Classifier: Programming Language :: Python :: 3 Classifier: Programming Language :: Python :: 3.6 Classifier: Programming Language :: Python :: 3.7 +Classifier: Programming Language :: Python :: 3.8 Classifier: Programming Language :: Python :: 3 :: Only Classifier: Programming Language :: Python :: Implementation :: CPython Requires-Python: >=3.6 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.config-8.0.2/oslo.config.egg-info/SOURCES.txt new/oslo.config-8.3.2/oslo.config.egg-info/SOURCES.txt --- old/oslo.config-8.0.2/oslo.config.egg-info/SOURCES.txt 2020-04-07 12:07:09.000000000 +0200 +++ new/oslo.config-8.3.2/oslo.config.egg-info/SOURCES.txt 2020-09-11 21:23:13.000000000 +0200 @@ -113,5 +113,6 @@ releasenotes/source/stein.rst releasenotes/source/train.rst releasenotes/source/unreleased.rst +releasenotes/source/ussuri.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.0.2/oslo.config.egg-info/pbr.json new/oslo.config-8.3.2/oslo.config.egg-info/pbr.json --- old/oslo.config-8.0.2/oslo.config.egg-info/pbr.json 2020-04-07 12:07:09.000000000 +0200 +++ new/oslo.config-8.3.2/oslo.config.egg-info/pbr.json 2020-09-11 21:23:13.000000000 +0200 @@ -1 +1 @@ -{"git_version": "d93bfe1", "is_release": true} \ No newline at end of file +{"git_version": "fcb8894", "is_release": true} \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.config-8.0.2/oslo.config.egg-info/requires.txt new/oslo.config-8.3.2/oslo.config.egg-info/requires.txt --- old/oslo.config-8.0.2/oslo.config.egg-info/requires.txt 2020-04-07 12:07:09.000000000 +0200 +++ new/oslo.config-8.3.2/oslo.config.egg-info/requires.txt 2020-09-11 21:23:13.000000000 +0200 @@ -1,7 +1,10 @@ +PyYAML>=3.12 debtcollector>=1.2.0 netaddr>=0.7.18 -stevedore>=1.20.0 oslo.i18n>=3.15.3 -rfc3986>=1.2.0 -PyYAML>=3.12 requests>=2.18.0 +rfc3986>=1.2.0 +stevedore>=1.20.0 + +[:(python_version<'3.8')] +importlib_metadata>=1.7.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.config-8.0.2/oslo_config/cfg.py new/oslo.config-8.3.2/oslo_config/cfg.py --- old/oslo.config-8.0.2/oslo_config/cfg.py 2020-04-07 12:06:02.000000000 +0200 +++ new/oslo.config-8.3.2/oslo_config/cfg.py 2020-09-11 21:22:00.000000000 +0200 @@ -2678,6 +2678,7 @@ namespace = self._namespace if namespace is not None: try: + alt_loc = None try: val, alt_loc = opt._get_from_namespace(namespace, group_name) @@ -2692,6 +2693,10 @@ if val != sources._NoValue: return (convert(val), alt_loc) except KeyError: # nosec: Valid control flow instruction + alt_loc = LocationInfo( + Locations.environment, + self._env_driver.get_name(group_name, name), + ) # If there was a KeyError looking at config files or # command line, retry the env_val. if env_val[0] != sources._NoValue: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.config-8.0.2/oslo_config/generator.py new/oslo.config-8.3.2/oslo_config/generator.py --- old/oslo.config-8.0.2/oslo_config/generator.py 2020-04-07 12:06:02.000000000 +0200 +++ new/oslo.config-8.3.2/oslo_config/generator.py 2020-09-11 21:22:00.000000000 +0200 @@ -25,15 +25,20 @@ import collections import copy +import json import logging import operator import sys import textwrap -import json -import pkg_resources -import yaml +try: + # For Python 3.8 and later + import importlib.metadata as importlib_metadata +except ImportError: + # For everyone else + import importlib_metadata +import yaml from oslo_config import cfg import stevedore.named # noqa @@ -107,15 +112,12 @@ default_str = str(opt.sample_default) elif opt.default is None: default_str = '<None>' - elif (isinstance(opt, (cfg.StrOpt, cfg.IPOpt, - cfg.HostnameOpt, cfg.HostAddressOpt, - cfg.URIOpt))): - default_str = opt.default + elif isinstance(opt, (cfg.StrOpt, cfg.IntOpt, cfg.FloatOpt, cfg.IPOpt, + cfg.PortOpt, cfg.HostnameOpt, cfg.HostAddressOpt, + cfg.URIOpt, cfg.Opt)): + default_str = str(opt.default) elif isinstance(opt, cfg.BoolOpt): default_str = str(opt.default).lower() - elif isinstance(opt, (cfg.IntOpt, cfg.FloatOpt, - cfg.PortOpt)): - default_str = str(opt.default) elif isinstance(opt, (cfg.ListOpt, cfg._ConfigFileOpt, cfg._ConfigDirOpt)): default_str = ','.join(str(d) for d in opt.default) @@ -356,12 +358,12 @@ """ self.output_file.write(s) - def writelines(self, l): + def writelines(self, lines): """Write an arbitrary sequence of strings to the output file. - :param l: a list of arbitrary strings + :param lines: a list of arbitrary strings """ - self.output_file.writelines(l) + self.output_file.writelines(lines) def _cleanup_opts(read_opts): @@ -768,7 +770,7 @@ def main(args=None): """The main function of oslo-config-generator.""" - version = pkg_resources.get_distribution('oslo.config').version + version = importlib_metadata.version('oslo.config') logging.basicConfig(level=logging.WARN) conf = cfg.ConfigOpts() register_cli_opts(conf) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.config-8.0.2/oslo_config/sources/__init__.py new/oslo.config-8.3.2/oslo_config/sources/__init__.py --- old/oslo.config-8.0.2/oslo_config/sources/__init__.py 2020-04-07 12:06:02.000000000 +0200 +++ new/oslo.config-8.3.2/oslo_config/sources/__init__.py 2020-09-11 21:22:00.000000000 +0200 @@ -23,22 +23,6 @@ **IMPORTANT:** At this point, all backend drivers are only able to provide immutable values. This protects applications and services from having options in external sources mutated when they reload configuration files. - -Abstract Classes ----------------- - -The Driver Class -================ - -.. autoclass:: ConfigurationSourceDriver - :members: - -The Configuration Source Class -============================== - -.. autoclass:: ConfigurationSource - :members: - """ import abc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.config-8.0.2/oslo_config/sources/_environment.py new/oslo.config-8.3.2/oslo_config/sources/_environment.py --- old/oslo.config-8.0.2/oslo_config/sources/_environment.py 2020-04-07 12:06:02.000000000 +0200 +++ new/oslo.config-8.3.2/oslo_config/sources/_environment.py 2020-09-11 21:22:00.000000000 +0200 @@ -77,12 +77,19 @@ """A configuration source for options in the environment.""" @staticmethod - def _make_name(group_name, option_name): + def get_name(group_name, option_name): + """Return the expected environment variable name for the given option. + + :param group_name: The group name or None. Defaults to 'DEFAULT' if + None. + :param option_name: The option name. + :returns: Th expected environment variable name. + """ group_name = group_name or 'DEFAULT' return 'OS_{}__{}'.format(group_name.upper(), option_name.upper()) def get(self, group_name, option_name, opt): - env_name = self._make_name(group_name, option_name) + env_name = self.get_name(group_name, option_name) try: value = os.environ[env_name] loc = oslo_config.cfg.LocationInfo( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.config-8.0.2/oslo_config/sphinxconfiggen.py new/oslo.config-8.3.2/oslo_config/sphinxconfiggen.py --- old/oslo.config-8.0.2/oslo_config/sphinxconfiggen.py 2020-04-07 12:06:02.000000000 +0200 +++ new/oslo.config-8.3.2/oslo_config/sphinxconfiggen.py 2020-09-11 21:22:00.000000000 +0200 @@ -91,3 +91,7 @@ app.add_config_value('config_generator_config_file', None, 'env') app.add_config_value('sample_config_basename', None, 'env') app.connect('builder-inited', generate_sample) + return { + 'parallel_read_safe': True, + 'parallel_write_safe': True, + } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.config-8.0.2/oslo_config/sphinxext.py new/oslo.config-8.3.2/oslo_config/sphinxext.py --- old/oslo.config-8.0.2/oslo_config/sphinxext.py 2020-04-07 12:06:02.000000000 +0200 +++ new/oslo.config-8.3.2/oslo_config/sphinxext.py 2020-09-11 21:22:00.000000000 +0200 @@ -508,3 +508,7 @@ oslo_i18n.enable_lazy(False) app.add_directive('show-options', ShowOptionsDirective) app.add_domain(ConfigDomain) + return { + 'parallel_read_safe': True, + 'parallel_write_safe': True, + } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.config-8.0.2/oslo_config/tests/test_cfg.py new/oslo.config-8.3.2/oslo_config/tests/test_cfg.py --- old/oslo.config-8.0.2/oslo_config/tests/test_cfg.py 2020-04-07 12:06:02.000000000 +0200 +++ new/oslo.config-8.3.2/oslo_config/tests/test_cfg.py 2020-09-11 21:22:00.000000000 +0200 @@ -21,9 +21,9 @@ import shutil import sys import tempfile +from unittest import mock import fixtures -import mock from oslotest import base import testscenarios diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.config-8.0.2/oslo_config/tests/test_generator.py new/oslo.config-8.3.2/oslo_config/tests/test_generator.py --- old/oslo.config-8.0.2/oslo_config/tests/test_generator.py 2020-04-07 12:06:02.000000000 +0200 +++ new/oslo.config-8.3.2/oslo_config/tests/test_generator.py 2020-09-11 21:22:00.000000000 +0200 @@ -15,9 +15,9 @@ import io import sys import textwrap +from unittest import mock import fixtures -import mock from oslotest import base import tempfile import testscenarios @@ -437,7 +437,7 @@ ''')), ('choices_opt', dict(opts=[('test', [(None, [opts['choices_opt']])])], - expected='''[DEFAULT] + expected="""[DEFAULT] # # From test @@ -451,7 +451,7 @@ # b - <No description provided> # c - <No description provided> #choices_opt = a -''')), +""")), ('deprecated opt without deprecated group', dict(opts=[('test', [(groups['foo'], @@ -852,13 +852,13 @@ # string with bad default (string value) #string_type_with_bad_default = 4096 ''')), - ('str_opt_str_group', + ('str_opt_str_group', dict(opts=[('test', [('foo', [opts['str_opt']]), (groups['foo'], [opts['int_opt']])]), ('foo', [('foo', - [opts['bool_opt']])])], + [opts['bool_opt']])])], expected='''[DEFAULT] @@ -888,7 +888,7 @@ # Maximum value: 20 #int_opt = 10 ''')), - ('opt_str_opt_group', + ('opt_str_opt_group', dict(opts=[('test', [(groups['foo'], [opts['int_opt']]), ('foo', @@ -924,7 +924,7 @@ # a string (string value) #str_opt = foo bar ''')), - ('opt_with_DeprecatedOpt', + ('opt_with_DeprecatedOpt', dict(opts=[('test', [(None, [opts['opt_with_DeprecatedOpt']])])], expected='''[DEFAULT] @@ -1652,8 +1652,8 @@ self.conf = cfg.ConfigOpts() self.conf.register_opts(generator._generator_opts) self.conf.set_default('namespace', [fake_ep.name]) - fake_eps = mock.Mock(return_value=[fake_ep]) - with mock.patch('pkg_resources.iter_entry_points', fake_eps): + with mock.patch('stevedore.named.NamedExtensionManager', + side_effect=FakeException()): self.assertRaises(FakeException, generator.generate, self.conf) def test_generator_call_with_no_arguments_raises_system_exit(self): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.config-8.0.2/oslo_config/tests/test_sources.py new/oslo.config-8.3.2/oslo_config/tests/test_sources.py --- old/oslo.config-8.0.2/oslo_config/tests/test_sources.py 2020-04-07 12:06:02.000000000 +0200 +++ new/oslo.config-8.3.2/oslo_config/tests/test_sources.py 2020-09-11 21:22:00.000000000 +0200 @@ -15,6 +15,7 @@ from oslotest import base from requests import HTTPError import requests_mock +import testtools from oslo_config import _list_opts from oslo_config import cfg @@ -120,10 +121,13 @@ self.conf = cfg.ConfigOpts() self.conf_fixture = self.useFixture(fixture.Config(self.conf)) self.conf.register_opt(cfg.StrOpt('bar'), 'foo') + self.conf.register_opt(cfg.StrOpt('baz', regex='^[a-z].*$'), 'foo') def cleanup(): - if 'OS_FOO__BAR' in os.environ: - del os.environ['OS_FOO__BAR'] + for env in ('OS_FOO__BAR', 'OS_FOO__BAZ'): + if env in os.environ: + del os.environ[env] + self.addCleanup(cleanup) def test_simple_environment_get(self): @@ -171,6 +175,14 @@ self.conf(args=[], use_env=True) self.assertEqual(env_value, self.conf['foo']['bar']) + def test_invalid_env(self): + self.conf(args=[]) + env_value = 'ABC' + os.environ['OS_FOO__BAZ'] = env_value + + with testtools.ExpectedException(cfg.ConfigSourceValueError): + self.conf['foo']['baz'] + def make_uri(name): return "https://oslo.config/{}.conf".format(name) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.config-8.0.2/oslo_config/tests/test_sphinxconfiggen.py new/oslo.config-8.3.2/oslo_config/tests/test_sphinxconfiggen.py --- old/oslo.config-8.0.2/oslo_config/tests/test_sphinxconfiggen.py 2020-04-07 12:06:02.000000000 +0200 +++ new/oslo.config-8.3.2/oslo_config/tests/test_sphinxconfiggen.py 2020-09-11 21:22:00.000000000 +0200 @@ -10,7 +10,8 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock + from oslotest import base from oslo_config import sphinxconfiggen diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.config-8.0.2/oslo_config/tests/test_sphinxext.py new/oslo.config-8.3.2/oslo_config/tests/test_sphinxext.py --- old/oslo.config-8.0.2/oslo_config/tests/test_sphinxext.py 2020-04-07 12:06:02.000000000 +0200 +++ new/oslo.config-8.3.2/oslo_config/tests/test_sphinxext.py 2020-09-11 21:22:00.000000000 +0200 @@ -11,8 +11,8 @@ # under the License. import textwrap +from unittest import mock -import mock from oslotest import base from oslo_config import cfg diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.config-8.0.2/oslo_config/tests/test_validator.py new/oslo.config-8.3.2/oslo_config/tests/test_validator.py --- old/oslo.config-8.0.2/oslo_config/tests/test_validator.py 2020-04-07 12:06:02.000000000 +0200 +++ new/oslo.config-8.3.2/oslo_config/tests/test_validator.py 2020-09-11 21:22:00.000000000 +0200 @@ -12,7 +12,8 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock + from oslotest import base from oslo_config import cfg diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.config-8.0.2/oslo_config/validator.py new/oslo.config-8.3.2/oslo_config/validator.py --- old/oslo.config-8.0.2/oslo_config/validator.py 2020-04-07 12:06:02.000000000 +0200 +++ new/oslo.config-8.3.2/oslo_config/validator.py 2020-09-11 21:22:00.000000000 +0200 @@ -24,7 +24,13 @@ import logging import sys -import pkg_resources +try: + # For Python 3.8 and later + import importlib.metadata as importlib_metadata +except ImportError: + # For everyone else + import importlib_metadata + import yaml from oslo_config import cfg @@ -132,7 +138,7 @@ def main(): """The main function of oslo-config-validator.""" - version = pkg_resources.get_distribution('oslo.config').version + version = importlib_metadata.version('oslo.config') logging.basicConfig(level=logging.INFO) conf = cfg.ConfigOpts() _register_cli_opts(conf) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.config-8.0.2/releasenotes/source/conf.py new/oslo.config-8.3.2/releasenotes/source/conf.py --- old/oslo.config-8.0.2/releasenotes/source/conf.py 2020-04-07 12:06:02.000000000 +0200 +++ new/oslo.config-8.3.2/releasenotes/source/conf.py 2020-09-11 21:22:00.000000000 +0200 @@ -43,9 +43,9 @@ ] # openstackdocstheme options -repository_name = 'openstack/oslo.config' -bug_project = 'oslo.config' -bug_tag = '' +openstackdocs_repo_name = 'openstack/oslo.config' +openstackdocs_bug_project = 'oslo.config' +openstackdocs_bug_tag = '' # Add any paths that contain templates here, relative to this directory. templates_path = ['_templates'] @@ -99,7 +99,7 @@ # show_authors = False # The name of the Pygments (syntax highlighting) style to use. -pygments_style = 'sphinx' +pygments_style = 'native' # A list of ignored prefixes for module index sorting. # modindex_common_prefix = [] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.config-8.0.2/releasenotes/source/index.rst new/oslo.config-8.3.2/releasenotes/source/index.rst --- old/oslo.config-8.0.2/releasenotes/source/index.rst 2020-04-07 12:06:02.000000000 +0200 +++ new/oslo.config-8.3.2/releasenotes/source/index.rst 2020-09-11 21:22:00.000000000 +0200 @@ -6,6 +6,7 @@ :maxdepth: 1 unreleased + ussuri train stein rocky diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.config-8.0.2/releasenotes/source/ussuri.rst new/oslo.config-8.3.2/releasenotes/source/ussuri.rst --- old/oslo.config-8.0.2/releasenotes/source/ussuri.rst 1970-01-01 01:00:00.000000000 +0100 +++ new/oslo.config-8.3.2/releasenotes/source/ussuri.rst 2020-09-11 21:22:00.000000000 +0200 @@ -0,0 +1,6 @@ +=========================== +Ussuri Series Release Notes +=========================== + +.. release-notes:: + :branch: stable/ussuri diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.config-8.0.2/requirements.txt new/oslo.config-8.3.2/requirements.txt --- old/oslo.config-8.0.2/requirements.txt 2020-04-07 12:06:02.000000000 +0200 +++ new/oslo.config-8.3.2/requirements.txt 2020-09-11 21:22:00.000000000 +0200 @@ -9,3 +9,4 @@ rfc3986>=1.2.0 # Apache-2.0 PyYAML>=3.12 # MIT requests>=2.18.0 # Apache-2.0 +importlib_metadata>=1.7.0;python_version<'3.8' # Apache-2.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.config-8.0.2/setup.cfg new/oslo.config-8.3.2/setup.cfg --- old/oslo.config-8.0.2/setup.cfg 2020-04-07 12:07:09.000000000 +0200 +++ new/oslo.config-8.3.2/setup.cfg 2020-09-11 21:23:13.000000000 +0200 @@ -18,6 +18,7 @@ Programming Language :: Python :: 3 Programming Language :: Python :: 3.6 Programming Language :: Python :: 3.7 + Programming Language :: Python :: 3.8 Programming Language :: Python :: 3 :: Only Programming Language :: Python :: Implementation :: CPython diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.config-8.0.2/test-requirements.txt new/oslo.config-8.3.2/test-requirements.txt --- old/oslo.config-8.0.2/test-requirements.txt 2020-04-07 12:06:02.000000000 +0200 +++ new/oslo.config-8.3.2/test-requirements.txt 2020-09-11 21:22:00.000000000 +0200 @@ -2,7 +2,7 @@ # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. -hacking>=2.0.0,<2.1.0 # Apache-2.0 +hacking>=3.0.1,<3.1.0 # Apache-2.0 fixtures>=3.0.0 # Apache-2.0/BSD testscenarios>=0.4 # Apache-2.0/BSD @@ -21,10 +21,7 @@ # deps = {[testenv]deps} coverage coverage!=4.4,>=4.0 # Apache-2.0 -# we can switch to unittest.mock once we drop support for Python 3.6 as that -# includes https://bugs.python.org/issue32933 -mock>=3.0.0 # BSD requests_mock>=1.5.0 # Apache-2.0 # Bandit security code scanner -bandit>=1.1.0,<1.6.0 # Apache-2.0 +bandit>=1.6.0,<1.7.0 # Apache-2.0
