Update to latest versions

Change-Id: I209a21f06fcde130764beeea9f8b15b44f2fefb9
This commit is contained in:
Dirk Müller 2024-03-24 10:21:02 +01:00
parent 4a24dad310
commit 75ab9bf7d6
No known key found for this signature in database
25 changed files with 21 additions and 125 deletions

View File

@ -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() %}

View File

@ -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() %}

View File

@ -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() %}

View File

@ -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() %}

View File

@ -1,29 +0,0 @@
From 5274d612bc5811bc3c9f740f29e1b015a4e8672d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dirk=20M=C3=BCller?= <dirk@dmllr.de>
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

View File

@ -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') }}

View File

@ -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() %}

View File

@ -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() %}

View File

@ -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}

View File

@ -1,29 +0,0 @@
From 6b7248e0dc504e57eff716671aad81fcd1c587d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dirk=20M=C3=BCller?= <dirk@dmllr.de>
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

View File

@ -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') }}

View File

@ -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() %}

View File

@ -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() %}

View File

@ -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() %}

View File

@ -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() %}

View File

@ -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() %}

View File

@ -1,42 +0,0 @@
From 972aff0f329caf3343038349ebe86b5d039ca6ab Mon Sep 17 00:00:00 2001
From: Felipe Reyes <felipe.reyes@canonical.com>
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

View File

@ -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') }}

View File

@ -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() %}

View File

@ -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() %}

View File

@ -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() %}

View File

@ -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() %}

View File

@ -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() %}

View File

@ -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() %}

View File

@ -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() %}