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-02-02 14:25:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-oslo.config (Old) and /work/SRC/openSUSE:Factory/.python-oslo.config.new.28504 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-oslo.config" Tue Feb 2 14:25:46 2021 rev:36 rq:868497 version:8.3.3 Changes: -------- --- /work/SRC/openSUSE:Factory/python-oslo.config/python-oslo.config.changes 2020-10-26 16:17:04.458971851 +0100 +++ /work/SRC/openSUSE:Factory/.python-oslo.config.new.28504/python-oslo.config.changes 2021-02-02 14:26:02.203425879 +0100 @@ -1,0 +2,9 @@ +Tue Feb 2 00:38:32 UTC 2021 - cloud-de...@suse.de + +- update to version 8.3.3 + - sphinxext: Add 'merge_domaindata' + - Update TOX_CONSTRAINTS_FILE for stable/victoria + - Update .gitreview for stable/victoria + - Add a new type HostDomain. + +------------------------------------------------------------------- Old: ---- oslo.config-8.3.2.tar.gz New: ---- oslo.config-8.3.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-oslo.config.spec ++++++ --- /var/tmp/diff_new_pack.30kK3e/_old 2021-02-02 14:26:02.759426744 +0100 +++ /var/tmp/diff_new_pack.30kK3e/_new 2021-02-02 14:26:02.763426750 +0100 @@ -1,7 +1,7 @@ # # spec file for package python-oslo.config # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,13 +17,13 @@ Name: python-oslo.config -Version: 8.3.2 +Version: 8.3.3 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.3.2.tar.gz +Source0: https://files.pythonhosted.org/packages/source/o/oslo.config/oslo.config-8.3.3.tar.gz BuildRequires: openstack-macros BuildRequires: python3-PyYAML >= 3.12 BuildRequires: python3-debtcollector >= 1.2.0 @@ -91,13 +91,13 @@ Documentation for the oslo-config library. %prep -%autosetup -p1 -n oslo.config-8.3.2 +%autosetup -p1 -n oslo.config-8.3.3 %py_req_cleanup %build %{py3_build} -PBR_VERSION=8.3.2 PYTHONPATH=. \ +PBR_VERSION=8.3.3 PYTHONPATH=. \ %sphinx_build -b html doc/source doc/build/html # remove the sphinx-build leftovers rm -rf doc/build/html/.{doctrees,buildinfo} ++++++ oslo.config-8.3.2.tar.gz -> oslo.config-8.3.3.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.config-8.3.2/ChangeLog new/oslo.config-8.3.3/ChangeLog --- old/oslo.config-8.3.2/ChangeLog 2020-09-11 21:23:13.000000000 +0200 +++ new/oslo.config-8.3.3/ChangeLog 2020-11-18 18:43:07.000000000 +0100 @@ -1,6 +1,14 @@ CHANGES ======= +8.3.3 +----- + +* Add a new type HostDomain +* sphinxext: Add 'merge\_domaindata' +* Update TOX\_CONSTRAINTS\_FILE for stable/victoria +* Update .gitreview for stable/victoria + 8.3.2 ----- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.config-8.3.2/PKG-INFO new/oslo.config-8.3.3/PKG-INFO --- old/oslo.config-8.3.2/PKG-INFO 2020-09-11 21:23:13.000000000 +0200 +++ new/oslo.config-8.3.3/PKG-INFO 2020-11-18 18:43:08.247316800 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 1.2 Name: oslo.config -Version: 8.3.2 +Version: 8.3.3 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.3.2/oslo.config.egg-info/PKG-INFO new/oslo.config-8.3.3/oslo.config.egg-info/PKG-INFO --- old/oslo.config-8.3.2/oslo.config.egg-info/PKG-INFO 2020-09-11 21:23:13.000000000 +0200 +++ new/oslo.config-8.3.3/oslo.config.egg-info/PKG-INFO 2020-11-18 18:43:08.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 1.2 Name: oslo.config -Version: 8.3.2 +Version: 8.3.3 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.3.2/oslo.config.egg-info/SOURCES.txt new/oslo.config-8.3.3/oslo.config.egg-info/SOURCES.txt --- old/oslo.config-8.3.2/oslo.config.egg-info/SOURCES.txt 2020-09-11 21:23:13.000000000 +0200 +++ new/oslo.config-8.3.3/oslo.config.egg-info/SOURCES.txt 2020-11-18 18:43:08.000000000 +0100 @@ -88,6 +88,7 @@ oslo_config/tests/testmods/fblaa_opt.py releasenotes/notes/.placeholder releasenotes/notes/add-HostAddressOpt-6e7e2afe7c7863cb.yaml +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-port_type-8704295c6a56265d.yaml diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.config-8.3.2/oslo.config.egg-info/pbr.json new/oslo.config-8.3.3/oslo.config.egg-info/pbr.json --- old/oslo.config-8.3.2/oslo.config.egg-info/pbr.json 2020-09-11 21:23:13.000000000 +0200 +++ new/oslo.config-8.3.3/oslo.config.egg-info/pbr.json 2020-11-18 18:43:08.000000000 +0100 @@ -1 +1 @@ -{"git_version": "fcb8894", "is_release": true} \ No newline at end of file +{"git_version": "d9129d8", "is_release": true} \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.config-8.3.2/oslo_config/sphinxext.py new/oslo.config-8.3.3/oslo_config/sphinxext.py --- old/oslo.config-8.3.2/oslo_config/sphinxext.py 2020-09-11 21:22:00.000000000 +0200 +++ new/oslo.config-8.3.3/oslo_config/sphinxext.py 2020-11-18 18:42:30.000000000 +0100 @@ -495,6 +495,15 @@ ) return None + def merge_domaindata(self, docnames, otherdata): + for target, docname in otherdata['options'].items(): + if docname in docnames: + self.data['options'][target] = docname + + for target, docname in otherdata['groups'].items(): + if docname in docnames: + self.data['groups'][target] = docname + def setup(app): # NOTE(dhellmann): Try to turn off lazy translation from oslo_i18n diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.config-8.3.2/oslo_config/tests/test_types.py new/oslo.config-8.3.3/oslo_config/tests/test_types.py --- old/oslo.config-8.3.2/oslo_config/tests/test_types.py 2020-09-11 21:22:00.000000000 +0200 +++ new/oslo.config-8.3.3/oslo_config/tests/test_types.py 2020-11-18 18:42:30.000000000 +0100 @@ -766,6 +766,27 @@ self.assertConvertedValue('abc.0-0', 'abc.0-0') +class HostDomainTypeTests(TypeTestHelper, unittest.TestCase): + type = types.HostDomain() + + def test_invalid_host_addresses(self): + self.assertInvalid('-1') + self.assertInvalid('3.14') + self.assertInvalid('10.0') + self.assertInvalid('host..name') + self.assertInvalid('org.10') + self.assertInvalid('0.0.00') + + def test_valid_host_addresses(self): + self.assertConvertedValue('_foo', '_foo') + self.assertConvertedValue('host_name', 'host_name') + self.assertConvertedValue( + 'overcloud-novacompute_edge1-0.internalapi.localdomain', + 'overcloud-novacompute_edge1-0.internalapi.localdomain') + self.assertConvertedValue('host_01.co.uk', 'host_01.co.uk') + self.assertConvertedValue('_site01001', '_site01001') + + class HostnameTypeTests(TypeTestHelper, unittest.TestCase): type = types.Hostname() @@ -796,8 +817,8 @@ self.assertInvalid("h'ost'") self.assertInvalid("h'ost") self.assertInvalid("h$ost") - self.assertInvalid("h%ost") self.assertInvalid("host_01.co.uk") + self.assertInvalid("h%ost") self.assertInvalid("host;name=99") self.assertInvalid('___site0.1001') self.assertInvalid('_site01001') @@ -808,6 +829,7 @@ def test_invalid_hostnames_with_numeric_characters(self): self.assertInvalid("10.0.0.0") self.assertInvalid("3.14") + self.assertInvalid('___site0.1001') self.assertInvalid("org.10") self.assertInvalid('0.0.00') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.config-8.3.2/oslo_config/types.py new/oslo.config-8.3.3/oslo_config/types.py --- old/oslo.config-8.3.2/oslo_config/types.py 2020-09-11 21:22:00.000000000 +0200 +++ new/oslo.config-8.3.3/oslo_config/types.py 2020-11-18 18:42:30.000000000 +0100 @@ -761,11 +761,12 @@ :param type_name: Type name to be used in the sample config file. """ + HOSTNAME_REGEX = '(?!-)[A-Z0-9-]{1,63}(?<!-)$' def __init__(self, type_name='hostname value'): super(Hostname, self).__init__(type_name=type_name) - def __call__(self, value): + def __call__(self, value, regex=HOSTNAME_REGEX): """Check hostname is valid. Ensures that each segment @@ -789,7 +790,7 @@ % value) if value.endswith("."): value = value[:-1] - allowed = re.compile("(?!-)[A-Z0-9-]{1,63}(?<!-)$", re.IGNORECASE) + allowed = re.compile(regex, re.IGNORECASE) if not re.search('[a-zA-Z-]', value.split(".")[-1]): raise ValueError('%s contains no non-numeric characters in the ' 'top-level domain part of the host name and is ' @@ -844,7 +845,8 @@ try: value = self.hostname(value) except ValueError: - raise ValueError("%s is not a valid host address" % (value,)) + raise ValueError( + "%s is not a valid host address" % (value,)) return value def __repr__(self): @@ -857,6 +859,45 @@ return value +class HostDomain(HostAddress): + """Host Domain type. + + Like HostAddress with the support of _ character. + + :param version: defines which version should be explicitly + checked (4 or 6) in case of an IP address + :param type_name: Type name to be used in the sample config file. + """ + # DOMAIN_REGEX is HOSTNAME_REGEX with the _ character added + DOMAIN_REGEX = '(?!-)[A-Z0-9-_]{1,63}(?<!-)$' + + def __call__(self, value): + """Checks if is a valid IP/hostname. + + If not a valid IP, makes sure it is not a mistyped IP before + performing checks for it as a hostname. + + """ + + try: + value = super(HostDomain, self).__call__(value) + except ValueError: + # Check if domain is valid + # Add support of underscore + # https://www.ietf.org/rfc/rfc1912, + # http://domainkeys.sourceforge.net/underscore.html + # https://bugs.launchpad.net/oslo.config/+bug/1892044 + try: + value = self.hostname(value, regex=self.DOMAIN_REGEX) + except ValueError: + raise ValueError( + "%s is not a valid host address" % (value,)) + return value + + def __repr__(self): + return 'HostDomain' + + class URI(ConfigType): """URI type diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.config-8.3.2/releasenotes/notes/add-HostDomain-implement-rfc1033-c985a3054f824e9d.yaml new/oslo.config-8.3.3/releasenotes/notes/add-HostDomain-implement-rfc1033-c985a3054f824e9d.yaml --- old/oslo.config-8.3.2/releasenotes/notes/add-HostDomain-implement-rfc1033-c985a3054f824e9d.yaml 1970-01-01 01:00:00.000000000 +0100 +++ new/oslo.config-8.3.3/releasenotes/notes/add-HostDomain-implement-rfc1033-c985a3054f824e9d.yaml 2020-11-18 18:42:30.000000000 +0100 @@ -0,0 +1,9 @@ +--- +features: + - | + Add ``HostDomain`` to handle address with underscore. Underscore are + allowed in domain by RFC1033 [1][2][3]. + + - [1] https://www.ietf.org/rfc/rfc1912.txt + - [2] https://www.ietf.org/rfc/rfc1033.txt + - [3] http://domainkeys.sourceforge.net/underscore.html diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.config-8.3.2/tox.ini new/oslo.config-8.3.3/tox.ini --- old/oslo.config-8.3.2/tox.ini 2020-09-11 21:22:00.000000000 +0200 +++ new/oslo.config-8.3.3/tox.ini 2020-11-18 18:42:30.000000000 +0100 @@ -13,7 +13,7 @@ OS_STDERR_CAPTURE={env:OS_STDERR_CAPTURE:1} OS_TEST_TIMEOUT={env:OS_TEST_TIMEOUT:60} deps = - -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} + -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/victoria} -r{toxinidir}/test-requirements.txt -r{toxinidir}/requirements.txt -r{toxinidir}/doc/requirements.txt @@ -52,7 +52,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/victoria} -r{toxinidir}/doc/requirements.txt commands = rm -fr doc/build
