Skip to content

Commit 61a4a0b

Browse files
committed
Merge branch 'travis_jh9.0.1' into dev
Conflicts: .travis.yml (keep travis_jh9.0.1 side)
2 parents 1b4f03d + fa11cb1 commit 61a4a0b

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

.travis.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
language: python
33
sudo: false
44
python:
5-
- 3.7
5+
- 3.7-dev
66
- 3.6
77
- 3.5
88
- 3.4
@@ -12,7 +12,7 @@ env:
1212
- JHUB_VER=0.9.1
1313
matrix:
1414
include:
15-
- python: 3.7
15+
- python: 3.7-dev
1616
env: JHUB_VER=master
1717
exclude:
1818
- python: 3.4
@@ -27,6 +27,7 @@ before_install:
2727
install:
2828
# Don't let requirements pull in tornado 5 yet except for jupyterhub master
2929
- if [ $JHUB_VER != "master" -a $JHUB_VER != "0.9.1" ]; then pip install "tornado<5.0"; fi
30+
- pip install jsonschema!=3.0.0a1 # issue #110, remove later
3031
- pip install --pre -f travis-wheels/wheelhouse -r jupyterhub/dev-requirements.txt
3132
- pip install --pre -e jupyterhub
3233

0 commit comments

Comments
 (0)