diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2019-08-18 09:10:48 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-18 09:10:48 -0600 |
| commit | a6729a0e43791069cbc3cf5e80c34c73fa752b4d (patch) | |
| tree | ecc51b7c4f94054867c30ecfcee960555c36e871 | |
| parent | a051f5e2305a0f14c1d5d537778cf36be5f74da1 (diff) | |
| parent | ca6883c4598ee27985e19103ba3bffd72e5e69f6 (diff) | |
| download | numpy-a6729a0e43791069cbc3cf5e80c34c73fa752b4d.tar.gz | |
Merge pull request #14291 from charris/fix-for-pytest-5.1.0
TST, BUG: Use python3.6-dbg.
| -rw-r--r-- | .travis.yml | 5 | ||||
| -rwxr-xr-x | tools/travis-test.sh | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index 39787104e..16bea0e1d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,6 @@ addons: apt: packages: &common_packages - gfortran - - libatlas-dev - libatlas-base-dev # Speedup builds, particularly when USE_CHROOT=1 - eatmydata @@ -33,12 +32,14 @@ env: python: - 3.5 - 3.6 + - 3.7 - 3.8-dev matrix: include: - python: 3.7 env: INSTALL_PICKLE5=1 - - python: 3.5 + - python: 3.6 + dist: bionic env: USE_DEBUG=1 addons: apt: 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 |