Small cleanups

With newer openstackdocstheme versions, many settings like
html_last_updated_fmt and latex are setup correctly and don't need to
setup in this repo anymore. We require a new enough version, so remove
the obsolete settings.

This repo now requires python 3, so remove python 2.7.x support.

Update hacking to current version supporting python 3.

Change-Id: I238eefeed275fe8115d0e253ca50d38086934b1e

doc/api-quick-start/setup.py

@@ -2,5 +2,5 @@
 import setuptools
 
 setuptools.setup(
-    setup_requires=['pbr'],
+    setup_requires=['pbr>=2.0.0'],
     pbr=True)

doc/api-quick-start/source/conf.py

@@ -20,8 +20,7 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 
-import os
+# import os
-import subprocess
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
@@ -160,7 +159,7 @@ html_theme_options = {"sidebar_dropdown": "api_ref",
 # So that we can enable "log-a-bug" links from each output HTML page, this
 # variable must be set to a format that includes year, month, day, hours and
 # minutes.
-html_last_updated_fmt = '%Y-%m-%d %H:%M'
+# html_last_updated_fmt = '%Y-%m-%d %H:%M'
 
 # If true, SmartyPants will be used to convert quotes and dashes to
 # typographically correct entities.
@@ -208,17 +207,6 @@ html_copy_source = False
 
 # -- Options for LaTeX output ---------------------------------------------
 
-latex_elements = {
-    # The paper size ('letterpaper' or 'a4paper').
-    # 'papersize': 'letterpaper',
-
-    # The font size ('10pt', '11pt' or '12pt').
-    # 'pointsize': '10pt',
-
-    # Additional stuff for the LaTeX preamble.
-    # 'preamble': '',
-}
-
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title,
 #  author, documentclass [howto, manual, or own class]).

doc/common/source/conf.py

@@ -20,7 +20,7 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 
-import os
+# import os
 # import sys
 
 

doc/doc-contrib-guide/setup.py

@@ -17,14 +17,6 @@
 # THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT
 import setuptools
 
-# In python < 2.7.4, a lazy loading of package `pbr` will break
-# setuptools if some other modules registered functions in `atexit`.
-# solution from: http://bugs.python.org/issue15881#msg170215
-try:
-    import multiprocessing  # noqa
-except ImportError:
-    pass
-
 setuptools.setup(
-    setup_requires=['pbr'],
+    setup_requires=['pbr>=2.0.0'],
     pbr=True)

doc/doc-contrib-guide/source/api-guides.rst

@@ -111,9 +111,6 @@ The basic steps are:
         "sidebar_mode": "toc",
     }
 
-    # Must set this variable to include year, month, day, hours, and minutes.
-    html_last_updated_fmt = '%Y-%m-%d %H:%M'
-
 #. Update the ``test-requirements.txt`` file for the project with a line for
    the ``os-api-ref`` Sphinx extension::
 

doc/doc-contrib-guide/source/conf.py

@@ -20,7 +20,7 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 
-import os
+# import os
 # import sys
 
 
