Merge "Small cleanups"

setup.cfg

@@ -5,19 +5,8 @@ description-file =
     README.rst
 author = OpenStack
 author-email = openstack-discuss@lists.openstack.org
-home-page = https://git.openstack.org/cgit/openstack/training-guides/
+home-page = https://opendev.org/openstack/training-guides/
 classifier =
     Intended Audience :: Developers
     License :: OSI Approved :: Apache Software License
     Operating System :: POSIX :: Linux
-
-[build_sphinx]
-all_files = 1
-build-dir = doc/upstream-training/build
-source-dir = doc/upstream-training/source
-
-[pbr]
-warnerrors = True
-
-[wheel]
-universal = 1

tox.ini

@@ -7,7 +7,6 @@ ignore_basepython_conflict = True
 [testenv]
 basepython = python3
 setenv = VIRTUAL_ENV={envdir}
-install_command = pip install -U {opts} {packages}
 deps = -r{toxinidir}/test-requirements.txt
 whitelist_externals =
   echo
@@ -42,6 +41,7 @@ commands =
     mv doc/upstream-training/source/upstream-training.pot doc/upstream-training/source/locale/upstream-training.pot"
 
 [testenv:publishdocs]
+# These are needed for writing the root-marker
 passenv = ZUUL*
 commands =
   {[testenv:upstream-slides]commands}