Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Tornado6 support #74

Merged
merged 5 commits into from
Mar 14, 2019
Merged

Tornado6 support #74

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
25c974c
fix: dependency upgrade to work with tornado6
maartenbreddels Mar 7, 2019
9d9d384
test using fix in https://github.com/jupyter/jupyter_server/pull/43
maartenbreddels Mar 7, 2019
63b72f7
activate env first
maartenbreddels Mar 7, 2019
76552ad
force installation of jupyter_sever
maartenbreddels Mar 7, 2019
bca2841
force re installation of jupyter_server (not correctly)
maartenbreddels Mar 7, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ before_install:
- conda info -a
- conda create -q -n test-environment -c conda-forge python=$PYTHON_VERSION jupyter_server pytest==3.10.1 pytest-cov nodejs flake8
- source activate test-environment
- pip install --upgrade --no-deps --force-reinstall git+https://github.com/maartenbreddels/jupyter_server.git@fix_tornado6
install:
- pip install ".[test]"
before_script:
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ def run(self):
},
'install_requires': [
'jupyter_server>=0.0.3',
'nbconvert>=5.4,<6'
'nbconvert>=5.4.1,<6'
],
'extras_require': {
'test': ['mock', 'pytest<4', 'pytest-tornado5']
Expand Down