openstack/openstack-ansible
Code Issues Proposed changes

Update hacking for Python3

Browse Source 
The repo is Python 3 now, so update hacking to version 3.0 which
supports Python 3.

Fix problems found.

Depends-On: https://review.opendev.org/722854
Change-Id: I190f32b2eea20024c71fc74bac7f5d011768473c
This commit is contained in:
Andreas Jaeger
2020-04-10 14:29:37 +02:00
committed by Jonathan Rosser
parent d719094a04
commit 2860f1bda5
9 changed files with 97 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
deploy-guide/source/conf.py
View File

@@ -23,8 +23,8 @@
# serve to show the default.
import os
import sys
import subprocess
import sys
import openstackdocstheme
@@ -46,18 +46,22 @@ title = 'OpenStack-Ansible Documentation'
current_series = openstackdocstheme.ext._get_series_name()
if current_series == "latest":
latest_tag = "master"
rdo_series = previous_series_name
suse_series = previous_series_name.capitalize()
latest_tag = "master"
rdo_series = previous_series_name
suse_series = previous_series_name.capitalize()
else:
series_names = current_series.capitalize()
latest_tag = subprocess.check_output(["git", "describe", "--abbrev=0", "--tag"]).strip().decode()
rdo_series = current_series_name
suse_series = current_series_name.capitalize()
series_names = current_series.capitalize()
latest_tag = subprocess.check_output(["git", "describe", "--abbrev=0",
"--tag"]).strip().decode()
rdo_series = current_series_name
suse_series = current_series_name.capitalize()
deploy_guide_prefix = "https://docs.openstack.org/project-deploy-guide/openstack-ansible/{}/%s".format(current_series)
dev_docs_prefix = "https://docs.openstack.org/openstack-ansible/{}/%s".format(current_series)
role_docs_prefix = "https://docs.openstack.org/openstack-ansible-%s/{}".format(current_series)
deploy_guide_prefix = ("https://docs.openstack.org/project-deploy-guide/"
"openstack-ansible/{}/%s".format(current_series))
dev_docs_prefix = ("https://docs.openstack.org/openstack-ansible/"
"{}/%s".format(current_series))
role_docs_prefix = ("https://docs.openstack.org/openstack-ansible-"
"%s/{}".format(current_series))
# Substitutions loader
rst_epilog = """
@@ -65,14 +69,14 @@ rst_epilog = """
.. |rdo_series| replace:: {rdo_series}
.. |suse_series| replace:: {suse_series}
""".format(
latest_tag=latest_tag,
rdo_series=rdo_series,
suse_series=suse_series
latest_tag=latest_tag,
rdo_series=rdo_series,
suse_series=suse_series
)
# Format: Reference name: (string containing %s for substitution, linkname)
extlinks = {'deploy_guide': (deploy_guide_prefix, ''),
'dev_docs': (dev_docs_prefix, ''),
'dev_docs': (dev_docs_prefix, ''),
'role_docs': (role_docs_prefix, '')
}
@@ -98,7 +102,7 @@ extensions = [
]
# Add any paths that contain templates here, relative to this directory.
#templates_path = ['_templates']
# templates_path = ['_templates']
# The suffix of source filenames.
source_suffix = '.rst'