Merge "Cleanup py27 support"

doc/requirements.txt

@@ -1,8 +1,8 @@
 # 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.
-sphinx!=1.6.6,<1.7.0,>=1.6.2 # BSD
-openstackdocstheme>=1.18.1 # Apache-2.0
+sphinx>=2.0.0 # BSD
+openstackdocstheme>=1.32.1 # Apache-2.0
 sphinxcontrib-actdiag # BSD
 sphinxcontrib-blockdiag # BSD
 sphinxcontrib-nwdiag # BSD

doc/source/conf.py

@@ -12,8 +12,6 @@
 # serve to show the default.
 
 import datetime
-import sys
-import os
 
 # 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
@@ -27,7 +25,7 @@ import os
 
 # Add any Sphinx extension module names here, as strings. They can be extensions
 # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
-extensions = ['sphinx.ext.autodoc',
+extensions = [
               'sphinx.ext.todo',
               'sphinx.ext.viewcode',
               'sphinxcontrib.blockdiag',
@@ -129,10 +127,6 @@ html_theme = 'openstackdocs'
 # pixels large.
 #html_favicon = None
 
-# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
-# using the given strftime format.
-html_last_updated_fmt = '%Y-%m-%d %H:%M'
-
 # If true, SmartyPants will be used to convert quotes and dashes to
 # typographically correct entities.
 #html_use_smartypants = True

setup.cfg

@@ -10,6 +10,3 @@ classifier =
     Intended Audience :: Developers
     License :: OSI Approved :: Apache Software License
     Operating System :: POSIX :: Linux
-
-[wheel]
-universal = 1

tox.ini

@@ -4,19 +4,17 @@ envlist = pep8,docs
 skipsdist = True
 
 [testenv]
+basepython = python3
 usedevelop = True
 setenv = VIRTUAL_ENV={envdir}
-install_command = pip install -U {opts} {packages}
 deps =
   -r{toxinidir}/test-requirements.txt
   -r{toxinidir}/doc/requirements.txt
 
 [testenv:venv]
-basepython = python3
 commands = {posargs}
 
 [testenv:docs]
-basepython = python3
 deps = -r{toxinidir}/doc/requirements.txt
 whitelist_externals = rm
 commands =
@@ -24,7 +22,6 @@ commands =
   sphinx-build -W -b html doc/source doc/build/html
 
 [testenv:pep8]
-basepython = python3
 commands =
   flake8
   doc8 --ignore D001 specs/ doc/source README.rst