Fix env names.

ionelmc · Apr 14, 2016 · 2f679c3 · 2f679c3
1 parent 35eda29
commit 2f679c3
Show file tree

Hide file tree

Showing 4 changed files with 54 additions and 54 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -9,18 +9,18 @@ env:
     - TOXENV=check
     - TOXENV=docs
 
-    - TOXENV=2.6,extension-coveralls,coveralls,codecov
-    - TOXENV=2.6-nocover
-    - TOXENV=2.7,extension-coveralls,coveralls,codecov
-    - TOXENV=2.7-nocover
-    - TOXENV=3.3,extension-coveralls,coveralls,codecov
-    - TOXENV=3.3-nocover
-    - TOXENV=3.4,extension-coveralls,coveralls,codecov
-    - TOXENV=3.4-nocover
-    - TOXENV=3.5,extension-coveralls,coveralls,codecov
-    - TOXENV=3.5-nocover
-    - TOXENV=pypy,extension-coveralls,coveralls,codecov
-    - TOXENV=pypy-nocover
+    - TOXENV=2.6-cover,extension-coveralls,coveralls,codecov
+    - TOXENV=2.6-nocov
+    - TOXENV=2.7-cover,extension-coveralls,coveralls,codecov
+    - TOXENV=2.7-nocov
+    - TOXENV=3.3-cover,extension-coveralls,coveralls,codecov
+    - TOXENV=3.3-nocov
+    - TOXENV=3.4-cover,extension-coveralls,coveralls,codecov
+    - TOXENV=3.4-nocov
+    - TOXENV=3.5-cover,extension-coveralls,coveralls,codecov
+    - TOXENV=3.5-nocov
+    - TOXENV=pypy-cover,extension-coveralls,coveralls,codecov
+    - TOXENV=pypy-nocov
 before_install:
   - python --version
   - uname -a

diff --git a/appveyor.yml b/appveyor.yml
@@ -11,103 +11,103 @@ environment:
       PYTHON_VERSION: '2.7'
       PYTHON_ARCH: '32'
 
-    - TOXENV: '2.7,codecov'
+    - TOXENV: '2.7-cover,codecov'
       TOXPYTHON: C:\Python27\python.exe
       PYTHON_HOME: C:\Python27
       PYTHON_VERSION: '2.7'
       PYTHON_ARCH: '32'
 
-    - TOXENV: '2.7,codecov'
+    - TOXENV: '2.7-cover,codecov'
       TOXPYTHON: C:\Python27-x64\python.exe
       WINDOWS_SDK_VERSION: v7.0
       PYTHON_HOME: C:\Python27-x64
       PYTHON_VERSION: '2.7'
       PYTHON_ARCH: '64'
 
-    - TOXENV: '2.7-nocover'
+    - TOXENV: '2.7-nocov'
       TOXPYTHON: C:\Python27\python.exe
       PYTHON_HOME: C:\Python27
       PYTHON_VERSION: '2.7'
       PYTHON_ARCH: '32'
 
-    - TOXENV: '2.7-nocover'
+    - TOXENV: '2.7-nocov'
       TOXPYTHON: C:\Python27-x64\python.exe
       WINDOWS_SDK_VERSION: v7.0
       PYTHON_HOME: C:\Python27-x64
       PYTHON_VERSION: '2.7'
       PYTHON_ARCH: '64'
 
-    - TOXENV: '3.3,codecov'
+    - TOXENV: '3.3-cover,codecov'
       TOXPYTHON: C:\Python33\python.exe
       PYTHON_HOME: C:\Python33
       PYTHON_VERSION: '3.3'
       PYTHON_ARCH: '32'
 
-    - TOXENV: '3.3,codecov'
+    - TOXENV: '3.3-cover,codecov'
       TOXPYTHON: C:\Python33-x64\python.exe
       WINDOWS_SDK_VERSION: v7.1
       PYTHON_HOME: C:\Python33-x64
       PYTHON_VERSION: '3.3'
       PYTHON_ARCH: '64'
 
-    - TOXENV: '3.3-nocover'
+    - TOXENV: '3.3-nocov'
       TOXPYTHON: C:\Python33\python.exe
       PYTHON_HOME: C:\Python33
       PYTHON_VERSION: '3.3'
       PYTHON_ARCH: '32'
 
-    - TOXENV: '3.3-nocover'
+    - TOXENV: '3.3-nocov'
       TOXPYTHON: C:\Python33-x64\python.exe
       WINDOWS_SDK_VERSION: v7.1
       PYTHON_HOME: C:\Python33-x64
       PYTHON_VERSION: '3.3'
       PYTHON_ARCH: '64'
 
-    - TOXENV: '3.4,codecov'
+    - TOXENV: '3.4-cover,codecov'
       TOXPYTHON: C:\Python34\python.exe
       PYTHON_HOME: C:\Python34
       PYTHON_VERSION: '3.4'
       PYTHON_ARCH: '32'
 
-    - TOXENV: '3.4,codecov'
+    - TOXENV: '3.4-cover,codecov'
       TOXPYTHON: C:\Python34-x64\python.exe
       WINDOWS_SDK_VERSION: v7.1
       PYTHON_HOME: C:\Python34-x64
       PYTHON_VERSION: '3.4'
       PYTHON_ARCH: '64'
 
-    - TOXENV: '3.4-nocover'
+    - TOXENV: '3.4-nocov'
       TOXPYTHON: C:\Python34\python.exe
       PYTHON_HOME: C:\Python34
       PYTHON_VERSION: '3.4'
       PYTHON_ARCH: '32'
 
-    - TOXENV: '3.4-nocover'
+    - TOXENV: '3.4-nocov'
       TOXPYTHON: C:\Python34-x64\python.exe
       WINDOWS_SDK_VERSION: v7.1
       PYTHON_HOME: C:\Python34-x64
       PYTHON_VERSION: '3.4'
       PYTHON_ARCH: '64'
 
-    - TOXENV: '3.5,codecov'
+    - TOXENV: '3.5-cover,codecov'
       TOXPYTHON: C:\Python35\python.exe
       PYTHON_HOME: C:\Python35
       PYTHON_VERSION: '3.5'
       PYTHON_ARCH: '32'
 
-    - TOXENV: '3.5,codecov'
+    - TOXENV: '3.5-cover,codecov'
       TOXPYTHON: C:\Python35-x64\python.exe
       PYTHON_HOME: C:\Python35-x64
       PYTHON_VERSION: '3.5'
       PYTHON_ARCH: '64'
 
-    - TOXENV: '3.5-nocover'
+    - TOXENV: '3.5-nocov'
       TOXPYTHON: C:\Python35\python.exe
       PYTHON_HOME: C:\Python35
       PYTHON_VERSION: '3.5'
       PYTHON_ARCH: '32'
 
-    - TOXENV: '3.5-nocover'
+    - TOXENV: '3.5-nocov'
       TOXPYTHON: C:\Python35-x64\python.exe
       PYTHON_HOME: C:\Python35-x64
       PYTHON_VERSION: '3.5'

diff --git a/setup.cfg b/setup.cfg
@@ -70,8 +70,8 @@ dependencies =
     :Django objproxies==0.9.4 !python_versions[2.6]
     : &python_versions[2.6]
 coverage_flags =
-    : true
-    nocover: false
+    cover: true
+    nocov: false
 environment_variables =
     -
 
diff --git a/tox.ini b/tox.ini
@@ -2,18 +2,18 @@
 envlist =
     clean,
     check,
-    2.6,
-    2.6-nocover,
-    2.7,
-    2.7-nocover,
-    3.3,
-    3.3-nocover,
-    3.4,
-    3.4-nocover,
-    3.5,
-    3.5-nocover,
-    pypy,
-    pypy-nocover,
+    2.6-cover,
+    2.6-nocov,
+    2.7-cover,
+    2.7-nocov,
+    3.3-cover,
+    3.3-nocov,
+    3.4-cover,
+    3.4-nocov,
+    3.5-cover,
+    3.5-nocov,
+    pypy-cover,
+    pypy-nocov,
     report,
     docs
 
@@ -126,7 +126,7 @@ skip_install = true
 usedevelop = false
 deps = coverage
 
-[testenv:2.6]
+[testenv:2.6-cover]
 basepython = {env:TOXPYTHON:python2.6}
 setenv =
     {[testenv]setenv}
@@ -140,10 +140,10 @@ deps =
     {[testenv]deps}
     pytest-cov
 
-[testenv:2.6-nocover]
+[testenv:2.6-nocov]
 basepython = {env:TOXPYTHON:python2.6}
 
-[testenv:2.7]
+[testenv:2.7-cover]
 basepython = {env:TOXPYTHON:python2.7}
 setenv =
     {[testenv]setenv}
@@ -159,14 +159,14 @@ deps =
     Django
     objproxies==0.9.4
 
-[testenv:2.7-nocover]
+[testenv:2.7-nocov]
 basepython = {env:TOXPYTHON:python2.7}
 deps =
     {[testenv]deps}
     Django
     objproxies==0.9.4
 
-[testenv:3.3]
+[testenv:3.3-cover]
 basepython = {env:TOXPYTHON:python3.3}
 setenv =
     {[testenv]setenv}
@@ -182,14 +182,14 @@ deps =
     Django
     objproxies==0.9.4
 
-[testenv:3.3-nocover]
+[testenv:3.3-nocov]
 basepython = {env:TOXPYTHON:python3.3}
 deps =
     {[testenv]deps}
     Django
     objproxies==0.9.4
 
-[testenv:3.4]
+[testenv:3.4-cover]
 basepython = {env:TOXPYTHON:python3.4}
 setenv =
     {[testenv]setenv}
@@ -205,14 +205,14 @@ deps =
     Django
     objproxies==0.9.4
 
-[testenv:3.4-nocover]
+[testenv:3.4-nocov]
 basepython = {env:TOXPYTHON:python3.4}
 deps =
     {[testenv]deps}
     Django
     objproxies==0.9.4
 
-[testenv:3.5]
+[testenv:3.5-cover]
 basepython = {env:TOXPYTHON:python3.5}
 setenv =
     {[testenv]setenv}
@@ -228,14 +228,14 @@ deps =
     Django
     objproxies==0.9.4
 
-[testenv:3.5-nocover]
+[testenv:3.5-nocov]
 basepython = {env:TOXPYTHON:python3.5}
 deps =
     {[testenv]deps}
     Django
     objproxies==0.9.4
 
-[testenv:pypy]
+[testenv:pypy-cover]
 basepython = {env:TOXPYTHON:pypy}
 setenv =
     {[testenv]setenv}
@@ -251,7 +251,7 @@ deps =
     Django
     objproxies==0.9.4
 
-[testenv:pypy-nocover]
+[testenv:pypy-nocov]
 basepython = {env:TOXPYTHON:pypy}
 deps =
     {[testenv]deps}