From 75ab9bf7d68a64643bf615a6162cf7c67dec4c4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dirk=20M=C3=BCller?= Date: Sun, 24 Mar 2024 10:21:02 +0100 Subject: [PATCH] Update to latest versions Change-Id: I209a21f06fcde130764beeea9f8b15b44f2fefb9 --- .../oslo.concurrency/oslo.concurrency.spec.j2 | 2 +- openstack/oslo.context/oslo.context.spec.j2 | 2 +- openstack/oslo.i18n/oslo.i18n.spec.j2 | 2 +- openstack/oslo.metrics/oslo.metrics.spec.j2 | 2 +- ...when-building-with-Sphinx-6.1.1-and-.patch | 29 ------------- openstack/oslo.policy/oslo.policy.spec.j2 | 3 +- openstack/oslo.privsep/oslo.privsep.spec.j2 | 2 +- openstack/oslo.rootwrap/oslo.rootwrap.spec.j2 | 2 +- openstack/oslo.service/oslo.service.spec.j2 | 2 +- ...when-building-for-Sphinx-6.1.1-and-a.patch | 29 ------------- .../oslo.versionedobjects.spec.j2 | 3 +- openstack/oslotest/oslotest.spec.j2 | 2 +- .../python-heatclient.spec.j2 | 2 +- .../python-ironic-inspector-client.spec.j2 | 2 +- .../python-ironicclient.spec.j2 | 2 +- .../python-keystoneclient.spec.j2 | 2 +- ...st_help_on_subcommand-on-Python-3.10.patch | 42 ------------------- .../python-magnumclient.spec.j2 | 2 - .../python-manilaclient.spec.j2 | 2 +- .../python-masakariclient.spec.j2 | 2 +- .../python-mistralclient.spec.j2 | 2 +- .../python-monascaclient.spec.j2 | 2 +- .../python-neutronclient.spec.j2 | 2 +- .../python-novaclient.spec.j2 | 2 +- .../python-octaviaclient.spec.j2 | 2 +- 25 files changed, 21 insertions(+), 125 deletions(-) delete mode 100644 openstack/oslo.policy/0001-Avoid-TypeError-when-building-with-Sphinx-6.1.1-and-.patch delete mode 100644 openstack/oslo.versionedobjects/0001-Avoid-TypeError-when-building-for-Sphinx-6.1.1-and-a.patch delete mode 100644 openstack/python-magnumclient/0001-Fix-test_help_on_subcommand-on-Python-3.10.patch diff --git a/openstack/oslo.concurrency/oslo.concurrency.spec.j2 b/openstack/oslo.concurrency/oslo.concurrency.spec.j2 index ab3579d3e..db00dc167 100644 --- a/openstack/oslo.concurrency/oslo.concurrency.spec.j2 +++ b/openstack/oslo.concurrency/oslo.concurrency.spec.j2 @@ -1,5 +1,5 @@ {% set pypi_name = 'oslo.concurrency' %} -{% set upstream_version = upstream_version('5.2.0') %} +{% set upstream_version = upstream_version('6.0.0') %} {% set rpm_release = '1' %} {% set source = url_pypi() %} diff --git a/openstack/oslo.context/oslo.context.spec.j2 b/openstack/oslo.context/oslo.context.spec.j2 index 989279586..f1c4128a1 100644 --- a/openstack/oslo.context/oslo.context.spec.j2 +++ b/openstack/oslo.context/oslo.context.spec.j2 @@ -1,5 +1,5 @@ {% set pypi_name = 'oslo.context' %} -{% set upstream_version = upstream_version('5.3.0') %} +{% set upstream_version = upstream_version('5.5.0') %} {% set rpm_release = '1' %} {% set source = url_pypi() %} diff --git a/openstack/oslo.i18n/oslo.i18n.spec.j2 b/openstack/oslo.i18n/oslo.i18n.spec.j2 index d62944728..2bc0d0a7d 100644 --- a/openstack/oslo.i18n/oslo.i18n.spec.j2 +++ b/openstack/oslo.i18n/oslo.i18n.spec.j2 @@ -1,5 +1,5 @@ {% set pypi_name = 'oslo.i18n' %} -{% set upstream_version = upstream_version('6.2.0') %} +{% set upstream_version = upstream_version('6.3.0') %} {% set rpm_release = '1' %} {% set source = url_pypi() %} diff --git a/openstack/oslo.metrics/oslo.metrics.spec.j2 b/openstack/oslo.metrics/oslo.metrics.spec.j2 index 1ca652474..867129b65 100644 --- a/openstack/oslo.metrics/oslo.metrics.spec.j2 +++ b/openstack/oslo.metrics/oslo.metrics.spec.j2 @@ -1,5 +1,5 @@ {% set pypi_name = 'oslo.metrics' %} -{% set upstream_version = upstream_version('0.7.0') %} +{% set upstream_version = upstream_version('0.8.0') %} {% set rpm_release = '1' %} {% set source = url_pypi() %} diff --git a/openstack/oslo.policy/0001-Avoid-TypeError-when-building-with-Sphinx-6.1.1-and-.patch b/openstack/oslo.policy/0001-Avoid-TypeError-when-building-with-Sphinx-6.1.1-and-.patch deleted file mode 100644 index 8a3cca0fd..000000000 --- a/openstack/oslo.policy/0001-Avoid-TypeError-when-building-with-Sphinx-6.1.1-and-.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 5274d612bc5811bc3c9f740f29e1b015a4e8672d Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Dirk=20M=C3=BCller?= -Date: Mon, 6 Mar 2023 21:48:26 +0100 -Subject: [PATCH] Avoid TypeError when building with Sphinx 6.1.1 and above - -see https://github.com/sphinx-doc/sphinx/issues/11094 for the -investigation and the fix. - -Change-Id: I836df2bc88d416415c395245f012d6990fd006b2 ---- - doc/source/conf.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/doc/source/conf.py b/doc/source/conf.py -index e390675..84c108a 100644 ---- a/doc/source/conf.py -+++ b/doc/source/conf.py -@@ -98,7 +98,7 @@ man_pages = [ - # -- sphinx.ext.extlinks configuration --------------------------------------- - - extlinks = { -- 'example': (source_tree + '/oslo_policy/%s', ''), -+ 'example': (source_tree + '/oslo_policy/%s', None), - } - - # -- sphinxcontrib.apidoc configuration -------------------------------------- --- -2.39.2 - diff --git a/openstack/oslo.policy/oslo.policy.spec.j2 b/openstack/oslo.policy/oslo.policy.spec.j2 index 415f1f208..9576245be 100644 --- a/openstack/oslo.policy/oslo.policy.spec.j2 +++ b/openstack/oslo.policy/oslo.policy.spec.j2 @@ -1,5 +1,5 @@ {% set pypi_name = 'oslo.policy' %} -{% set upstream_version = upstream_version('4.2.1') %} +{% set upstream_version = upstream_version('4.3.0') %} {% set rpm_release = '1' %} {% set source = url_pypi() %} @@ -11,7 +11,6 @@ License: {{ license('Apache-2.0') }} Group: Development/Languages/Python URL: https://docs.openstack.org/{{ pypi_name }} Source0: {{ source }} -Patch1: 0001-Avoid-TypeError-when-building-with-Sphinx-6.1.1-and-.patch BuildRequires: openstack-macros BuildRequires: {{ py3('PyYAML') }} BuildRequires: {{ py3('defusedxml') }} diff --git a/openstack/oslo.privsep/oslo.privsep.spec.j2 b/openstack/oslo.privsep/oslo.privsep.spec.j2 index 1fb33c4d4..ada6cff78 100644 --- a/openstack/oslo.privsep/oslo.privsep.spec.j2 +++ b/openstack/oslo.privsep/oslo.privsep.spec.j2 @@ -1,5 +1,5 @@ {% set pypi_name = 'oslo.privsep' %} -{% set upstream_version = upstream_version('3.2.0') %} +{% set upstream_version = upstream_version('3.3.0') %} {% set rpm_release = '1' %} {% set source = url_pypi() %} diff --git a/openstack/oslo.rootwrap/oslo.rootwrap.spec.j2 b/openstack/oslo.rootwrap/oslo.rootwrap.spec.j2 index a84717979..0d537576b 100644 --- a/openstack/oslo.rootwrap/oslo.rootwrap.spec.j2 +++ b/openstack/oslo.rootwrap/oslo.rootwrap.spec.j2 @@ -1,5 +1,5 @@ {% set pypi_name = 'oslo.rootwrap' %} -{% set upstream_version = upstream_version('7.1.0') %} +{% set upstream_version = upstream_version('7.2.0') %} {% set rpm_release = '1' %} {% set source = url_pypi() %} diff --git a/openstack/oslo.service/oslo.service.spec.j2 b/openstack/oslo.service/oslo.service.spec.j2 index 2d9f6e5ca..131966f5b 100644 --- a/openstack/oslo.service/oslo.service.spec.j2 +++ b/openstack/oslo.service/oslo.service.spec.j2 @@ -1,5 +1,5 @@ {% set pypi_name = 'oslo.service' %} -{% set upstream_version = upstream_version('3.2.0') %} +{% set upstream_version = upstream_version('3.4.0') %} {% set rpm_release = '1' %} {% set source = url_pypi() %} %if 0%{?rhel} || 0%{?fedora} diff --git a/openstack/oslo.versionedobjects/0001-Avoid-TypeError-when-building-for-Sphinx-6.1.1-and-a.patch b/openstack/oslo.versionedobjects/0001-Avoid-TypeError-when-building-for-Sphinx-6.1.1-and-a.patch deleted file mode 100644 index b19c4b18e..000000000 --- a/openstack/oslo.versionedobjects/0001-Avoid-TypeError-when-building-for-Sphinx-6.1.1-and-a.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 6b7248e0dc504e57eff716671aad81fcd1c587d9 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Dirk=20M=C3=BCller?= -Date: Mon, 6 Mar 2023 21:36:03 +0100 -Subject: [PATCH] Avoid TypeError when building for Sphinx 6.1.1 and above - -see https://github.com/sphinx-doc/sphinx/issues/11094 for the -investigation and the fix. - -Change-Id: If76e79531e0b81ba3e3c9fe38904b77b553e1698 ---- - doc/source/conf.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/doc/source/conf.py b/doc/source/conf.py -index 475926b..51d703a 100644 ---- a/doc/source/conf.py -+++ b/doc/source/conf.py -@@ -57,7 +57,7 @@ add_module_names = True - # Shortened external links. - extlinks = { - 'example': (source_tree + -- '/%s/examples/%%s.py' % project.replace(".", "_"), ''), -+ '/%s/examples/%%s.py' % project.replace(".", "_"), None), - } - - # The name of the Pygments (syntax highlighting) style to use. --- -2.39.2 - diff --git a/openstack/oslo.versionedobjects/oslo.versionedobjects.spec.j2 b/openstack/oslo.versionedobjects/oslo.versionedobjects.spec.j2 index 839c2f244..db493e354 100644 --- a/openstack/oslo.versionedobjects/oslo.versionedobjects.spec.j2 +++ b/openstack/oslo.versionedobjects/oslo.versionedobjects.spec.j2 @@ -1,5 +1,5 @@ {% set pypi_name = 'oslo.versionedobjects' %} -{% set upstream_version = upstream_version('3.2.0') %} +{% set upstream_version = upstream_version('3.3.0') %} {% set rpm_release = '1' %} {% set source = url_pypi() %} @@ -11,7 +11,6 @@ License: {{ license('Apache-2.0') }} Group: Development/Languages/Python URL: https://docs.openstack.org/{{ pypi_name }} Source0: {{ source }} -Patch1: 0001-Avoid-TypeError-when-building-for-Sphinx-6.1.1-and-a.patch BuildRequires: openstack-macros BuildRequires: {{ py3('iso8601') }} BuildRequires: {{ py3('jsonschema') }} diff --git a/openstack/oslotest/oslotest.spec.j2 b/openstack/oslotest/oslotest.spec.j2 index 633b4f6ca..03ae8c514 100644 --- a/openstack/oslotest/oslotest.spec.j2 +++ b/openstack/oslotest/oslotest.spec.j2 @@ -1,5 +1,5 @@ {% set pypi_name = 'oslotest' %} -{% set upstream_version = upstream_version('4.5.0') %} +{% set upstream_version = upstream_version('5.0.0') %} {% set rpm_release = '1' %} {% set source = url_pypi() %} diff --git a/openstack/python-heatclient/python-heatclient.spec.j2 b/openstack/python-heatclient/python-heatclient.spec.j2 index e10354730..2cc211b9d 100644 --- a/openstack/python-heatclient/python-heatclient.spec.j2 +++ b/openstack/python-heatclient/python-heatclient.spec.j2 @@ -1,5 +1,5 @@ {% set pypi_name = 'python-heatclient' %} -{% set upstream_version = upstream_version('3.4.0') %} +{% set upstream_version = upstream_version('3.5.0') %} {% set rpm_release = '1' %} {% set source = url_pypi() %} diff --git a/openstack/python-ironic-inspector-client/python-ironic-inspector-client.spec.j2 b/openstack/python-ironic-inspector-client/python-ironic-inspector-client.spec.j2 index d91c29c28..a00b32bd8 100644 --- a/openstack/python-ironic-inspector-client/python-ironic-inspector-client.spec.j2 +++ b/openstack/python-ironic-inspector-client/python-ironic-inspector-client.spec.j2 @@ -1,5 +1,5 @@ {% set pypi_name = 'python-ironic-inspector-client' %} -{% set upstream_version = upstream_version('5.0.0') %} +{% set upstream_version = upstream_version('5.1.0') %} {% set rpm_release = '1' %} {% set source = url_pypi() %} diff --git a/openstack/python-ironicclient/python-ironicclient.spec.j2 b/openstack/python-ironicclient/python-ironicclient.spec.j2 index 227d076c1..fcb9d9de1 100644 --- a/openstack/python-ironicclient/python-ironicclient.spec.j2 +++ b/openstack/python-ironicclient/python-ironicclient.spec.j2 @@ -1,5 +1,5 @@ {% set pypi_name = 'python-ironicclient' %} -{% set upstream_version = upstream_version('5.4.0') %} +{% set upstream_version = upstream_version('5.5.0') %} {% set rpm_release = '1' %} {% set source = url_pypi() %} diff --git a/openstack/python-keystoneclient/python-keystoneclient.spec.j2 b/openstack/python-keystoneclient/python-keystoneclient.spec.j2 index 484d59ad8..23598ce3c 100644 --- a/openstack/python-keystoneclient/python-keystoneclient.spec.j2 +++ b/openstack/python-keystoneclient/python-keystoneclient.spec.j2 @@ -1,5 +1,5 @@ {% set pypi_name = 'python-keystoneclient' %} -{% set upstream_version = upstream_version('5.2.0') %} +{% set upstream_version = upstream_version('5.4.0') %} {% set rpm_release = '1' %} {% set source = url_pypi() %} diff --git a/openstack/python-magnumclient/0001-Fix-test_help_on_subcommand-on-Python-3.10.patch b/openstack/python-magnumclient/0001-Fix-test_help_on_subcommand-on-Python-3.10.patch deleted file mode 100644 index f73f09259..000000000 --- a/openstack/python-magnumclient/0001-Fix-test_help_on_subcommand-on-Python-3.10.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 972aff0f329caf3343038349ebe86b5d039ca6ab Mon Sep 17 00:00:00 2001 -From: Felipe Reyes -Date: Fri, 25 Mar 2022 09:46:20 -0300 -Subject: [PATCH] Fix test_help_on_subcommand on Python 3.10 - -Python 3.10 changed the way the optional arguments defined in argparse -are listed in the help output, the title was changed from "Optional -arguments" to "Options". - -This checks the python version where the unit test is being executed and -uses the string that corresponds. - -Story: 2009946 -Task: 44858 -Change-Id: Ibee09bf76399849f7da987c4661fa1945d27afb7 ---- - magnumclient/tests/test_shell.py | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -diff --git a/magnumclient/tests/test_shell.py b/magnumclient/tests/test_shell.py -index c4b8b8d..fb1d209 100644 ---- a/magnumclient/tests/test_shell.py -+++ b/magnumclient/tests/test_shell.py -@@ -119,9 +119,13 @@ class ShellTest(utils.TestCase): - def test_help_on_subcommand(self): - required = [ - '.*?^usage: magnum bay-create', -- '.*?^Create a bay.', -- '.*?^Optional arguments:', -+ '.*?^Create a bay.' - ] -+ # https://bugs.python.org/issue9694 -+ if sys.version_info[:2] >= (3, 10): -+ required.append('.*?^Options:') -+ else: -+ required.append('.*?^Optional arguments:') - stdout, stderr = self.shell('help bay-create') - for r in required: - self.assertThat((stdout + stderr), --- -2.36.1 - diff --git a/openstack/python-magnumclient/python-magnumclient.spec.j2 b/openstack/python-magnumclient/python-magnumclient.spec.j2 index 2d10d8164..66021f207 100644 --- a/openstack/python-magnumclient/python-magnumclient.spec.j2 +++ b/openstack/python-magnumclient/python-magnumclient.spec.j2 @@ -11,8 +11,6 @@ License: {{ license('Apache-2.0') }} Group: Development/Languages/Python URL: https://docs.openstack.org/{{ pypi_name }} Source0: {{ source }} -# Upstream Ibee09bf76399849f7da987c4661fa1945d27afb7 -Patch1: 0001-Fix-test_help_on_subcommand-on-Python-3.10.patch BuildRequires: openstack-macros BuildRequires: {{ py3('PrettyTable') }} BuildRequires: {{ py3('cryptography') }} diff --git a/openstack/python-manilaclient/python-manilaclient.spec.j2 b/openstack/python-manilaclient/python-manilaclient.spec.j2 index 4595d1b10..59338de84 100644 --- a/openstack/python-manilaclient/python-manilaclient.spec.j2 +++ b/openstack/python-manilaclient/python-manilaclient.spec.j2 @@ -1,5 +1,5 @@ {% set pypi_name = 'python-manilaclient' %} -{% set upstream_version = upstream_version('4.7.0') %} +{% set upstream_version = upstream_version('4.8.0') %} {% set rpm_release = '1' %} {% set source = url_pypi() %} diff --git a/openstack/python-masakariclient/python-masakariclient.spec.j2 b/openstack/python-masakariclient/python-masakariclient.spec.j2 index 0526acd8d..a0e901c95 100644 --- a/openstack/python-masakariclient/python-masakariclient.spec.j2 +++ b/openstack/python-masakariclient/python-masakariclient.spec.j2 @@ -1,5 +1,5 @@ {% set pypi_name = 'python-masakariclient' %} -{% set upstream_version = upstream_version('8.3.0') %} +{% set upstream_version = upstream_version('8.4.0') %} {% set rpm_release = '1' %} {% set source = url_pypi() %} diff --git a/openstack/python-mistralclient/python-mistralclient.spec.j2 b/openstack/python-mistralclient/python-mistralclient.spec.j2 index 9dd49a0ab..6f71fe8ee 100644 --- a/openstack/python-mistralclient/python-mistralclient.spec.j2 +++ b/openstack/python-mistralclient/python-mistralclient.spec.j2 @@ -1,5 +1,5 @@ {% set pypi_name = 'python-mistralclient' %} -{% set upstream_version = upstream_version('5.1.0') %} +{% set upstream_version = upstream_version('5.2.0') %} {% set rpm_release = '1' %} {% set source = url_pypi() %} diff --git a/openstack/python-monascaclient/python-monascaclient.spec.j2 b/openstack/python-monascaclient/python-monascaclient.spec.j2 index 5fab13dee..521c287f0 100644 --- a/openstack/python-monascaclient/python-monascaclient.spec.j2 +++ b/openstack/python-monascaclient/python-monascaclient.spec.j2 @@ -1,5 +1,5 @@ {% set pypi_name = 'python-monascaclient' %} -{% set upstream_version = upstream_version('2.5.0') %} +{% set upstream_version = upstream_version('2.8.0') %} {% set rpm_release = '1' %} {% set source = url_pypi() %} diff --git a/openstack/python-neutronclient/python-neutronclient.spec.j2 b/openstack/python-neutronclient/python-neutronclient.spec.j2 index 8d3355816..3c0588716 100644 --- a/openstack/python-neutronclient/python-neutronclient.spec.j2 +++ b/openstack/python-neutronclient/python-neutronclient.spec.j2 @@ -1,5 +1,5 @@ {% set pypi_name = 'python-neutronclient' %} -{% set upstream_version = upstream_version('11.1.0') %} +{% set upstream_version = upstream_version('11.2.0') %} {% set rpm_release = '1' %} {% set source = url_pypi() %} diff --git a/openstack/python-novaclient/python-novaclient.spec.j2 b/openstack/python-novaclient/python-novaclient.spec.j2 index dde1cd66a..407bac1c2 100644 --- a/openstack/python-novaclient/python-novaclient.spec.j2 +++ b/openstack/python-novaclient/python-novaclient.spec.j2 @@ -1,5 +1,5 @@ {% set pypi_name = 'python-novaclient' %} -{% set upstream_version = upstream_version('18.4.0') %} +{% set upstream_version = upstream_version('18.6.0') %} {% set rpm_release = '1' %} {% set source = url_pypi() %} diff --git a/openstack/python-octaviaclient/python-octaviaclient.spec.j2 b/openstack/python-octaviaclient/python-octaviaclient.spec.j2 index ba75ad431..17b187856 100644 --- a/openstack/python-octaviaclient/python-octaviaclient.spec.j2 +++ b/openstack/python-octaviaclient/python-octaviaclient.spec.j2 @@ -1,5 +1,5 @@ {% set pypi_name = 'python-octaviaclient' %} -{% set upstream_version = upstream_version('3.6.0') %} +{% set upstream_version = upstream_version('3.7.0') %} {% set rpm_release = '1' %} {% set source = url_pypi() %}