From 25c974c0a73da1b9c7ac7661a79eba466f914d78 Mon Sep 17 00:00:00 2001 From: Maarten Breddels Date: Thu, 7 Mar 2019 11:21:01 +0100 Subject: [PATCH 1/5] fix: dependency upgrade to work with tornado6 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 00876d4d3..d753331dc 100644 --- a/setup.py +++ b/setup.py @@ -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'] From 9d9d384aef1beceec805157a0c7119735246a720 Mon Sep 17 00:00:00 2001 From: Maarten Breddels Date: Thu, 7 Mar 2019 11:27:24 +0100 Subject: [PATCH 2/5] test using fix in https://github.com/jupyter/jupyter_server/pull/43 --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 24ea9cd1b..9dab22d9f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,6 +18,7 @@ before_install: - conda update -q conda - 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 + - pip install git+https://github.com/maartenbreddels/jupyter_server.git@fix_tornado6 - source activate test-environment install: - pip install ".[test]" From 63b72f793046c3c5b12113ea293dc8dcbb23fe82 Mon Sep 17 00:00:00 2001 From: Maarten Breddels Date: Thu, 7 Mar 2019 12:04:33 +0100 Subject: [PATCH 3/5] activate env first --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9dab22d9f..5f4f94fdd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,8 +18,8 @@ before_install: - conda update -q conda - 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 - - pip install git+https://github.com/maartenbreddels/jupyter_server.git@fix_tornado6 - source activate test-environment + - pip install git+https://github.com/maartenbreddels/jupyter_server.git@fix_tornado6 install: - pip install ".[test]" before_script: From 76552adb9b46f74733a8daffdabe090e40c2819f Mon Sep 17 00:00:00 2001 From: Maarten Breddels Date: Thu, 7 Mar 2019 13:27:09 +0100 Subject: [PATCH 4/5] force installation of jupyter_sever --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 5f4f94fdd..9f9dfce7d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,7 +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 git+https://github.com/maartenbreddels/jupyter_server.git@fix_tornado6 + - pip install --force git+https://github.com/maartenbreddels/jupyter_server.git@fix_tornado6 install: - pip install ".[test]" before_script: From bca2841bd26c61cf7b470b21d491e6745b7079f4 Mon Sep 17 00:00:00 2001 From: Maarten Breddels Date: Thu, 7 Mar 2019 13:51:06 +0100 Subject: [PATCH 5/5] force re installation of jupyter_server (not correctly) --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9f9dfce7d..7f018c94a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,7 +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 --force git+https://github.com/maartenbreddels/jupyter_server.git@fix_tornado6 + - pip install --upgrade --no-deps --force-reinstall git+https://github.com/maartenbreddels/jupyter_server.git@fix_tornado6 install: - pip install ".[test]" before_script: