From 4af4e0271da3e2bd8e24fce05c675d742c6051b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herv=C3=A9=20Beraud?= <hberaud@redhat.com>
Date: Tue, 11 Feb 2020 15:23:09 +0100
Subject: trivial: Cleanup tox.ini

Update the minversion parameter to use the python -m pip to install
python packages:

https://tox.readthedocs.io/en/latest/changelog.html#id185

Also Inherit the jobs requirements to simplify maintainance.

Change-Id: Icb5116908148dcbb58a7531bbed498d29ca1d2ea
---
 tox.ini | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'tox.ini')

diff --git a/tox.ini b/tox.ini
index d0f4193..216edd0 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-minversion = 3.1
+minversion = 3.2.0
 envlist = py37,pep8
 ignore_basepython_conflict = True
 
@@ -8,7 +8,6 @@ basepython = python3
 deps =
   -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
   -r{toxinidir}/test-requirements.txt
-  -r{toxinidir}/requirements.txt
 # We want to support both vanilla stdlib and eventlet monkey patched
 whitelist_externals = env
 commands =
@@ -16,8 +15,7 @@ commands =
   env TEST_EVENTLET=1 lockutils-wrapper stestr run --slowest {posargs}
 
 [testenv:pep8]
-deps =
-  -r{toxinidir}/test-requirements.txt
+deps = {[testenv]deps}
 commands =
   flake8
   # Run security linter
@@ -29,7 +27,7 @@ commands = {posargs}
 [testenv:docs]
 whitelist_externals = rm
 deps =
-  {[testenv]deps}
+  -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt}
   -r{toxinidir}/doc/requirements.txt
 commands =
   rm -fr doc/build
@@ -54,7 +52,7 @@ import_exceptions =
   oslo_concurrency._i18n
 
 [testenv:releasenotes]
-deps = -r{toxinidir}/doc/requirements.txt
+deps = {[testenv:docs]deps}
 commands =
   sphinx-build -a -E -W -d releasenotes/build/doctrees --keep-going -b html releasenotes/source releasenotes/build/html
 
-- 
cgit v1.2.1