Skip to content

Commit c94cb14

Browse files
committed
Merge pull request #1506 from blink1073/remove-lab
Remove hard-coded JupyterLab in favor of a server extension
2 parents 5d0790c + 45e16b2 commit c94cb14

File tree

8 files changed

+1
-252
lines changed

8 files changed

+1
-252
lines changed

notebook/lab/__init__.py

Whitespace-only changes.

notebook/lab/handlers.py

Lines changed: 0 additions & 31 deletions
This file was deleted.

notebook/lab/index.js

Lines changed: 0 additions & 37 deletions
This file was deleted.

notebook/lab/package.json

Lines changed: 0 additions & 32 deletions
This file was deleted.

notebook/lab/webpack.conf.js

Lines changed: 0 additions & 38 deletions
This file was deleted.

notebook/notebookapp.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,6 @@ def init_handlers(self, settings):
270270
handlers.extend(load_handlers('services.nbconvert.handlers'))
271271
handlers.extend(load_handlers('services.kernelspecs.handlers'))
272272
handlers.extend(load_handlers('services.security.handlers'))
273-
handlers.extend(load_handlers('lab.handlers'))
274273

275274
# BEGIN HARDCODED WIDGETS HACK
276275
# TODO: Remove on notebook 5.0

notebook/templates/lab.html

Lines changed: 0 additions & 100 deletions
This file was deleted.

setupbase.py

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -129,9 +129,6 @@ def find_package_data():
129129
pjoin('static', 'services', 'built', '*contents.js'),
130130
pjoin('static', 'services', 'built', '*contents.js.map'),
131131
])
132-
133-
# Add the Lab page contents
134-
static_data.append(pjoin('lab', 'build', '*'))
135132

136133
components = pjoin("static", "components")
137134
# select the components we actually need to install
@@ -217,9 +214,7 @@ def check_package_data(package_data):
217214
pkg_root = pjoin(*pkg.split('.'))
218215
for d in data:
219216
path = pjoin(pkg_root, d)
220-
if 'lab/build' in path: # Do not verify lab install yet
221-
continue
222-
elif '*' in path:
217+
if '*' in path:
223218
assert len(glob(path)) > 0, "No files match pattern %s" % path
224219
else:
225220
assert os.path.exists(path), "Missing package data: %s" % path
@@ -365,7 +360,6 @@ def finalize_options(self):
365360

366361
bower_dir = pjoin(static, 'components')
367362
node_modules = pjoin(repo_root, 'node_modules')
368-
lab_dir = pjoin(repo_root, 'notebook', 'lab')
369363

370364
def run(self):
371365
npm_install(repo_root)
@@ -377,12 +371,6 @@ def run(self):
377371
print("You can install js dependencies with `npm install`", file=sys.stderr)
378372
raise
379373

380-
try:
381-
npm_install(self.lab_dir)
382-
run(['npm', 'run', 'build'], cwd=self.lab_dir)
383-
except Exception as e:
384-
print("Failed to install JupyterLab`: %s" % e, file=sys.stderr)
385-
386374
# update package data in case this created new files
387375
update_package_data(self.distribution)
388376

0 commit comments

Comments
 (0)