From 8772b4349d8f019c926ad830d359e3a26b2351b2 Mon Sep 17 00:00:00 2001 From: Ivan Anfimov Date: Sat, 3 May 2025 18:04:05 +0000 Subject: [PATCH] Remove tags from README The tags framework has been discontinued for a long time. https://governance.openstack.org/tc/reference/tags/ https://governance.openstack.org/tc/resolutions/20211224-tags-framework-removal.html Change-Id: Ib7fba258ef19f594fb68ba97e3fa242f1d0fe1ef Signed-off-by: Ivan Anfimov --- README.rst | 14 ++------------ doc/training-guides/source/slides/conf.py | 16 ++++++++-------- doc/training-guides/source/website/conf.py | 18 +++++++++--------- doc/upstream-training/source/slides/conf.py | 12 ++++++------ doc/upstream-training/source/website/conf.py | 18 +++++++++--------- test-requirements.txt | 13 +++++-------- tox.ini | 9 ++++++++- 7 files changed, 47 insertions(+), 53 deletions(-) diff --git a/README.rst b/README.rst index 28aead2b..17080972 100644 --- a/README.rst +++ b/README.rst @@ -1,14 +1,6 @@ -======================== -Team and repository tags -======================== - -.. image:: https://governance.openstack.org/tc/badges/training-guides.svg - :target: https://governance.openstack.org/tc/reference/tags/index.html - -.. Change things from this point on - +========================= OpenStack Training Guides -+++++++++++++++++++++++++ +========================= This repository contains open source training material that can be used to learn about using and different ways of contributing to OpenStack @@ -83,7 +75,6 @@ Bugs should be filed on Launchpad, not GitHub: https://bugs.launchpad.net/openstack-training-guides - Published guides ================ @@ -91,7 +82,6 @@ Guides are published at: * https://docs.openstack.org/upstream-training/ - Release Notes ============= diff --git a/doc/training-guides/source/slides/conf.py b/doc/training-guides/source/slides/conf.py index 94ad1acb..6a0c644b 100644 --- a/doc/training-guides/source/slides/conf.py +++ b/doc/training-guides/source/slides/conf.py @@ -52,8 +52,8 @@ source_suffix = '.rst' master_doc = 'slide-index' # General information about the project. -project = u'Associate Training Guide' -copyright = u'2014-2015, OpenStack contributors' +project = 'Associate Training Guide' +copyright = '2014-2015, OpenStack contributors' # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the @@ -205,8 +205,8 @@ latex_elements = { # (source start file, target name, title, # author, documentclass [howto, manual, or own class]). latex_documents = [ - ('index', 'AssociateTrainingGuide.tex', u'Associate Training Guide', - u'OpenStack contributors', 'manual'), + ('index', 'AssociateTrainingGuide.tex', 'Associate Training Guide', + 'OpenStack contributors', 'manual'), ] # The name of an image file (relative to this directory) to place at the top of @@ -235,8 +235,8 @@ latex_documents = [ # One entry per manual page. List of tuples # (source start file, name, description, authors, manual section). man_pages = [ - ('index', 'associate-training-guide', u'Associate Training Guide', - [u'OpenStack contributors'], 1) + ('index', 'associate-training-guide', 'Associate Training Guide', + ['OpenStack contributors'], 1) ] # If true, show URL addresses after external links. @@ -249,8 +249,8 @@ man_pages = [ # (source start file, target name, title, author, # dir menu entry, description, category) texinfo_documents = [ - ('index', 'AssociateTrainingGuide', u'Associate Training Guide', - u'OpenStack contributors', 'AssociateTrainingGuide', + ('index', 'AssociateTrainingGuide', 'Associate Training Guide', + 'OpenStack contributors', 'AssociateTrainingGuide', 'This guide is introduction to the OpenStack.', 'Miscellaneous'), ] diff --git a/doc/training-guides/source/website/conf.py b/doc/training-guides/source/website/conf.py index d93767c1..caf80c10 100644 --- a/doc/training-guides/source/website/conf.py +++ b/doc/training-guides/source/website/conf.py @@ -34,9 +34,9 @@ extensions = [ master_doc = 'index' # General information about the project. -project = u'OpenStack Training Guides' -openstackdocs_bug_tag = u'training-guides' -copyright = u'2014-2019, OpenStack contributors' +project = 'OpenStack Training Guides' +openstackdocs_bug_tag = 'training-guides' +copyright = '2014-2019, OpenStack contributors' openstackdocs_repo_name = 'openstack/training-guides' openstackdocs_bug_project = 'training-guides' openstackdocs_auto_name = False @@ -81,8 +81,8 @@ latex_elements = { # (source start file, target name, title, # author, documentclass [howto, manual, or own class]). latex_documents = [ - ('index', 'OpenStackTrainingGuides.tex', u'OpenStack Training Guides', - u'OpenStack contributors', 'manual'), + ('index', 'OpenStackTrainingGuides.tex', 'OpenStack Training Guides', + 'OpenStack contributors', 'manual'), ] # The name of an image file (relative to this directory) to place at the top of @@ -111,8 +111,8 @@ latex_documents = [ # One entry per manual page. List of tuples # (source start file, name, description, authors, manual section). man_pages = [ - ('index', 'openstack-training-guides', u'OpenStack Training Guides', - [u'OpenStack contributors'], 1) + ('index', 'openstack-training-guides', 'OpenStack Training Guides', + ['OpenStack contributors'], 1) ] # If true, show URL addresses after external links. @@ -125,8 +125,8 @@ man_pages = [ # (source start file, target name, title, author, # dir menu entry, description, category) texinfo_documents = [ - ('index', 'OpenStackTrainingGuides', u'OpenStack Training Guides', - u'OpenStack contributors', 'OpenStackTrainingGuides', + ('index', 'OpenStackTrainingGuides', 'OpenStack Training Guides', + 'OpenStack contributors', 'OpenStackTrainingGuides', 'This guide offers OpenStack software training.', 'Miscellaneous'), ] diff --git a/doc/upstream-training/source/slides/conf.py b/doc/upstream-training/source/slides/conf.py index 0e29d1c7..1f4998ca 100644 --- a/doc/upstream-training/source/slides/conf.py +++ b/doc/upstream-training/source/slides/conf.py @@ -52,8 +52,8 @@ source_suffix = '.rst' master_doc = 'slide-index' # General information about the project. -project = u'Upstream Training Guide' -copyright = u'2014-2018, OpenStack contributors' +project = 'Upstream Training Guide' +copyright = '2014-2018, OpenStack contributors' # No need to show a version number version = '' @@ -200,8 +200,8 @@ latex_elements = { # (source start file, target name, title, # author, documentclass [howto, manual, or own class]). latex_documents = [ - ('index', 'UpstreamTrainingGuide.tex', u'Upstream Training Guide', - u'OpenStack contributors', 'manual'), + ('index', 'UpstreamTrainingGuide.tex', 'Upstream Training Guide', + 'OpenStack contributors', 'manual'), ] # The name of an image file (relative to this directory) to place at the top of @@ -244,8 +244,8 @@ man_pages = [ # (source start file, target name, title, author, # dir menu entry, description, category) texinfo_documents = [ - ('index', 'UpstreamTrainingGuide', u'Upstream Training Guide', - u'OpenStack contributors', 'UpstreamTrainingGuide', + ('index', 'UpstreamTrainingGuide', 'Upstream Training Guide', + 'OpenStack contributors', 'UpstreamTrainingGuide', 'This guide shows how to work with the OpenStack upstream.', 'Miscellaneous'), ] diff --git a/doc/upstream-training/source/website/conf.py b/doc/upstream-training/source/website/conf.py index e4a985e6..72d727e4 100644 --- a/doc/upstream-training/source/website/conf.py +++ b/doc/upstream-training/source/website/conf.py @@ -33,9 +33,9 @@ extensions = [ master_doc = 'index' # General information about the project. -project = u'Upstream Training Guide' -openstackdocs_bug_tag = u'upstream' -copyright = u'2014-2019, OpenStack contributors' +project = 'Upstream Training Guide' +openstackdocs_bug_tag = 'upstream' +copyright = '2014-2019, OpenStack contributors' openstackdocs_repo_name = 'openstack/training-guides' openstackdocs_bug_project = 'training-guides' openstackdocs_auto_name = False @@ -89,8 +89,8 @@ latex_elements = { # (source start file, target name, title, # author, documentclass [howto, manual, or own class]). latex_documents = [ - ('index', 'UpstreamTrainingGuide.tex', u'Upstream Training Guide', - u'OpenStack contributors', 'manual'), + ('index', 'UpstreamTrainingGuide.tex', 'Upstream Training Guide', + 'OpenStack contributors', 'manual'), ] # The name of an image file (relative to this directory) to place at the top of @@ -119,8 +119,8 @@ latex_documents = [ # One entry per manual page. List of tuples # (source start file, name, description, authors, manual section). man_pages = [ - ('index', 'upstream-training-guide', u'Upstream Training Guide', - [u'OpenStack contributors'], 1) + ('index', 'upstream-training-guide', 'Upstream Training Guide', + ['OpenStack contributors'], 1) ] # If true, show URL addresses after external links. @@ -133,8 +133,8 @@ man_pages = [ # (source start file, target name, title, author, # dir menu entry, description, category) texinfo_documents = [ - ('index', 'UpstreamTrainingGuide', u'Upstream Training Guide', - u'OpenStack contributors', 'UpstreamTrainingGuide', + ('index', 'UpstreamTrainingGuide', 'Upstream Training Guide', + 'OpenStack contributors', 'UpstreamTrainingGuide', 'This guide shows how to work with the OpenStack upstream.', 'Miscellaneous'), ] diff --git a/test-requirements.txt b/test-requirements.txt index d72faa8b..8eebaaeb 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,8 +1,5 @@ -# The order of packages is significant, because pip processes them in the order -# of appearance. Changing the order has an impact on the overall integration -# process, which may cause wedges in the gate later. -pbr>=1.8 -sphinx>=2.0.0,!=2.1.0 # BSD -openstackdocstheme>=2.2.1 # Apache-2.0 -hieroglyph>=2.0.0 -doc8 +pbr>=5.5.0 # Apache-2.0 +sphinx>=2.0.0,!=2.1.0,<7.0.0 # BSD +openstackdocstheme>=3.5.0 # Apache-2.0 +doc8>=0.8.1 # Apache-2.0 +hieroglyph>=2.1.0 # BSD diff --git a/tox.ini b/tox.ini index cb0089d3..00354300 100644 --- a/tox.ini +++ b/tox.ini @@ -8,7 +8,7 @@ ignore_basepython_conflict = True basepython = python3 setenv = VIRTUAL_ENV={envdir} deps = -r{toxinidir}/test-requirements.txt -whitelist_externals = +allowlist_externals = mkdir rm rsync @@ -38,6 +38,13 @@ commands = mv doc/upstream-training/source/upstream-training.pot doc/upstream-training/source/locale/upstream-training.pot" [testenv:publishdocs] +allowlist_externals = + mkdir + rm + rsync + bash + {toxinidir}/tools/add-marker.sh + {toxinidir}/tools/buildlang.sh # These are needed for writing the root-marker passenv = ZUUL* commands =