Use cannonical name for nose option.

ionelmc · ionelmc · commit de987e04c1b7 · 2015-03-28T13:51:01.000+02:00
diff --git a/.travis.yml b/.travis.yml
@@ -5,17 +5,17 @@ env:
   global:
     LD_PRELOAD=/lib/x86_64-linux-gnu/libSegFault.so
   matrix:
-    - ENV=matrix-nosetests
-    - ENV=matrix-nosetests-cext
-    - ENV=matrix-nosetests-cext-optional
-    - ENV=matrix-nosetests-fnaccents
-    - ENV=matrix-nosetests-fndoublequote
-    - ENV=matrix-nosetests-fnquote
-    - ENV=matrix-nosetests-fntriplequote
-    - ENV=matrix-nosetests-pnaccents
-    - ENV=matrix-nosetests-pndoublequote
-    - ENV=matrix-nosetests-pnquote
-    - ENV=matrix-nosetests-pntriplequote
+    - ENV=matrix-nose
+    - ENV=matrix-nose-cext
+    - ENV=matrix-nose-cext-optional
+    - ENV=matrix-nose-fnaccents
+    - ENV=matrix-nose-fndoublequote
+    - ENV=matrix-nose-fnquote
+    - ENV=matrix-nose-fntriplequote
+    - ENV=matrix-nose-pnaccents
+    - ENV=matrix-nose-pndoublequote
+    - ENV=matrix-nose-pnquote
+    - ENV=matrix-nose-pntriplequote
     - ENV=matrix-pytest
     - ENV=matrix-pytest-cext
     - ENV=matrix-pytest-cext-optional
@@ -27,17 +27,17 @@ env:
     - ENV=matrix-pytest-pndoublequote
     - ENV=matrix-pytest-pnquote
     - ENV=matrix-pytest-pntriplequote
-    - ENV=plain-nosetests
-    - ENV=plain-nosetests-cext
-    - ENV=plain-nosetests-cext-optional
-    - ENV=plain-nosetests-fnaccents
-    - ENV=plain-nosetests-fndoublequote
-    - ENV=plain-nosetests-fnquote
-    - ENV=plain-nosetests-fntriplequote
-    - ENV=plain-nosetests-pnaccents
-    - ENV=plain-nosetests-pndoublequote
-    - ENV=plain-nosetests-pnquote
-    - ENV=plain-nosetests-pntriplequote
+    - ENV=plain-nose
+    - ENV=plain-nose-cext
+    - ENV=plain-nose-cext-optional
+    - ENV=plain-nose-fnaccents
+    - ENV=plain-nose-fndoublequote
+    - ENV=plain-nose-fnquote
+    - ENV=plain-nose-fntriplequote
+    - ENV=plain-nose-pnaccents
+    - ENV=plain-nose-pndoublequote
+    - ENV=plain-nose-pnquote
+    - ENV=plain-nose-pntriplequote
     - ENV=plain-pytest
     - ENV=plain-pytest-cext
     - ENV=plain-pytest-cext-optional
diff --git a/appveyor.yml b/appveyor.yml
@@ -1,17 +1,17 @@
 build: false
 environment:
   matrix:
-    - ENV: matrix-nosetests
-    - ENV: matrix-nosetests-cext
-    - ENV: matrix-nosetests-cext-optional
-    - ENV: matrix-nosetests-fnaccents
-    - ENV: matrix-nosetests-fndoublequote
-    - ENV: matrix-nosetests-fnquote
-    - ENV: matrix-nosetests-fntriplequote
-    - ENV: matrix-nosetests-pnaccents
-    - ENV: matrix-nosetests-pndoublequote
-    - ENV: matrix-nosetests-pnquote
-    - ENV: matrix-nosetests-pntriplequote
+    - ENV: matrix-nose
+    - ENV: matrix-nose-cext
+    - ENV: matrix-nose-cext-optional
+    - ENV: matrix-nose-fnaccents
+    - ENV: matrix-nose-fndoublequote
+    - ENV: matrix-nose-fnquote
+    - ENV: matrix-nose-fntriplequote
+    - ENV: matrix-nose-pnaccents
+    - ENV: matrix-nose-pndoublequote
+    - ENV: matrix-nose-pnquote
+    - ENV: matrix-nose-pntriplequote
     - ENV: matrix-pytest
     - ENV: matrix-pytest-cext
     - ENV: matrix-pytest-cext-optional
@@ -23,17 +23,17 @@ environment:
     - ENV: matrix-pytest-pndoublequote
     - ENV: matrix-pytest-pnquote
     - ENV: matrix-pytest-pntriplequote
