diff options
author | Charles Harris <charlesr.harris@gmail.com> | 2019-07-30 15:09:40 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-07-30 15:09:40 -0500 |
commit | 0ea69d67643a4a57d91700a9ee9687d33784a052 (patch) | |
tree | 19ec71ac9286ee8be50f260bee30b33cc78fd2fc | |
parent | a162f643c6bb327d3f261a6012451fa95a0ccf3d (diff) | |
parent | b6953301871f6fa8db0daa5c6187464af8faa9d5 (diff) | |
download | numpy-0ea69d67643a4a57d91700a9ee9687d33784a052.tar.gz |
Merge pull request #14076 from charris/test-python-3.8
TST: Add 3.8-dev to travisCI testing.
-rw-r--r-- | .travis.yml | 1 | ||||
-rw-r--r-- | numpy/core/tests/test_deprecations.py | 2 | ||||
-rwxr-xr-x | tools/travis-before-install.sh | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index cb98356c4..39787104e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,6 +33,7 @@ env: python: - 3.5 - 3.6 + - 3.8-dev matrix: include: - python: 3.7 diff --git a/numpy/core/tests/test_deprecations.py b/numpy/core/tests/test_deprecations.py index 6d71fcbd6..58ebea024 100644 --- a/numpy/core/tests/test_deprecations.py +++ b/numpy/core/tests/test_deprecations.py @@ -101,7 +101,7 @@ class _DeprecationTestCase(object): (self.warning_cls.__name__, warning.category)) if num is not None and num_found != num: msg = "%i warnings found but %i expected." % (len(self.log), num) - lst = [str(w.category) for w in self.log] + lst = [str(w) for w in self.log] raise AssertionError("\n".join([msg] + lst)) with warnings.catch_warnings(): diff --git a/tools/travis-before-install.sh b/tools/travis-before-install.sh index b1c1f2ca1..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 nose pytz cython pytest +pip install pytz cython pytest if [ -n "$USE_ASV" ]; then pip install asv; fi popd |