From d64925a8891750bd8883f61248c4db5d3cf8a5bb Mon Sep 17 00:00:00 2001
From: Witold Bedyk <witold.bedyk@est.fujitsu.com>
Date: Tue, 27 Mar 2018 11:20:02 +0200
Subject: [PATCH] Clean up tox.ini

* move common commands to [testenv]
* move constraint file to deps
* remove redundant statements

Change-Id: Id6d21e39f2db8a32a479bb6331a25da4c28e7bfd
---
 tox.ini | 42 ++++++------------------------------------
 1 file changed, 6 insertions(+), 36 deletions(-)

diff --git a/tox.ini b/tox.ini
index 5990b01..1c4ad45 100644
--- a/tox.ini
+++ b/tox.ini
@@ -5,66 +5,36 @@ skipsdist = True
 
 [testenv]
 usedevelop = True
-install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages}
+install_command = pip install {opts} {packages}
 setenv =
     PYTHONUNBUFFERED=1
     VIRTUAL_ENV={envdir}
     OS_TEST_PATH=tests/unit
-deps = -r{toxinidir}/requirements.txt
-       -r{toxinidir}/test-requirements.txt
-       psutil==3.0.1
+deps =
+  -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
+  -r{toxinidir}/requirements.txt
+  -r{toxinidir}/test-requirements.txt
+  psutil==3.0.1
 whitelist_externals = bash
                       find
 commands =
   find . -type f -name "*.pyc" -delete
-
-
-[testenv:py27]
-basepython = python2.7
-setenv = {[testenv]setenv}
-         OS_TEST_PATH=tests/unit
-whitelist_externals =
-  {[testenv]whitelist_externals}
-deps =
-  {[testenv]deps}
-commands =
-  ostestr {posargs}
-
-[testenv:py35]
-basepython = python3.5
-setenv = {[testenv]setenv}
-         OS_TEST_PATH=tests/unit
-whitelist_externals =
-  {[testenv]whitelist_externals}
-deps =
-  {[testenv]deps}
-commands =
   ostestr {posargs}
 
 [testenv:functional]
 basepython = python2.7
-install_command = {[testenv]install_command}
 setenv = {[testenv]setenv}
          SPARK_HOME=/opt/spark/current
          SPARK_SCALA_VERSION=2.10
          OS_TEST_PATH=tests/functional
-whitelist_externals =
-  {[testenv]whitelist_externals}
-deps =
-  {[testenv]deps}
 commands =
   ostestr --serial {posargs}
 
 [testenv:functional-py35]
 basepython = python3.5
-install_command = {[testenv]install_command}
 setenv = {[testenv]setenv}
          SPARK_HOME=/opt/spark/current
          OS_TEST_PATH=tests/functional
-whitelist_externals =
-  {[testenv]whitelist_externals}
-deps =
-  {[testenv]deps}
 commands =
   ostestr --serial {posargs}