From 9214f1e206bd18b9fbc151b47368c8c3c4464f2c Mon Sep 17 00:00:00 2001 From: Ryan Beisner Date: Thu, 1 Nov 2018 12:15:43 -0500 Subject: [PATCH] Update tox to remove py27 target Change-Id: I26aa26b87d731946dac12da5a356b757551925cf --- .stestr.conf | 3 +++ tox.ini | 11 ++++++----- 2 files changed, 9 insertions(+), 5 deletions(-) create mode 100644 .stestr.conf diff --git a/.stestr.conf b/.stestr.conf new file mode 100644 index 00000000..5fcccaca --- /dev/null +++ b/.stestr.conf @@ -0,0 +1,3 @@ +[DEFAULT] +test_path=./unit_tests +top_dir=./ diff --git a/tox.ini b/tox.ini index 730d7bfe..75ab0bc2 100644 --- a/tox.ini +++ b/tox.ini @@ -2,9 +2,8 @@ # This file is managed centrally by release-tools and should not be modified # within individual charm repos. [tox] -envlist = pep8,py27,py3{5,6} +envlist = pep8,py3 skipsdist = True -skip_missing_interpreters = True [testenv] setenv = VIRTUAL_ENV={envdir} @@ -17,9 +16,6 @@ commands = ostestr {posargs} whitelist_externals = juju passenv = HOME TERM AMULET_* CS_API_* -[testenv:py27] -commands = /bin/true - [testenv:py35] basepython = python3.5 deps = -r{toxinidir}/requirements.txt @@ -30,6 +26,11 @@ basepython = python3.6 deps = -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt +[testenv:py3] +basepython = python3 +deps = -r{toxinidir}/requirements.txt + -r{toxinidir}/test-requirements.txt + [testenv:pep8] basepython = python3 deps = -r{toxinidir}/requirements.txt