@@ -160,7 +160,7 @@ html_theme_options = {
 # So that we can enable "log-a-bug" links from each output HTML page, this
 # variable must be set to a format that includes year, month, day, hours and
 # minutes.
-html_last_updated_fmt = '%Y-%m-%d %H:%M'
+# html_last_updated_fmt = '%Y-%m-%d %H:%M'
 
 
 # If true, SmartyPants will be used to convert quotes and dashes to
@@ -209,28 +209,6 @@ html_copy_source = False
 
 # -- Options for LaTeX output ---------------------------------------------
 
-latex_engine = 'xelatex'
-
-latex_elements = {
-    # The paper size ('letterpaper' or 'a4paper').
-    # 'papersize': 'letterpaper',
-
-    # set font (TODO: different fonts for translated PDF document builds)
-    'fontenc': '\\usepackage{fontspec}',
-    'fontpkg': '''\
-\defaultfontfeatures{Scale=MatchLowercase}
-\setmainfont{Liberation Serif}
-\setsansfont{Liberation Sans}
-\setmonofont[SmallCapsFont={Liberation Mono}]{Liberation Mono}
-''',
-
-    # The font size ('10pt', '11pt' or '12pt').
-    # 'pointsize': '10pt',
-
-    # Additional stuff for the LaTeX preamble.
-    # 'preamble': '',
-}
-
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title,
 #  author, documentclass [howto, manual, or own class]).

doc/glossary/setup.py

@@ -17,14 +17,6 @@
 # THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT
 import setuptools
 
-# In python < 2.7.4, a lazy loading of package `pbr` will break
-# setuptools if some other modules registered functions in `atexit`.
-# solution from: http://bugs.python.org/issue15881#msg170215
-try:
-    import multiprocessing  # noqa
-except ImportError:
-    pass
-
 setuptools.setup(
-    setup_requires=['pbr'],
+    setup_requires=['pbr>2.0.0'],
     pbr=True)

doc/glossary/source/conf.py

@@ -20,7 +20,7 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 
-import os
+# import os
 # import sys
 
 
@@ -159,7 +159,7 @@ html_theme_options = {
 # So that we can enable "log-a-bug" links from each output HTML page, this
 # variable must be set to a format that includes year, month, day, hours and
 # minutes.
-html_last_updated_fmt = '%Y-%m-%d %H:%M'
+# html_last_updated_fmt = '%Y-%m-%d %H:%M'
 
 
 # If true, SmartyPants will be used to convert quotes and dashes to
@@ -208,28 +208,6 @@ html_copy_source = False
 
 # -- Options for LaTeX output ---------------------------------------------
 
-latex_engine = 'xelatex'
-
-latex_elements = {
-    # The paper size ('letterpaper' or 'a4paper').
-    # 'papersize': 'letterpaper',
-
-    # set font (TODO: different fonts for translated PDF document builds)
-    'fontenc': '\\usepackage{fontspec}',
-    'fontpkg': '''\
-\defaultfontfeatures{Scale=MatchLowercase}
-\setmainfont{Liberation Serif}
-\setsansfont{Liberation Sans}
-\setmonofont[SmallCapsFont={Liberation Mono}]{Liberation Mono}
-''',
-
-    # The font size ('10pt', '11pt' or '12pt').
-    # 'pointsize': '10pt',
-
-    # Additional stuff for the LaTeX preamble.
-    # 'preamble': '',
-}
-
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title,
 #  author, documentclass [howto, manual, or own class]).

doc/image-guide/setup.py

@@ -17,14 +17,6 @@
 # THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT
 import setuptools
 
-# In python < 2.7.4, a lazy loading of package `pbr` will break
-# setuptools if some other modules registered functions in `atexit`.
-# solution from: http://bugs.python.org/issue15881#msg170215
-try:
-    import multiprocessing  # noqa
-except ImportError:
-    pass
-
 setuptools.setup(
-    setup_requires=['pbr'],
+    setup_requires=['pbr>=2.0.0'],
     pbr=True)

doc/image-guide/source/conf.py

@@ -20,11 +20,9 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 
-import os
+# import os
 # import sys
 
-import openstackdocstheme
-
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
@@ -155,7 +153,7 @@ html_theme_options = {
 # So that we can enable "log-a-bug" links from each output HTML page, this
 # variable must be set to a format that includes year, month, day, hours and
 # minutes.
-html_last_updated_fmt = '%Y-%m-%d %H:%M'
+# html_last_updated_fmt = '%Y-%m-%d %H:%M'
 
 # If true, SmartyPants will be used to convert quotes and dashes to
 # typographically correct entities.
@@ -201,32 +199,6 @@ htmlhelp_basename = 'image-guide'
 html_copy_source = False
 
 # -- Options for LaTeX output ---------------------------------------------
-pdf_theme_path = openstackdocstheme.get_pdf_theme_path()
-openstack_logo = openstackdocstheme.get_openstack_logo_path()
-
-latex_custom_template = r"""
-\newcommand{\openstacklogo}{%s}
-\usepackage{%s}
-""" % (openstack_logo, pdf_theme_path)
-
-latex_engine = 'xelatex'
-
-latex_elements = {
-    # The paper size ('letterpaper' or 'a4paper').
-    'papersize': 'a4paper',
-
-    # The font size ('10pt', '11pt' or '12pt').
-    'pointsize': '11pt',
-
-    #Default figure align
-    'figure_align': 'H',
-
-    # Not to generate blank page after chapter
-    'classoptions': ',openany',
-
-    # Additional stuff for the LaTeX preamble.
-    'preamble': latex_custom_template,
-}
 
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title,

doc/install-guide/setup.py

@@ -17,14 +17,6 @@
 # THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT
 import setuptools
 
-# In python < 2.7.4, a lazy loading of package `pbr` will break
-# setuptools if some other modules registered functions in `atexit`.
-# solution from: http://bugs.python.org/issue15881#msg170215
-try:
-    import multiprocessing  # noqa
-except ImportError:
-    pass
-
 setuptools.setup(
-    setup_requires=['pbr'],
+    setup_requires=['pbr>=2.0.0'],
     pbr=True)

doc/install-guide/source/conf.py

@@ -20,11 +20,9 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 
-import os
+# import os
 # import sys
 
-import openstackdocstheme
-
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
@@ -159,7 +157,7 @@ html_theme_options = {
 # So that we can enable "log-a-bug" links from each output HTML page, this
 # variable must be set to a format that includes year, month, day, hours and
 # minutes.
-html_last_updated_fmt = '%Y-%m-%d %H:%M'
+# html_last_updated_fmt = '%Y-%m-%d %H:%M'
 
 
 # If true, SmartyPants will be used to convert quotes and dashes to
@@ -206,32 +204,6 @@ htmlhelp_basename = 'install-guide'
 html_copy_source = False
 
 # -- Options for LaTeX output ---------------------------------------------
-pdf_theme_path = openstackdocstheme.get_pdf_theme_path()
-openstack_logo = openstackdocstheme.get_openstack_logo_path()
-
-latex_custom_template = r"""
-\newcommand{\openstacklogo}{%s}
-\usepackage{%s}
-""" % (openstack_logo, pdf_theme_path)
-
-latex_engine = 'xelatex'
-
-latex_elements = {
-    # The paper size ('letterpaper' or 'a4paper').
-    'papersize': 'a4paper',
-
-    # The font size ('10pt', '11pt' or '12pt').
-    'pointsize': '11pt',
-
-    #Default figure align
-    'figure_align': 'H',
-
-    # Not to generate blank page after chapter
-    'classoptions': ',openany',
-
-    # Additional stuff for the LaTeX preamble.
-    'preamble': latex_custom_template,
-}
 
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title,

releasenotes/source/conf.py

@@ -20,7 +20,7 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 
-import os
+# import os
 # import sys
 
 # If extensions (or modules to document with autodoc) are in another directory,
@@ -147,7 +147,7 @@ html_theme = 'openstackdocs'
 # So that we can enable "log-a-bug" links from each output HTML page, this
 # variable must be set to a format that includes year, month, day, hours and
 # minutes.
-html_last_updated_fmt = '%Y-%m-%d %H:%M'
+# html_last_updated_fmt = '%Y-%m-%d %H:%M'
 
 # If true, SmartyPants will be used to convert quotes and dashes to
 # typographically correct entities.
@@ -194,17 +194,6 @@ html_copy_source = False
 
 # -- Options for LaTeX output ---------------------------------------------
 
-latex_elements = {
-    # The paper size ('letterpaper' or 'a4paper').
-    # 'papersize': 'letterpaper',
-
-    # The font size ('10pt', '11pt' or '12pt').
-    # 'pointsize': '10pt',
-
-    # Additional stuff for the LaTeX preamble.
-    # 'preamble': '',
-}
-
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title,
 #  author, documentclass [howto, manual, or own class]).

test-requirements.txt

@@ -4,7 +4,7 @@
 pbr>=2.0 # Apache-2.0
 
 # Hacking already pins down pep8, pyflakes and flake8
-hacking>=1.1.0,<1.2.0  # Apache-2.0
+hacking>=2.0.0,<2.1.0  # Apache-2.0
 
 beautifulsoup4 # MIT
 Jinja2>=2.8 # BSD License (3 clause)