tox.ini: Tidy up command conditionals

Remove the "py{35,36,37}" part of the conditionals in the "commands"
section of [testenv]. These are redundant as they will match all our test
environments.

1 files changed, 11 insertions, 12 deletions

diff --git a/tox.ini b/tox.ini
index 82e0f13ee..3d2d6c77b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -13,17 +13,17 @@ skip_missing_interpreters = true
 [testenv]
 commands =
     # Running with coverage reporting enabled
-    py{35,36,37}-!external-!nocover: pytest --basetemp {envtmpdir} --cov=buildstream --cov-config .coveragerc {posargs}
-    py{35,36,37}-!nocover: mkdir -p .coverage-reports
+    !external-!nocover: pytest --basetemp {envtmpdir} --cov=buildstream --cov-config .coveragerc {posargs}
+    !nocover: mkdir -p .coverage-reports
     external-!nocover: {envpython} {toxinidir}/tests/external_plugins.py {envtmpdir} --cov=buildstream --cov-append {posargs}
-    py{35,36,37}-!nocover: mv {envtmpdir}/.coverage {toxinidir}/.coverage-reports/.coverage.{env:COVERAGE_PREFIX:}{envname}
+    !nocover: mv {envtmpdir}/.coverage {toxinidir}/.coverage-reports/.coverage.{env:COVERAGE_PREFIX:}{envname}
     # Running with coverage reporting disabled
-    py{35,36,37}-!external-nocover: pytest --basetemp {envtmpdir} {posargs}
+    !external-nocover: pytest --basetemp {envtmpdir} {posargs}
     external-nocover: {envpython} {toxinidir}/tests/external_plugins.py {envtmpdir} {posargs}
 deps =
-    py{35,36,37}: -rrequirements/requirements.txt
-    py{35,36,37}: -rrequirements/dev-requirements.txt
-    py{35,36,37}: -rrequirements/plugin-requirements.txt
+    -rrequirements/requirements.txt
+    -rrequirements/dev-requirements.txt
+    -rrequirements/plugin-requirements.txt
 
     # Only require coverage and pytest-cov when using it
     !nocover: -rrequirements/cov-requirements.txt
@@ -46,13 +46,12 @@ passenv =
 # These keys are not inherited by any other sections
 #
 setenv =
-    py{35,36,37}: COVERAGE_FILE = {envtmpdir}/.coverage
-    py{35,36,37}: XDG_CACHE_HOME = {envtmpdir}/cache
-    py{35,36,37}: XDG_CONFIG_HOME = {envtmpdir}/config
-    py{35,36,37}: XDG_DATA_HOME = {envtmpdir}/share
+    COVERAGE_FILE = {envtmpdir}/.coverage
+    XDG_CACHE_HOME = {envtmpdir}/cache
+    XDG_CONFIG_HOME = {envtmpdir}/config
+    XDG_DATA_HOME = {envtmpdir}/share
 
 whitelist_externals =
-    py{35,36,37}:
         mv
         mkdir