From 621c336b361352bc4b4639437c759ab5a9169ca9 Mon Sep 17 00:00:00 2001 From: OpenStack Release Bot Date: Fri, 4 Mar 2022 17:18:39 +0000 Subject: [PATCH 1/3] Update master for stable/yoga Add file to the reno documentation build to show release notes for stable/yoga. Use pbr instruction to increment the minor version number automatically so that master versions are higher than the versions on stable/yoga. Sem-Ver: feature Change-Id: I94d459d295715fac20b7d81380a3f2c77966f0cd --- releasenotes/source/index.rst | 1 + releasenotes/source/yoga.rst | 6 ++++++ 2 files changed, 7 insertions(+) create mode 100644 releasenotes/source/yoga.rst diff --git a/releasenotes/source/index.rst b/releasenotes/source/index.rst index ff3337e..01b559c 100644 --- a/releasenotes/source/index.rst +++ b/releasenotes/source/index.rst @@ -6,5 +6,6 @@ oslo.metrics Release Notes :maxdepth: 1 unreleased + yoga xena wallaby diff --git a/releasenotes/source/yoga.rst b/releasenotes/source/yoga.rst new file mode 100644 index 0000000..7cd5e90 --- /dev/null +++ b/releasenotes/source/yoga.rst @@ -0,0 +1,6 @@ +========================= +Yoga Series Release Notes +========================= + +.. release-notes:: + :branch: stable/yoga -- GitLab From 5c08056fefa9cb8753ff7fd44c7b0a2c5af040fb Mon Sep 17 00:00:00 2001 From: songwenping Date: Tue, 19 Apr 2022 19:44:30 +0800 Subject: [PATCH 2/3] Remove unnecessary unicode prefixes Change-Id: I73ee8de9fbbd647f83b4537362ce53b1a8f2d503 --- doc/source/conf.py | 8 ++++---- releasenotes/source/conf.py | 16 ++++++++-------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/doc/source/conf.py b/doc/source/conf.py index caebc5f..d3a838c 100755 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -46,8 +46,8 @@ source_suffix = '.rst' master_doc = 'index' # General information about the project. -project = u'oslo.metrics' -copyright = u'2014, OpenStack Foundation' +project = 'oslo.metrics' +copyright = '2014, OpenStack Foundation' # If true, '()' will be appended to :func: etc. cross-reference text. add_function_parentheses = True @@ -79,8 +79,8 @@ htmlhelp_basename = '%sdoc' % project latex_documents = [ ('index', '%s.tex' % project, - u'%s Documentation' % project, - u'OpenStack Foundation', 'manual'), + '%s Documentation' % project, + 'OpenStack Foundation', 'manual'), ] intersphinx_mapping = { diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py index ef967c6..81017d2 100644 --- a/releasenotes/source/conf.py +++ b/releasenotes/source/conf.py @@ -58,8 +58,8 @@ source_suffix = '.rst' master_doc = 'index' # General information about the project. -project = u'oslo.metrics Release Notes' -copyright = u'2020, oslo.metrics Developers' +project = 'oslo.metrics Release Notes' +copyright = '2020, oslo.metrics Developers' # Release notes do not need a version in the title, they span # multiple versions. @@ -208,8 +208,8 @@ latex_elements = { # author, documentclass [howto, manual, or own class]). latex_documents = [ ('index', 'oslo.metricsReleaseNotes.tex', - u'oslo.metrics Release Notes Documentation', - u'oslo.metrics Developers', 'manual'), + 'oslo.metrics Release Notes Documentation', + 'oslo.metrics Developers', 'manual'), ] # The name of an image file (relative to this directory) to place at the top of @@ -238,8 +238,8 @@ latex_documents = [ # (source start file, name, description, authors, manual section). man_pages = [ ('index', 'oslo.metricsReleaseNotes', - u'oslo.metrics Release Notes Documentation', - [u'oslo.metrics Developers'], 1) + 'oslo.metrics Release Notes Documentation', + ['oslo.metrics Developers'], 1) ] # If true, show URL addresses after external links. @@ -252,8 +252,8 @@ man_pages = [ # dir menu entry, description, category) texinfo_documents = [ ('index', 'oslo.metricsReleaseNotes', - u'oslo.metrics Release Notes Documentation', - u'oslo.metrics Developers', 'oslo.metricsReleaseNotes', + 'oslo.metrics Release Notes Documentation', + 'oslo.metrics Developers', 'oslo.metricsReleaseNotes', 'One line description of project.', 'Miscellaneous'), ] -- GitLab From fc22d0da1f8b58c0dd8b4dcdc86b8e87223b1bf7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Beraud?= Date: Thu, 5 May 2022 11:20:26 +0200 Subject: [PATCH 3/3] Drop python3.6/3.7 support in testing runtime In Zed cycle testing runtime, we are targetting to drop the python 3.6/3.7 support, project started adding python 3.8 as minimum, example nova: - https://github.com/openstack/nova/blob/56b5aed08c6a3ed81b78dc216f0165ebfe3c3350/setup.cfg#L13 Also moving zuul jobs to Zed. Also indicate that we support py3.9 Change-Id: Ifb6188b4e623d40bcadb3c92462024f80616291d move victoria's zuul jobs to zed Change-Id: I0200db8add157d28a0bc0859ea126b2e4711f75e --- .zuul.yaml | 2 +- setup.cfg | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index 0a7246b..24a1c11 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -2,7 +2,7 @@ templates: - check-requirements - lib-forward-testing-python3 - - openstack-python3-victoria-jobs + - openstack-python3-zed-jobs - periodic-stable-jobs - publish-openstack-docs-pti - release-notes-jobs-python3 diff --git a/setup.cfg b/setup.cfg index 9a8db0d..32eb46b 100644 --- a/setup.cfg +++ b/setup.cfg @@ -6,7 +6,7 @@ summary = Oslo Metrics API description_file = README.rst home_page = https://opendev.org/openstack/oslo.metrics -python_requires = >=3.6 +python_requires = >=3.8 classifier = Environment :: OpenStack Intended Audience :: Developers @@ -15,9 +15,8 @@ classifier = Operating System :: OS Independent Programming Language :: Python Programming Language :: Python :: 3 - Programming Language :: Python :: 3.6 - Programming Language :: Python :: 3.7 Programming Language :: Python :: 3.8 + Programming Language :: Python :: 3.9 Programming Language :: Python :: 3 :: Only Programming Language :: Python :: Implementation :: CPython -- GitLab