switch to explicit -n2 where we want it

Author: dchudz

scripts/basic-test.sh

@@ -18,7 +18,7 @@ for k, v in sorted(dict(os.environ).items()):
 pip install .
 
 
-PYTEST="python -m pytest"
+PYTEST="python -m pytest -n2"
 
 $PYTEST tests/cover
 

tox.ini

@@ -18,7 +18,6 @@ whitelist_externals=
     bash
 setenv=
     brief: HYPOTHESIS_PROFILE=speedy
-    PYTEST_ADDOPTS="-n 2"
 passenv=
     HOME
     TOXENV
@@ -33,22 +32,22 @@ commands =
 deps=
     -rrequirements/test.txt
 commands=
-    python -m pytest tests/quality/
+    python -m pytest tests/quality/ -n2
 
 [testenv:oldpy27]
 basepython=python2.7.3
 deps=
     -rrequirements/test.txt
 commands=
-    python -m pytest tests/cover/
+    python -m pytest tests/cover/ -n2
 
 [testenv:py27typing]
 basepython=python2.7
 deps=
     -rrequirements/test.txt
     -rrequirements/typing.txt
 commands=
-    python -m pytest tests/cover/
+    python -m pytest tests/cover/ -n2
 
 [testenv:unicode]
 basepython=python2.7
@@ -80,28 +79,28 @@ deps =
     -rrequirements/test.txt
     pandas~=0.19.2
 commands =
-    python -m pytest tests/pandas
+    python -m pytest tests/pandas -n2
 
 [testenv:pandas20]
 deps =
     -rrequirements/test.txt
     pandas~=0.20.3
 commands =
-    python -m pytest tests/pandas
+    python -m pytest tests/pandas -n2
 
 [testenv:pandas21]
 deps =
     -rrequirements/test.txt
     pandas~=0.21.0
 commands =
-    python -m pytest tests/pandas
+    python -m pytest tests/pandas -n2
 
 [testenv:pandas22]
 deps =
     -rrequirements/test.txt
     pandas~=0.22.0
 commands =
-    python -m pytest tests/pandas
+    python -m pytest tests/pandas -n2
 
 
 [testenv:django18]
@@ -110,20 +109,20 @@ setenv=
 commands =
     pip install .[pytz]
     pip install django~=1.8.18
-    python -m tests.django.manage test tests.django
+    python -m tests.django.manage test tests.django -n2
 
 [testenv:django111]
 commands =
     pip install .[pytz]
     pip install django~=1.11.7
-    python -m tests.django.manage test tests.django
+    python -m tests.django.manage test tests.django -n2
 
 [testenv:django20]
 basepython=python3
 commands =
     pip install .[pytz]
     pip install django~=2.0.1
-    python -m tests.django.manage test tests.django
+    python -m tests.django.manage test tests.django -n2
 
 [testenv:nose]
 deps =