From a31a2236dba0ea91517caf5ce6a692f59c40fa83 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Mon, 18 Apr 2016 10:31:44 -0500 Subject: [PATCH 1/2] Allow JupyterLab to fail gracefully on install for now --- setupbase.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/setupbase.py b/setupbase.py index 1fdd19f7b..451c815a5 100644 --- a/setupbase.py +++ b/setupbase.py @@ -363,9 +363,7 @@ class JavascriptDependencies(Command): run(['npm', 'install', '--progress=false'], cwd=self.lab_dir) run(['npm', 'run', 'build'], cwd=self.lab_dir) except Exception as e: - print("Failed to run `npm install`: %s" % e, file=sys.stderr) - print("You can install js dependencies with `npm install`", file=sys.stderr) - raise + print("Failed to install JupyterLab`: %s" % e, file=sys.stderr) # update package data in case this created new files update_package_data(self.distribution) From 0176f72550e1c02fcce92224cb231f1f1c260143 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Mon, 18 Apr 2016 10:45:17 -0500 Subject: [PATCH 2/2] Do not verify lab installed files yet --- setupbase.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/setupbase.py b/setupbase.py index 451c815a5..704d7f73f 100644 --- a/setupbase.py +++ b/setupbase.py @@ -217,7 +217,9 @@ def check_package_data(package_data): pkg_root = pjoin(*pkg.split('.')) for d in data: path = pjoin(pkg_root, d) - if '*' in path: + if 'lab/build' in path: # Do not verify lab install yet + continue + elif '*' in path: assert len(glob(path)) > 0, "No files match pattern %s" % path else: assert os.path.exists(path), "Missing package data: %s" % path