-    - ENV: plain-nosetests
-    - ENV: plain-nosetests-cext
-    - ENV: plain-nosetests-cext-optional
-    - ENV: plain-nosetests-fnaccents
-    - ENV: plain-nosetests-fndoublequote
-    - ENV: plain-nosetests-fnquote
-    - ENV: plain-nosetests-fntriplequote
-    - ENV: plain-nosetests-pnaccents
-    - ENV: plain-nosetests-pndoublequote
-    - ENV: plain-nosetests-pnquote
-    - ENV: plain-nosetests-pntriplequote
+    - ENV: plain-nose
+    - ENV: plain-nose-cext
+    - ENV: plain-nose-cext-optional
+    - ENV: plain-nose-fnaccents
+    - ENV: plain-nose-fndoublequote
+    - ENV: plain-nose-fnquote
+    - ENV: plain-nose-fntriplequote
+    - ENV: plain-nose-pnaccents
+    - ENV: plain-nose-pndoublequote
+    - ENV: plain-nose-pnquote
+    - ENV: plain-nose-pntriplequote
     - ENV: plain-pytest
     - ENV: plain-pytest-cext
     - ENV: plain-pytest-cext-optional
diff --git a/ci/envs/matrix-nose-cext-optional.cookiecutterrc b/ci/envs/matrix-nose-cext-optional.cookiecutterrc
@@ -2,4 +2,4 @@ default_context:
   c_extension_optional: 'yes'
   c_extension_support: 'yes'
   test_matrix_configurator: 'yes'
-  test_runner: nosetests
+  test_runner: nose
diff --git a/ci/envs/matrix-nose-cext.cookiecutterrc b/ci/envs/matrix-nose-cext.cookiecutterrc
@@ -2,4 +2,4 @@ default_context:
   c_extension_optional: 'no'
   c_extension_support: 'yes'
   test_matrix_configurator: 'yes'
-  test_runner: nosetests
+  test_runner: nose
diff --git a/ci/envs/matrix-nose-fnaccents.cookiecutterrc b/ci/envs/matrix-nose-fnaccents.cookiecutterrc
@@ -3,4 +3,4 @@ default_context:
   c_extension_support: 'no'
   full_name: "Ionel Cristian M\u0103rie\u0219"
   test_matrix_configurator: 'yes'
-  test_runner: nosetests
+  test_runner: nose
diff --git a/ci/envs/matrix-nose-fndoublequote.cookiecutterrc b/ci/envs/matrix-nose-fndoublequote.cookiecutterrc
@@ -3,4 +3,4 @@ default_context:
   c_extension_support: 'no'
   full_name: Io"nel
   test_matrix_configurator: 'yes'
-  test_runner: nosetests
+  test_runner: nose
diff --git a/ci/envs/matrix-nose-fnquote.cookiecutterrc b/ci/envs/matrix-nose-fnquote.cookiecutterrc
@@ -3,4 +3,4 @@ default_context:
   c_extension_support: 'no'
   full_name: Io'nel
   test_matrix_configurator: 'yes'
-  test_runner: nosetests
+  test_runner: nose
diff --git a/ci/envs/matrix-nose-fntriplequote.cookiecutterrc b/ci/envs/matrix-nose-fntriplequote.cookiecutterrc
@@ -3,4 +3,4 @@ default_context:
   c_extension_support: 'no'
   full_name: Io"'nel
   test_matrix_configurator: 'yes'
-  test_runner: nosetests
+  test_runner: nose
diff --git a/ci/envs/matrix-nose-pnaccents.cookiecutterrc b/ci/envs/matrix-nose-pnaccents.cookiecutterrc
@@ -3,4 +3,4 @@ default_context:
   c_extension_support: 'no'
   project_name: "Nam\xE9less"
   test_matrix_configurator: 'yes'
-  test_runner: nosetests
+  test_runner: nose
diff --git a/ci/envs/matrix-nose-pndoublequote.cookiecutterrc b/ci/envs/matrix-nose-pndoublequote.cookiecutterrc
@@ -3,4 +3,4 @@ default_context:
   c_extension_support: 'no'
   project_name: Name"less
   test_matrix_configurator: 'yes'
-  test_runner: nosetests
+  test_runner: nose
diff --git a/ci/envs/matrix-nose-pnquote.cookiecutterrc b/ci/envs/matrix-nose-pnquote.cookiecutterrc
@@ -3,4 +3,4 @@ default_context:
   c_extension_support: 'no'
   project_name: Name'less
   test_matrix_configurator: 'yes'
