[ci] More requirements cleanup

requirements/test-ci.txt → requirements/test-ci-base.txt

@@ -5,3 +5,4 @@ coveralls
 -r extras/mongodb.txt
 -r extras/riak.txt
 -r extras/sqlalchemy.txt
+-r dev.txt

requirements/test-ci-default.txt

@@ -0,0 +1,2 @@
+-r test-ci-base.txt
+-r extras/auth.txt

tox.ini

@@ -14,8 +14,7 @@ commands = nosetests
 basepython = python3.4
 deps = -r{toxinidir}/requirements/default.txt
        -r{toxinidir}/requirements/test3.txt
-       -r{toxinidir}/requirements/test-ci.txt
-       -r{toxinidir}/requirements/extras/auth.txt
+       -r{toxinidir}/requirements/test-ci-default.txt
 setenv = C_DEBUG_TEST = 1
 commands = {toxinidir}/extra/release/removepyc.sh {toxinidir}
            pip install -U -r{toxinidir}/requirements/dev.txt
@@ -25,8 +24,7 @@ commands = {toxinidir}/extra/release/removepyc.sh {toxinidir}
 basepython = python3.3
 deps = -r{toxinidir}/requirements/default.txt
        -r{toxinidir}/requirements/test3.txt
-       -r{toxinidir}/requirements/test-ci.txt
-       -r{toxinidir}/requirements/extras/auth.txt
+       -r{toxinidir}/requirements/test-ci-default.txt
 setenv = C_DEBUG_TEST = 1
 commands = {toxinidir}/extra/release/removepyc.sh {toxinidir}
            pip install -U -r{toxinidir}/requirements/dev.txt
@@ -36,8 +34,7 @@ commands = {toxinidir}/extra/release/removepyc.sh {toxinidir}
 basepython = python2.7
 deps = -r{toxinidir}/requirements/default.txt
        -r{toxinidir}/requirements/test.txt
-       -r{toxinidir}/requirements/test-ci.txt
-       -r{toxinidir}/requirements/extras/auth.txt
+       -r{toxinidir}/requirements/test-ci-default.txt
 setenv = C_DEBUG_TEST = 1
 commands = {toxinidir}/extra/release/removepyc.sh {toxinidir}
            pip install -U -r{toxinidir}/requirements/dev.txt
@@ -47,8 +44,7 @@ commands = {toxinidir}/extra/release/removepyc.sh {toxinidir}
 basepython = pypy
 deps = -r{toxinidir}/requirements/default.txt
        -r{toxinidir}/requirements/test.txt
-       -r{toxinidir}/requirements/test-ci.txt
-       -r{toxinidir}/requirements/dev.txt
+       -r{toxinidir}/requirements/test-ci-default.txt
 setenv = C_DEBUG_TEST = 1
 commands = {toxinidir}/extra/release/removepyc.sh {toxinidir}
            pip install -q -U -r{toxinidir}/requirements/dev.txt
@@ -59,8 +55,7 @@ basepython = pypy3
 deps = -r{toxinidir}/requirements/default.txt
        -r{toxinidir}/requirements/test3.txt
        -r{toxinidir}/requirements/test-pypy3.txt
-       -r{toxinidir}/requirements/test-ci.txt
-       -r{toxinidir}/requirements/dev.txt
+       -r{toxinidir}/requirements/test-ci-base.txt
 setenv = C_DEBUG_TEST = 1
 commands = {toxinidir}/extra/release/removepyc.sh {toxinidir}
            pip install -q -U -r{toxinidir}/requirements/dev.txt