From baccd5bcfa316cec04908e21d5fd95ef52edccfe Mon Sep 17 00:00:00 2001
From: Eric Fried <openstack@fried.cc>
Date: Fri, 25 Oct 2019 09:28:16 -0500
Subject: Stop supporting and testing python2

Change-Id: If678d77b8da69121b0075bfbc4216531be25da6a
---
 tox.ini | 20 ++------------------
 1 file changed, 2 insertions(+), 18 deletions(-)

(limited to 'tox.ini')

diff --git a/tox.ini b/tox.ini
index ce99fb0b..2b9cb62d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,9 +1,10 @@
 [tox]
-envlist = py27,py37,pep8,docs
+envlist = py37,pep8,docs
 minversion = 2.0
 skipsdist = True
 
 [testenv]
+basepython = python3
 usedevelop = True
 # tox is silly... these need to be separated by a newline....
 whitelist_externals =
@@ -22,15 +23,12 @@ commands =
   stestr run {posargs}
 
 [testenv:pep8]
-basepython = python3
 commands = flake8 {posargs}
 
 [testenv:bandit]
-basepython = python3
 commands = bandit -r novaclient -n5 -x tests
 
 [testenv:venv]
-basepython = python3
 deps =
   -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
   -r{toxinidir}/test-requirements.txt
@@ -39,7 +37,6 @@ deps =
 commands = {posargs}
 
 [testenv:docs]
-basepython = python3
 deps =
   -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
   -r{toxinidir}/requirements.txt
@@ -51,7 +48,6 @@ commands =
   whereto doc/build/html/.htaccess doc/test/redirect-tests.txt
 
 [testenv:pdf-docs]
-basepython = python3
 envdir = {toxworkdir}/docs
 deps = {[testenv:docs]deps}
 commands =
@@ -60,7 +56,6 @@ commands =
   make -C doc/build/pdf
 
 [testenv:releasenotes]
-basepython = python3
 deps =
   -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
   -r{toxinidir}/requirements.txt
@@ -69,21 +64,12 @@ commands =
   sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html
 
 [testenv:functional]
-basepython = python2.7
-passenv = OS_NOVACLIENT_TEST_NETWORK
-commands =
-  stestr --test-path=./novaclient/tests/functional run --concurrency=1 {posargs}
-  python novaclient/tests/functional/hooks/check_resources.py
-
-[testenv:functional-py36]
-basepython = python3.6
 passenv = OS_NOVACLIENT_TEST_NETWORK
 commands =
   stestr --test-path=./novaclient/tests/functional run --concurrency=1 {posargs}
   python novaclient/tests/functional/hooks/check_resources.py
 
 [testenv:cover]
-basepython = python3
 setenv =
     PYTHON=coverage run --source novaclient --parallel-mode
 commands =
@@ -110,7 +96,6 @@ exclude=.venv,.git,.tox,dist,*lib/python*,*egg,build,doc/source/conf.py,releasen
 import_exceptions = novaclient.i18n
 
 [testenv:bindep]
-basepython = python3
 # Do not install any requirements. We want this to be fast and work even if
 # system dependencies are missing, since it's used to tell you what system
 # dependencies are missing! This also means that bindep must be installed
@@ -119,7 +104,6 @@ deps = bindep
 commands = bindep test
 
 [testenv:lower-constraints]
-basepython = python3
 deps =
   -c{toxinidir}/lower-constraints.txt
   -r{toxinidir}/test-requirements.txt
-- 
cgit v1.2.1