summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xtools/travis-before-install.sh2
-rwxr-xr-xtools/travis-test.sh4
2 files changed, 4 insertions, 2 deletions
diff --git a/tools/travis-before-install.sh b/tools/travis-before-install.sh
index c0f8ef807..448273db0 100755
--- a/tools/travis-before-install.sh
+++ b/tools/travis-before-install.sh
@@ -36,6 +36,6 @@ fi
pip install --upgrade pip setuptools
-pip install pytz cython pytest==5.0.1
+pip install pytz cython pytest
if [ -n "$USE_ASV" ]; then pip install asv; fi
popd
diff --git a/tools/travis-test.sh b/tools/travis-test.sh
index d056ac69c..1e7e09525 100755
--- a/tools/travis-test.sh
+++ b/tools/travis-test.sh
@@ -90,7 +90,9 @@ run_test()
export PYTHONWARNINGS="ignore::DeprecationWarning:virtualenv"
$PYTHON ../runtests.py -n -v --durations 10 --mode=full $COVERAGE_FLAG
else
- $PYTHON ../runtests.py -n -v --durations 10
+ # disable --durations temporarily, pytest currently aborts
+ # when that is used with python3.6-dbg
+ $PYTHON ../runtests.py -n -v # --durations 10
fi
if [ -n "$RUN_COVERAGE" ]; then