From 8e062266822f4b594a05d27b748f570e6ebf45db Mon Sep 17 00:00:00 2001
From: Davanum Srinivas <davanum@gmail.com>
Date: Sat, 14 Nov 2015 23:06:55 -0500
Subject: Remove python 2.6 and cleanup tox.ini

* Remove support for python 2.6
* Remove skipsdist : Needs to be set only if
  sdist is expensive
* Remove usedevelop : only needed when skipsdist
  is set to True
* Remove install_command : We can just use the
  default, we don't need to override
* Remove setenv : We can just use the default as
  we don't need any extra environment variables
* Remove requirements.txt from deps, as this is
  already added automatically

Change-Id: Iaeec42e9cf4fb01841e048f265f44772b6615050
---
 tox.ini | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

(limited to 'tox.ini')

diff --git a/tox.ini b/tox.ini
index d17eb24..c826d09 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,19 +1,9 @@
 [tox]
 minversion = 1.6
-envlist = py34,py26,py27,pep8
-# NOTE(dhellmann): We do not set skipdist=True for oslo libraries
-# because we want to ensure packages always build.
-#skipsdist = True
+envlist = py34,py27,pep8
 
 [testenv]
-# NOTE(dhellmann): We do not set usedevelop=True
-# for oslo libraries because we have skipdist=False.
-#usedevelop = True
-install_command = pip install -U {opts} {packages}
-setenv =
-   VIRTUAL_ENV={envdir}
-deps = -r{toxinidir}/requirements.txt
-       -r{toxinidir}/test-requirements.txt
+deps = -r{toxinidir}/test-requirements.txt
 commands = python setup.py testr --slowest --testr-args='{posargs}'
 
 [testenv:pep8]
-- 
cgit v1.2.1