Parcourir la source

Fix browser check (#4996)

* Fix browser check

* Release @jupyterlab/filebrowser@0.17.3

* Release @jupyterlab/filebrowser-extension@0.17.4

* Release @jupyterlab/docmanager-extension@0.17.4

* Release @jupyterlab/application-extension@0.17.4

* Integrity update
Steven Silvester il y a 6 ans
Parent
commit
35db2e4cb7

+ 4 - 4
dev_mode/package.json

@@ -13,7 +13,7 @@
   },
   "dependencies": {
     "@jupyterlab/application": "^0.17.2",
-    "@jupyterlab/application-extension": "^0.17.3",
+    "@jupyterlab/application-extension": "^0.17.4",
     "@jupyterlab/apputils": "^0.17.2",
     "@jupyterlab/apputils-extension": "^0.17.2",
     "@jupyterlab/attachments": "^0.17.2",
@@ -29,13 +29,13 @@
     "@jupyterlab/csvviewer": "^0.17.2",
     "@jupyterlab/csvviewer-extension": "^0.17.2",
     "@jupyterlab/docmanager": "^0.17.2",
-    "@jupyterlab/docmanager-extension": "^0.17.3",
+    "@jupyterlab/docmanager-extension": "^0.17.4",
     "@jupyterlab/docregistry": "^0.17.2",
     "@jupyterlab/extensionmanager": "^0.17.2",
     "@jupyterlab/extensionmanager-extension": "^0.17.2",
     "@jupyterlab/faq-extension": "^0.17.2",
-    "@jupyterlab/filebrowser": "^0.17.2",
-    "@jupyterlab/filebrowser-extension": "^0.17.3",
+    "@jupyterlab/filebrowser": "^0.17.3",
+    "@jupyterlab/filebrowser-extension": "^0.17.4",
     "@jupyterlab/fileeditor": "^0.17.2",
     "@jupyterlab/fileeditor-extension": "^0.17.2",
     "@jupyterlab/help-extension": "^0.17.2",

+ 3 - 3
examples/app/package.json

@@ -9,16 +9,16 @@
   },
   "dependencies": {
     "@jupyterlab/application": "^0.17.2",
-    "@jupyterlab/application-extension": "^0.17.3",
+    "@jupyterlab/application-extension": "^0.17.4",
     "@jupyterlab/apputils-extension": "^0.17.2",
     "@jupyterlab/buildutils": "^0.8.2",
     "@jupyterlab/codemirror-extension": "^0.17.2",
     "@jupyterlab/completer-extension": "^0.17.2",
     "@jupyterlab/console-extension": "^0.17.2",
     "@jupyterlab/csvviewer-extension": "^0.17.2",
-    "@jupyterlab/docmanager-extension": "^0.17.3",
+    "@jupyterlab/docmanager-extension": "^0.17.4",
     "@jupyterlab/faq-extension": "^0.17.2",
-    "@jupyterlab/filebrowser-extension": "^0.17.3",
+    "@jupyterlab/filebrowser-extension": "^0.17.4",
     "@jupyterlab/fileeditor-extension": "^0.17.2",
     "@jupyterlab/help-extension": "^0.17.2",
     "@jupyterlab/imageviewer-extension": "^0.17.2",

+ 1 - 1
examples/filebrowser/package.json

@@ -12,7 +12,7 @@
     "@jupyterlab/codemirror": "^0.17.3",
     "@jupyterlab/docmanager": "^0.17.2",
     "@jupyterlab/docregistry": "^0.17.2",
-    "@jupyterlab/filebrowser": "^0.17.2",
+    "@jupyterlab/filebrowser": "^0.17.3",
     "@jupyterlab/fileeditor": "^0.17.2",
     "@jupyterlab/services": "^3.0.3",
     "@jupyterlab/theme-light-extension": "^0.17.3",

+ 7 - 7
jupyterlab/browser_check.py

@@ -3,7 +3,7 @@
 from __future__ import print_function, absolute_import
 
 from concurrent.futures import ThreadPoolExecutor
-import json
+from os import path as osp
 import os
 import shutil
 import sys
@@ -11,12 +11,12 @@ import subprocess
 
 from tornado.ioloop import IOLoop
 from notebook.notebookapp import flags, aliases
-from traitlets import Bool, Unicode
+from traitlets import Bool
 
 from .labapp import LabApp, get_app_dir
 
 
-here = os.path.dirname(__file__)
+here = osp.abspath(osp.dirname(__file__))
 test_flags = dict(flags)
 test_flags['core-mode'] = (
     {'BrowserApp': {'core_mode': True}},
@@ -62,13 +62,13 @@ class BrowserApp(LabApp):
 def run_browser(url):
     """Run the browser test and return an exit code.
     """
-    target = os.path.join(get_app_dir(), 'browser_test')
-    if not os.path.exists(os.path.join(target, 'node_modules')):
+    target = osp.join(get_app_dir(), 'browser_test')
+    if not osp.exists(osp.join(target, 'node_modules')):
         os.makedirs(target)
         subprocess.run(["jlpm"], cwd=target)
         subprocess.run(["jlpm", "add", "puppeteer"], cwd=target)
-    src = os.path.join(here, "chrome-test.js")
-    return subprocess.run(["node", src, url], cwd=target).returncode
+    shutil.copy(osp.join(here, 'chrome-test.js'), osp.join(target, 'chrome-test.js'))
+    return subprocess.run(["node", "chrome-test.js", url], cwd=target).returncode
 
 
 if __name__ == '__main__':

+ 4 - 4
jupyterlab/staging/package.json

@@ -13,7 +13,7 @@
   },
   "dependencies": {
     "@jupyterlab/application": "^0.17.2",
-    "@jupyterlab/application-extension": "^0.17.3",
+    "@jupyterlab/application-extension": "^0.17.4",
     "@jupyterlab/apputils": "^0.17.2",
     "@jupyterlab/apputils-extension": "^0.17.2",
     "@jupyterlab/attachments": "^0.17.2",
@@ -29,13 +29,13 @@
     "@jupyterlab/csvviewer": "^0.17.2",
     "@jupyterlab/csvviewer-extension": "^0.17.2",
     "@jupyterlab/docmanager": "^0.17.2",
-    "@jupyterlab/docmanager-extension": "^0.17.3",
+    "@jupyterlab/docmanager-extension": "^0.17.4",
     "@jupyterlab/docregistry": "^0.17.2",
     "@jupyterlab/extensionmanager": "^0.17.2",
     "@jupyterlab/extensionmanager-extension": "^0.17.2",
     "@jupyterlab/faq-extension": "^0.17.2",
-    "@jupyterlab/filebrowser": "^0.17.2",
-    "@jupyterlab/filebrowser-extension": "^0.17.3",
+    "@jupyterlab/filebrowser": "^0.17.3",
+    "@jupyterlab/filebrowser-extension": "^0.17.4",
     "@jupyterlab/fileeditor": "^0.17.2",
     "@jupyterlab/fileeditor-extension": "^0.17.2",
     "@jupyterlab/help-extension": "^0.17.2",

+ 12 - 12
jupyterlab/staging/yarn.lock

@@ -2,9 +2,9 @@
 # yarn lockfile v1
 
 
-"@jupyterlab/application-extension@^0.17.3":
-  version "0.17.3"
-  resolved "https://registry.npmjs.org/@jupyterlab/application-extension/-/application-extension-0.17.3.tgz#7bcd75496d2dc5de7ac119d21f99fa5516c878de"
+"@jupyterlab/application-extension@^0.17.4":
+  version "0.17.4"
+  resolved "https://registry.npmjs.org/@jupyterlab/application-extension/-/application-extension-0.17.4.tgz#649e6b343672000119128aaf66936559c2fe0051"
   dependencies:
     "@jupyterlab/application" "^0.17.2"
     "@jupyterlab/apputils" "^0.17.2"
@@ -251,9 +251,9 @@
     "@phosphor/signaling" "^1.2.2"
     "@phosphor/widgets" "^1.6.0"
 
-"@jupyterlab/docmanager-extension@^0.17.3":
-  version "0.17.3"
-  resolved "https://registry.npmjs.org/@jupyterlab/docmanager-extension/-/docmanager-extension-0.17.3.tgz#faa310b668f5e214d11a43c87888d836e6e91f38"
+"@jupyterlab/docmanager-extension@^0.17.4":
+  version "0.17.4"
+  resolved "https://registry.npmjs.org/@jupyterlab/docmanager-extension/-/docmanager-extension-0.17.4.tgz#bb1e34e2c1422be2dd06e7fc4437a45be62b98b6"
   dependencies:
     "@jupyterlab/application" "^0.17.2"
     "@jupyterlab/apputils" "^0.17.2"
@@ -330,9 +330,9 @@
     "@jupyterlab/rendermime" "^0.17.2"
     "@phosphor/coreutils" "^1.3.0"
 
-"@jupyterlab/filebrowser-extension@^0.17.3":
-  version "0.17.3"
-  resolved "https://registry.npmjs.org/@jupyterlab/filebrowser-extension/-/filebrowser-extension-0.17.3.tgz#a898efb7a141ee7b1cd015c2388ecbd030071181"
+"@jupyterlab/filebrowser-extension@^0.17.4":
+  version "0.17.4"
+  resolved "https://registry.npmjs.org/@jupyterlab/filebrowser-extension/-/filebrowser-extension-0.17.4.tgz#143c743acc24eb7e8d93ea3c98621d8c42f3996f"
   dependencies:
     "@jupyterlab/application" "^0.17.2"
     "@jupyterlab/apputils" "^0.17.2"
@@ -346,9 +346,9 @@
     "@phosphor/commands" "^1.5.0"
     "@phosphor/widgets" "^1.6.0"
 
-"@jupyterlab/filebrowser@^0.17.2":
-  version "0.17.2"
-  resolved "https://registry.npmjs.org/@jupyterlab/filebrowser/-/filebrowser-0.17.2.tgz#cc4e0be7461526e8a116342cceeb5bda2e128fbc"
+"@jupyterlab/filebrowser@^0.17.2", "@jupyterlab/filebrowser@^0.17.3":
+  version "0.17.3"
+  resolved "https://registry.npmjs.org/@jupyterlab/filebrowser/-/filebrowser-0.17.3.tgz#1ec7b055f153fe3a1a81eef7fa104d512ad27e18"
   dependencies:
     "@jupyterlab/apputils" "^0.17.2"
     "@jupyterlab/coreutils" "^2.0.2"

+ 1 - 1
packages/application-extension/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jupyterlab/application-extension",
-  "version": "0.17.3",
+  "version": "0.17.4",
   "description": "JupyterLab - Application Extension",
   "homepage": "https://github.com/jupyterlab/jupyterlab",
   "bugs": {

+ 1 - 1
packages/console-extension/package.json

@@ -34,7 +34,7 @@
     "@jupyterlab/codeeditor": "^0.17.2",
     "@jupyterlab/console": "^0.17.2",
     "@jupyterlab/coreutils": "^2.0.2",
-    "@jupyterlab/filebrowser": "^0.17.2",
+    "@jupyterlab/filebrowser": "^0.17.3",
     "@jupyterlab/launcher": "^0.17.2",
     "@jupyterlab/mainmenu": "^0.6.2",
     "@jupyterlab/rendermime": "^0.17.3",

+ 1 - 1
packages/docmanager-extension/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jupyterlab/docmanager-extension",
-  "version": "0.17.3",
+  "version": "0.17.4",
   "description": "JupyterLab - Document Manager Extension",
   "homepage": "https://github.com/jupyterlab/jupyterlab",
   "bugs": {

+ 2 - 2
packages/filebrowser-extension/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jupyterlab/filebrowser-extension",
-  "version": "0.17.3",
+  "version": "0.17.4",
   "description": "JupyterLab - Filebrowser Widget Extension",
   "homepage": "https://github.com/jupyterlab/jupyterlab",
   "bugs": {
@@ -34,7 +34,7 @@
     "@jupyterlab/coreutils": "^2.0.2",
     "@jupyterlab/docmanager": "^0.17.2",
     "@jupyterlab/docregistry": "^0.17.2",
-    "@jupyterlab/filebrowser": "^0.17.2",
+    "@jupyterlab/filebrowser": "^0.17.3",
     "@jupyterlab/launcher": "^0.17.2",
     "@jupyterlab/services": "^3.0.3",
     "@phosphor/algorithm": "^1.1.2",

+ 1 - 1
packages/filebrowser/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jupyterlab/filebrowser",
-  "version": "0.17.2",
+  "version": "0.17.3",
   "description": "JupyterLab - FileBrowser Widget",
   "homepage": "https://github.com/jupyterlab/jupyterlab",
   "bugs": {

+ 1 - 1
packages/fileeditor-extension/package.json

@@ -36,7 +36,7 @@
     "@jupyterlab/console": "^0.17.2",
     "@jupyterlab/coreutils": "^2.0.2",
     "@jupyterlab/docregistry": "^0.17.2",
-    "@jupyterlab/filebrowser": "^0.17.2",
+    "@jupyterlab/filebrowser": "^0.17.3",
     "@jupyterlab/fileeditor": "^0.17.2",
     "@jupyterlab/launcher": "^0.17.2",
     "@jupyterlab/mainmenu": "^0.6.2",

+ 4 - 4
packages/metapackage/package.json

@@ -32,7 +32,7 @@
   },
   "dependencies": {
     "@jupyterlab/application": "^0.17.2",
-    "@jupyterlab/application-extension": "^0.17.3",
+    "@jupyterlab/application-extension": "^0.17.4",
     "@jupyterlab/apputils": "^0.17.2",
     "@jupyterlab/apputils-extension": "^0.17.2",
     "@jupyterlab/attachments": "^0.17.2",
@@ -48,13 +48,13 @@
     "@jupyterlab/csvviewer": "^0.17.2",
     "@jupyterlab/csvviewer-extension": "^0.17.2",
     "@jupyterlab/docmanager": "^0.17.2",
-    "@jupyterlab/docmanager-extension": "^0.17.3",
+    "@jupyterlab/docmanager-extension": "^0.17.4",
     "@jupyterlab/docregistry": "^0.17.2",
     "@jupyterlab/extensionmanager": "^0.17.2",
     "@jupyterlab/extensionmanager-extension": "^0.17.2",
     "@jupyterlab/faq-extension": "^0.17.2",
-    "@jupyterlab/filebrowser": "^0.17.2",
-    "@jupyterlab/filebrowser-extension": "^0.17.3",
+    "@jupyterlab/filebrowser": "^0.17.3",
+    "@jupyterlab/filebrowser-extension": "^0.17.4",
     "@jupyterlab/fileeditor": "^0.17.2",
     "@jupyterlab/fileeditor-extension": "^0.17.2",
     "@jupyterlab/help-extension": "^0.17.2",

+ 1 - 1
packages/notebook-extension/package.json

@@ -35,7 +35,7 @@
     "@jupyterlab/cells": "^0.17.2",
     "@jupyterlab/codeeditor": "^0.17.2",
     "@jupyterlab/coreutils": "^2.0.2",
-    "@jupyterlab/filebrowser": "^0.17.2",
+    "@jupyterlab/filebrowser": "^0.17.3",
     "@jupyterlab/launcher": "^0.17.2",
     "@jupyterlab/mainmenu": "^0.6.2",
     "@jupyterlab/notebook": "^0.17.2",

+ 1 - 1
tests/package.json

@@ -14,7 +14,7 @@
     "@jupyterlab/csvviewer": "^0.17.2",
     "@jupyterlab/docmanager": "^0.17.2",
     "@jupyterlab/docregistry": "^0.17.2",
-    "@jupyterlab/filebrowser": "^0.17.2",
+    "@jupyterlab/filebrowser": "^0.17.3",
     "@jupyterlab/fileeditor": "^0.17.2",
     "@jupyterlab/imageviewer": "^0.17.2",
     "@jupyterlab/inspector": "^0.17.2",

+ 1 - 1
tests/test-filebrowser/package.json

@@ -19,7 +19,7 @@
     "@jupyterlab/coreutils": "^2.0.2",
     "@jupyterlab/docmanager": "^0.17.2",
     "@jupyterlab/docregistry": "^0.17.2",
-    "@jupyterlab/filebrowser": "^0.17.2",
+    "@jupyterlab/filebrowser": "^0.17.3",
     "@jupyterlab/services": "^3.0.3",
     "@phosphor/algorithm": "^1.1.2",
     "@phosphor/coreutils": "^1.3.0",