Clean .tox files (#3024)

.travis.yml

@@ -200,7 +200,7 @@ jobs:
     - stage: test
       env: CHECK=nginx_ingress_controller PYTHON3=true
     - stage: test
-      env: CHECK=ntp
+      env: CHECK=ntp PYTHON3=true
     - stage: test
       env: CHECK=openldap PYTHON3=true
     - stage: test

active_directory/tox.ini

@@ -1,8 +1,8 @@
 [tox]
 minversion = 2.0
-basepython = py27
+basepython = py36
 envlist =
-    {py27,py36}-active_directory
+    py{27,36}-active_directory
     flake8
 
 [testenv]
@@ -17,6 +17,7 @@ commands =
     pytest -v
 
 [testenv:flake8]
+platform = linux|darwin|win32
 skip_install = true
 deps = flake8
 commands = flake8 .

activemq_xml/tox.ini

@@ -1,8 +1,8 @@
 [tox]
 minversion = 2.0
-basepython = py27
+basepython = py36
 envlist =
-    {py27,py36}-activemq_xml,
+    py{27,36}-activemq_xml
     flake8
 
 [testenv]
@@ -25,5 +25,5 @@ deps = flake8
 commands = flake8 .
 
 [flake8]
-exclude = .eggs,.tox
+exclude = .eggs,.tox,build
 max-line-length = 120

agent_metrics/tox.ini

@@ -1,13 +1,13 @@
 [tox]
 minversion = 2.0
-basepython = py27
+basepython = py36
 envlist =
     agent_metrics
     flake8
 
 [testenv]
 usedevelop = true
-platform = darwin|linux|win32
+platform = linux|darwin|win32
 
 [testenv:agent_metrics]
 deps =

aspdotnet/tox.ini

@@ -1,8 +1,8 @@
 [tox]
 minversion = 2.0
-basepython = py27
+basepython = py36
 envlist =
-    {py27,py36}-aspdotnet
+    py{27,36}-aspdotnet
     flake8
 
 [testenv]
@@ -17,6 +17,7 @@ commands =
     pytest -v
 
 [testenv:flake8]
+platform = linux|darwin|win32
 skip_install = true
 deps = flake8
 commands = flake8 .

btrfs/tox.ini

@@ -1,13 +1,13 @@
 [tox]
 minversion = 2.0
-basepython = py27
+basepython = py36
 envlist =
-    {py27,py36}-btrfs
+    py{27,36}-btrfs
     flake8
 
 [testenv]
 usedevelop = true
-platform = linux2|darwin
+platform = linux|darwin
 deps =
     -e../datadog_checks_base[deps]
     -rrequirements-dev.txt
@@ -16,10 +16,11 @@ commands =
     pytest -v
 
 [testenv:flake8]
+platform = linux|darwin|win32
 skip_install = true
 deps = flake8
 commands = flake8 .
 
 [flake8]
-exclude = .eggs,.tox
+exclude = .eggs,.tox,build
 max-line-length = 120

cacti/tox.ini

@@ -1,13 +1,13 @@
 [tox]
 minversion = 2.0
-basepython = py27
+basepython = py36
 envlist =
-    {py27,py36}-cacti
+    py{27,36}-cacti
     flake8
 
 [testenv]
 usedevelop = true
-platform = linux2|darwin|win32
+platform = linux|darwin|win32
 deps =
     -e../datadog_checks_base[deps]
     -rrequirements-dev.txt
@@ -21,5 +21,5 @@ deps = flake8
 commands = flake8 .
 
 [flake8]
-exclude = .eggs,.tox
+exclude = .eggs,.tox,build
 max-line-length = 120

cassandra_nodetool/tox.ini

@@ -1,9 +1,8 @@
 [tox]
 minversion = 2.0
-basepython = py27
+basepython = py36
 envlist =
-    {py27,py36}
-    unit
+    py{27,36}-{2.1,unit}
     flake8
 
 [testenv]
@@ -13,31 +12,22 @@ deps =
     -e../datadog_checks_base[deps]
     -rrequirements-dev.txt
 setenv =
-    CASSANDRA_VERSION=2.1.14
+    2.1: CASSANDRA_VERSION=2.1.14
     CONTAINER_PORT=7199
 passenv =
     DOCKER*
     COMPOSE*
     JMX_*
 commands =
     pip install -r requirements.in
-    pytest -m"integration" -v
-
-[testenv:unit]
-deps =
-    -e../datadog_checks_base[deps]
-    -rrequirements-dev.txt
-setenv =
-    CONTAINER_PORT=7199
-commands =
-    pip install -r requirements.in
-    pytest -m"not integration" -v
+    2.1: pytest -m"integration" -v
+    unit: pytest -m"not integration" -v
 
 [testenv:flake8]
 skip_install = true
 deps = flake8
 commands = flake8 .
 
 [flake8]
-exclude = .eggs,.tox
+exclude = .eggs,.tox,build
 max-line-length = 120

ceph/tox.ini

@@ -1,8 +1,8 @@
 [tox]
 minversion = 2.0
-basepython = py27
+basepython = py36
 envlist =
-    {py27,py36}-latest
+    py{27,36}-latest
     flake8
 
 [testenv]

cisco_aci/tox.ini

@@ -1,8 +1,8 @@
 [tox]
 minversion = 2.0
-basepython = py27
+basepython = py36
 envlist =
-  {py27,py36}-unit
+  py{27,36}-unit
   flake8
 
 [testenv]
@@ -19,5 +19,5 @@ deps = flake8
 commands = flake8 .
 
 [flake8]
-exclude = .eggs,.tox
+exclude = .eggs,.tox,build
 max-line-length = 160

cockroachdb/tox.ini

@@ -1,10 +1,9 @@
 [tox]
 minversion = 2.0
 skip_missing_interpreters = true
-basepython = py27
+basepython = py36
 envlist =
-    {py27,py36}-cockroachdb
-    cockroachdb-2.0.5
+    py{27,36}-(latest,2.0.5}
     flake8
     bench
 
@@ -19,24 +18,21 @@ passenv =
     COMPOSE*
 setenv =
     COCKROACHDB_VERSION=latest
+    2.0.5: COCKROACHDB_VERSION=v2.0.5
 commands =
     pip install -r requirements.in
-    pytest
+    pytest -v
 
-[testenv:cockroachdb-2.0.5]
-setenv =
-    COCKROACHDB_VERSION=v2.0.5
+[testenv:bench]
+commands =
+    pip install -r requirements.in
+    pytest -v
 
 [testenv:flake8]
 skip_install = true
 deps = flake8
 commands = flake8 .
 
-[testenv:bench]
-commands =
-    pip install -r requirements.in
-    pytest
-
 [flake8]
 exclude = .eggs,.tox,build
 max-line-length = 120

coredns/tox.ini

@@ -1,8 +1,8 @@
 [tox]
 minversion = 2.0
-basepython = py27
+basepython = py36
 envlist =
-    {py27,py36}-{1.2.0}
+    py{27,36}-{1.2.0}
     flake8
 
 [testenv]
@@ -26,5 +26,5 @@ deps = flake8
 commands = flake8 .
 
 [flake8]
-exclude = .eggs,.tox
+exclude = .eggs,.tox,build
 max-line-length = 120

couch/tox.ini

@@ -1,9 +1,8 @@
 [tox]
 minversion = 2.0
-basepython = py27
+basepython = py36
 envlist =
-  {py27,py36}-1.6
-  {py27,py36}-2.0
+  py{27,36}-{1.6,2.0}
   flake8
 
 [testenv]
@@ -20,8 +19,8 @@ setenv =
   2.0: COUCH_VERSION=2.0-dev
 commands =
   pip install -r requirements.in
-  {1.6}: pytest -v -mintegration -mv1
-  {2.0}: pytest -v -mintegration -mv2
+  1.6: pytest -v -mintegration -mv1
+  2.0: pytest -v -mintegration -mv2
 
 [testenv:flake8]
 skip_install = true

couchbase/tox.ini

@@ -1,9 +1,8 @@
 [tox]
 minversion = 2.0
-basepython = py27
+basepython = py36
 envlist =
-    unit
-    5.5.3
+    py{27,36}-{5.5.3,unit}
     flake8
 
 [testenv]
@@ -26,5 +25,5 @@ deps = flake8
 commands = flake8 .
 
 [flake8]
-exclude = .eggs,.tox
+exclude = .eggs,.tox,build
 max-line-length = 120

crio/tox.ini

@@ -1,9 +1,9 @@
 [tox]
 minversion = 2.0
 skip_missing_interpreters = true
-basepython = py27
+basepython = py36
 envlist =
-    {py27,py36}-crio
+    py{27,36}-crio
     flake8
 
 [testenv]

datadog_checks_base/tox.ini

@@ -2,7 +2,7 @@
 minversion = 2.0
 skip_missing_interpreters = true
 envlist =
-    py{27,36,37}
+    py{27,36}
     flake8
 
 [testenv]

datadog_checks_dev/datadog_checks/dev/tooling/templates/check/{check_name}/tox.ini

@@ -1,9 +1,9 @@
 [tox]
 minversion = 2.0
 skip_missing_interpreters = true
-basepython = py27
+basepython = py36
 envlist =
-    {{py27,py36}}-{check_name}
+    py{{27,36}}-{check_name}
     flake8
 
 [testenv]

datadog_checks_dev/tox.ini

@@ -3,7 +3,7 @@ minversion = 2.0
 skip_missing_interpreters = true
 basepython = py36
 envlist =
-    {py27,py36,py37}-{docker,default}
+    py{27,36}-{docker,default}
     flake8
 
 [testenv]

directory/tox.ini

@@ -1,9 +1,9 @@
 [tox]
 minversion = 2.0
 skip_missing_interpreters = true
-basepython = py27
+basepython = py36
 envlist =
-    {py27,py36}-directory
+    py{27,36}-directory
     flake8
     bench
 
@@ -17,16 +17,16 @@ commands =
     pip install -r requirements.in
     pytest -v --benchmark-skip
 
-[testenv:flake8]
-skip_install = true
-deps = flake8
-commands = flake8 .
-
 [testenv:bench]
 commands =
     pip install -r requirements.in
     pytest --benchmark-only --benchmark-cprofile=tottime
 
+[testenv:flake8]
+skip_install = true
+deps = flake8
+commands = flake8 .
+
 [flake8]
-exclude = .eggs,.tox
+exclude = .eggs,.tox,build
 max-line-length = 120