Skip to content

Commit fe9c57f

Browse files
authored
Merge pull request #1329 from jupyter/willingc-patch-1
Update the test matrix on Travis to Python 3.6+
2 parents 4c5d6f6 + 19efa89 commit fe9c57f

File tree

3 files changed

+24
-16
lines changed

3 files changed

+24
-16
lines changed

.travis.yml

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
language: python
22
python:
3-
- 3.5
43
- 3.6
54
- 3.7
5+
- 3.8
66
- nightly
77
env:
88
global:
@@ -13,22 +13,28 @@ env:
1313
- GROUP=python
1414
matrix:
1515
exclude:
16-
- python: 3.5
17-
env: GROUP=docs
18-
- python: 3.6
19-
env: GROUP=docs
20-
- python: nightly
21-
env: GROUP=docs
22-
- python: 3.5
23-
env: GROUP=nbextensions
24-
- python: 3.6
25-
env: GROUP=nbextensions
26-
- python: nightly
27-
env: GROUP=nbextensions
16+
- python: 3.6
17+
env: GROUP=docs
18+
- python: 3.7
19+
env: GROUP=docs
20+
- python: 3.8
21+
env: GROUP=docs
22+
- python: nightly
23+
env: GROUP=docs
24+
- python: 3.6
25+
env: GROUP=nbextensions
26+
- python: 3.7
27+
env: GROUP=nbextensions
28+
- python: 3.8
29+
env: GROUP=nbextensions
30+
- python: nightly
31+
env: GROUP=nbextensions
32+
allow_failures:
33+
- python: nightly
2834
addons:
2935
apt:
3036
packages:
31-
- pandoc
37+
- pandoc
3238
firefox: latest
3339
before_install:
3440
- pip install -U pip wheel setuptools

dev-requirements.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ pytest>=4.5
22
pytest-cov
33
pytest-rerunfailures
44
pytest-xdist
5-
pytest-mypy
5+
#pytest-mypy
66
coverage
77
selenium
88
sphinx
@@ -11,3 +11,5 @@ sphinx-autodoc-typehints
1111
codecov
1212
nbval
1313
requests-mock
14+
wheel
15+

tasks.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ def _run_tests(mark, skip, junitxml, paralell=False):
6060
if paralell:
6161
cmd.extend(['--numprocesses', 'auto'])
6262
cmd.extend(['--reruns', '4'])
63-
cmd.extend(['--mypy'])
63+
# cmd.extend(['--mypy'])
6464

6565
marks = []
6666
if mark is not None:

0 commit comments

Comments
 (0)