From 268ca4972e208f3ed483da8615a3aa8a71694761 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Tue, 7 Apr 2020 13:13:45 +0200 Subject: [PATCH] Small cleanups Remove install_command from tox.ini, the default is good enough Remove obsolete sections from setup.cfg, update git URL. Change-Id: I0fb397e32499b90a2ecd8e5fb0489a58e6017827 --- setup.cfg | 13 +------------ tox.ini | 2 +- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/setup.cfg b/setup.cfg index 25d0a814..453626f7 100644 --- a/setup.cfg +++ b/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 diff --git a/tox.ini b/tox.ini index 1485eaa8..73f615c7 100644 --- a/tox.ini +++ b/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}