Merge pull request #538 from deanp70/master

Fix bug caused by recent version Jupyter Lab
jupyter · Sep 25, 2020 · f259cae · f259cae
2 parents 8804407 + eaf9c06
commit f259cae
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/packages/labextension/src/widget.ts b/packages/labextension/src/widget.ts
@@ -102,7 +102,7 @@ class NbdimeWidget extends Panel {
     }
 
     requestApiJson(
-      ServerConnection.defaultSettings.baseUrl,
+      ServerConnection.makeSettings().baseUrl,
       'nbdime/api/diff',
       args,
       this.onData.bind(this),

diff --git a/setup.py b/setup.py
@@ -124,7 +124,7 @@
         'pytest>=3.6',
         'pytest-cov',
         'pytest-timeout',
-        'pytest-tornado5>=2',
+        'pytest-tornado',
         'jsonschema',
         'mock',
         'requests',