-  test_runner: nosetests
+  test_runner: nose
diff --git a/ci/envs/matrix-nose-pntriplequote.cookiecutterrc b/ci/envs/matrix-nose-pntriplequote.cookiecutterrc
@@ -3,4 +3,4 @@ default_context:
   c_extension_support: 'no'
   project_name: Name"'less
   test_matrix_configurator: 'yes'
-  test_runner: nosetests
+  test_runner: nose
diff --git a/ci/envs/matrix-nose.cookiecutterrc b/ci/envs/matrix-nose.cookiecutterrc
@@ -2,4 +2,4 @@ default_context:
   c_extension_optional: 'no'
   c_extension_support: 'no'
   test_matrix_configurator: 'yes'
-  test_runner: nosetests
+  test_runner: nose
diff --git a/ci/envs/plain-nose-cext-optional.cookiecutterrc b/ci/envs/plain-nose-cext-optional.cookiecutterrc
@@ -2,4 +2,4 @@ default_context:
   c_extension_optional: 'yes'
   c_extension_support: 'yes'
   test_matrix_configurator: 'no'
-  test_runner: nosetests
+  test_runner: nose
diff --git a/ci/envs/plain-nose-cext.cookiecutterrc b/ci/envs/plain-nose-cext.cookiecutterrc
@@ -2,4 +2,4 @@ default_context:
   c_extension_optional: 'no'
   c_extension_support: 'yes'
   test_matrix_configurator: 'no'
-  test_runner: nosetests
+  test_runner: nose
diff --git a/ci/envs/plain-nose-fnaccents.cookiecutterrc b/ci/envs/plain-nose-fnaccents.cookiecutterrc
@@ -3,4 +3,4 @@ default_context:
   c_extension_support: 'no'
   full_name: "Ionel Cristian M\u0103rie\u0219"
   test_matrix_configurator: 'no'
-  test_runner: nosetests
+  test_runner: nose
diff --git a/ci/envs/plain-nose-fndoublequote.cookiecutterrc b/ci/envs/plain-nose-fndoublequote.cookiecutterrc
@@ -3,4 +3,4 @@ default_context:
   c_extension_support: 'no'
   full_name: Io"nel
   test_matrix_configurator: 'no'
-  test_runner: nosetests
+  test_runner: nose
diff --git a/ci/envs/plain-nose-fnquote.cookiecutterrc b/ci/envs/plain-nose-fnquote.cookiecutterrc
@@ -3,4 +3,4 @@ default_context:
   c_extension_support: 'no'
   full_name: Io'nel
   test_matrix_configurator: 'no'
-  test_runner: nosetests
+  test_runner: nose
diff --git a/ci/envs/plain-nose-fntriplequote.cookiecutterrc b/ci/envs/plain-nose-fntriplequote.cookiecutterrc
@@ -3,4 +3,4 @@ default_context:
   c_extension_support: 'no'
   full_name: Io"'nel
   test_matrix_configurator: 'no'
-  test_runner: nosetests
+  test_runner: nose
diff --git a/ci/envs/plain-nose-pnaccents.cookiecutterrc b/ci/envs/plain-nose-pnaccents.cookiecutterrc
@@ -3,4 +3,4 @@ default_context:
   c_extension_support: 'no'
   project_name: "Nam\xE9less"
   test_matrix_configurator: 'no'
-  test_runner: nosetests
+  test_runner: nose
diff --git a/ci/envs/plain-nose-pndoublequote.cookiecutterrc b/ci/envs/plain-nose-pndoublequote.cookiecutterrc
@@ -3,4 +3,4 @@ default_context:
   c_extension_support: 'no'
   project_name: Name"less
   test_matrix_configurator: 'no'
-  test_runner: nosetests
+  test_runner: nose
diff --git a/ci/envs/plain-nose-pnquote.cookiecutterrc b/ci/envs/plain-nose-pnquote.cookiecutterrc
@@ -3,4 +3,4 @@ default_context:
   c_extension_support: 'no'
   project_name: Name'less
   test_matrix_configurator: 'no'
-  test_runner: nosetests
+  test_runner: nose
diff --git a/ci/envs/plain-nose-pntriplequote.cookiecutterrc b/ci/envs/plain-nose-pntriplequote.cookiecutterrc
@@ -3,4 +3,4 @@ default_context:
   c_extension_support: 'no'
   project_name: Name"'less
   test_matrix_configurator: 'no'
-  test_runner: nosetests
+  test_runner: nose
diff --git a/ci/envs/plain-nose.cookiecutterrc b/ci/envs/plain-nose.cookiecutterrc
@@ -2,4 +2,4 @@ default_context:
   c_extension_optional: 'no'
   c_extension_support: 'no'
   test_matrix_configurator: 'no'
