BUILD: move all test dependencies to ./test_requirements.txt

4 files changed, 6 insertions, 25 deletions

diff --git a/tools/ci/appveyor/requirements.txt b/tools/ci/appveyor/requirements.txt
deleted file mode 100644
index fba8260da..000000000
--- a/tools/ci/appveyor/requirements.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-cython
-nose
-pytest-timeout
-pytest-xdist
-pytest-env
-pytest-faulthandler
diff --git a/tools/pypy-test.sh b/tools/pypy-test.sh
index 038748af9..388a5b75f 100755
--- a/tools/pypy-test.sh
+++ b/tools/pypy-test.sh
@@ -32,7 +32,7 @@ mkdir -p pypy3
 (cd pypy3; tar --strip-components=1 -xf ../pypy.tar.bz2)
 pypy3/bin/pypy3 -mensurepip
 pypy3/bin/pypy3 -m pip install --upgrade pip setuptools
-pypy3/bin/pypy3 -m pip install --user cython==0.29.0 pytest pytz --no-warn-script-location
+pypy3/bin/pypy3 -m pip install --user -r test_requirements.txt --no-warn-script-location
 
 echo
 echo pypy3 version 
diff --git a/tools/travis-before-install.sh b/tools/travis-before-install.sh
index 448273db0..072ad3bf6 100755
--- a/tools/travis-before-install.sh
+++ b/tools/travis-before-install.sh
@@ -30,12 +30,8 @@ fi
 source venv/bin/activate
 python -V
 
-if [ -n "$INSTALL_PICKLE5" ]; then
-  pip install pickle5
-fi
-
+popd
 
 pip install --upgrade pip setuptools
-pip install pytz cython pytest
+pip install -r test_requirements.txt
 if [ -n "$USE_ASV" ]; then pip install asv; fi
-popd
diff --git a/tools/travis-test.sh b/tools/travis-test.sh
index 1e7e09525..8fbae4b09 100755
--- a/tools/travis-test.sh
+++ b/tools/travis-test.sh
@@ -65,12 +65,12 @@ setup_base()
 
 run_test()
 {
+  $PIP install -r test_requirements.txt
   if [ -n "$USE_DEBUG" ]; then
     export PYTHONPATH=$PWD
   fi
 
   if [ -n "$RUN_COVERAGE" ]; then
-    $PIP install pytest-cov
     COVERAGE_FLAG=--coverage
   fi
 
@@ -158,14 +158,10 @@ if [ -n "$USE_WHEEL" ] && [ $# -eq 0 ]; then
   # Move out of source directory to avoid finding local numpy
   pushd dist
   $PIP install --pre --no-index --upgrade --find-links=. numpy
-  $PIP install nose pytest
-
-  if [ -n "$INSTALL_PICKLE5" ]; then
-    $PIP install pickle5
-  fi
-
   popd
+
   run_test
+
 elif [ -n "$USE_SDIST" ] && [ $# -eq 0 ]; then
   # use an up-to-date pip / setuptools inside the venv
   $PIP install -U virtualenv
@@ -182,11 +178,6 @@ elif [ -n "$USE_SDIST" ] && [ $# -eq 0 ]; then
   # Move out of source directory to avoid finding local numpy
   pushd dist
   $PIP install numpy*
-  $PIP install nose pytest
-  if [ -n "$INSTALL_PICKLE5" ]; then
-    $PIP install pickle5
-  fi
-
   popd
   run_test
 else