-  test_runner: nosetests
+  test_runner: nose
diff --git a/ci/setup.cfg b/ci/setup.cfg
@@ -4,7 +4,7 @@ test_matrix_configurator =
     plain: no
 test_runner =
     pytest: pytest
-    nosetests: nosetests
+    nose: nose
 c_extension_support =
     cext: yes &project_name[-] &full_name[-]
     : no
diff --git a/tox.ini b/tox.ini
@@ -8,17 +8,17 @@ deps =
     bumpversion==0.5.1
     tox==1.9.0
 commands =
-    {toxinidir}/ci/test.cmd matrix-nosetests
-    {toxinidir}/ci/test.cmd matrix-nosetests-cext
-    {toxinidir}/ci/test.cmd matrix-nosetests-cext-optional
-    {toxinidir}/ci/test.cmd matrix-nosetests-fnaccents
-    {toxinidir}/ci/test.cmd matrix-nosetests-fndoublequote
-    {toxinidir}/ci/test.cmd matrix-nosetests-fnquote
-    {toxinidir}/ci/test.cmd matrix-nosetests-fntriplequote
-    {toxinidir}/ci/test.cmd matrix-nosetests-pnaccents
-    {toxinidir}/ci/test.cmd matrix-nosetests-pndoublequote
-    {toxinidir}/ci/test.cmd matrix-nosetests-pnquote
-    {toxinidir}/ci/test.cmd matrix-nosetests-pntriplequote
+    {toxinidir}/ci/test.cmd matrix-nose
+    {toxinidir}/ci/test.cmd matrix-nose-cext
+    {toxinidir}/ci/test.cmd matrix-nose-cext-optional
+    {toxinidir}/ci/test.cmd matrix-nose-fnaccents
+    {toxinidir}/ci/test.cmd matrix-nose-fndoublequote
+    {toxinidir}/ci/test.cmd matrix-nose-fnquote
+    {toxinidir}/ci/test.cmd matrix-nose-fntriplequote
+    {toxinidir}/ci/test.cmd matrix-nose-pnaccents
+    {toxinidir}/ci/test.cmd matrix-nose-pndoublequote
+    {toxinidir}/ci/test.cmd matrix-nose-pnquote
+    {toxinidir}/ci/test.cmd matrix-nose-pntriplequote
     {toxinidir}/ci/test.cmd matrix-pytest
     {toxinidir}/ci/test.cmd matrix-pytest-cext
     {toxinidir}/ci/test.cmd matrix-pytest-cext-optional
@@ -30,17 +30,17 @@ commands =
     {toxinidir}/ci/test.cmd matrix-pytest-pndoublequote
     {toxinidir}/ci/test.cmd matrix-pytest-pnquote
     {toxinidir}/ci/test.cmd matrix-pytest-pntriplequote
-    {toxinidir}/ci/test.cmd plain-nosetests
-    {toxinidir}/ci/test.cmd plain-nosetests-cext
-    {toxinidir}/ci/test.cmd plain-nosetests-cext-optional
-    {toxinidir}/ci/test.cmd plain-nosetests-fnaccents
-    {toxinidir}/ci/test.cmd plain-nosetests-fndoublequote
-    {toxinidir}/ci/test.cmd plain-nosetests-fnquote
-    {toxinidir}/ci/test.cmd plain-nosetests-fntriplequote
-    {toxinidir}/ci/test.cmd plain-nosetests-pnaccents
-    {toxinidir}/ci/test.cmd plain-nosetests-pndoublequote
-    {toxinidir}/ci/test.cmd plain-nosetests-pnquote
-    {toxinidir}/ci/test.cmd plain-nosetests-pntriplequote
+    {toxinidir}/ci/test.cmd plain-nose
+    {toxinidir}/ci/test.cmd plain-nose-cext
+    {toxinidir}/ci/test.cmd plain-nose-cext-optional
+    {toxinidir}/ci/test.cmd plain-nose-fnaccents
+    {toxinidir}/ci/test.cmd plain-nose-fndoublequote
+    {toxinidir}/ci/test.cmd plain-nose-fnquote
+    {toxinidir}/ci/test.cmd plain-nose-fntriplequote
+    {toxinidir}/ci/test.cmd plain-nose-pnaccents
+    {toxinidir}/ci/test.cmd plain-nose-pndoublequote
+    {toxinidir}/ci/test.cmd plain-nose-pnquote
+    {toxinidir}/ci/test.cmd plain-nose-pntriplequote
     {toxinidir}/ci/test.cmd plain-pytest
     {toxinidir}/ci/test.cmd plain-pytest-cext
     {toxinidir}/ci/test.cmd plain-pytest-cext-optional
