diff --git a/notebook/lab/__init__.py b/notebook/lab/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/notebook/lab/handlers.py b/notebook/lab/handlers.py deleted file mode 100644 index 21eca6810..000000000 --- a/notebook/lab/handlers.py +++ /dev/null @@ -1,31 +0,0 @@ -"""Tornado handlers for the tree view.""" - -# Copyright (c) Jupyter Development Team. -# Distributed under the terms of the Modified BSD License. - -import os -from tornado import web -from ..base.handlers import IPythonHandler, FileFindHandler - - -class LabHandler(IPythonHandler): - - """Render the Jupyter Lab View.""" - - @web.authenticated - def get(self): - self.write(self.render_template('lab.html', - page_title='Jupyter Lab', - terminals_available=self.settings['terminals_available'], - mathjax_url=self.mathjax_url, - mathjax_config=self.mathjax_config)) - -#----------------------------------------------------------------------------- -# URL to handler mappings -#----------------------------------------------------------------------------- - -default_handlers = [ - (r"/lab", LabHandler), - (r"/lab/(.*)", FileFindHandler, - {'path': os.path.join(os.path.dirname(__file__), 'build')}), - ] diff --git a/notebook/lab/index.js b/notebook/lab/index.js deleted file mode 100644 index f0a2b3319..000000000 --- a/notebook/lab/index.js +++ /dev/null @@ -1,37 +0,0 @@ -// Copyright (c) Jupyter Development Team. -// Distributed under the terms of the Modified BSD License. -'use strict'; - -// Load CSS. -require('font-awesome/css/font-awesome.min.css'); -require('jupyter-js-plugins/lib/default-theme/index.css'); - -// ES6 Promise polyfill -require('es6-promise').polyfill(); - -var phosphide = require('phosphide/lib/core/application'); - -var app = new phosphide.Application({ - extensions: [ - require('phosphide/lib/extensions/commandpalette').commandPaletteExtension, - require('jupyter-js-plugins/lib/terminal/plugin').terminalExtension, - require('jupyter-js-plugins/lib/filehandler/plugin').fileHandlerExtension, - require('jupyter-js-plugins/lib/filebrowser/plugin').fileBrowserExtension, - require('jupyter-js-plugins/lib/imagehandler/plugin').imageHandlerExtension, - require('jupyter-js-plugins/lib/help/plugin').helpHandlerExtension, - require('jupyter-js-plugins/lib/notebook/plugin').notebookHandlerExtension, - require('jupyter-js-plugins/lib/shortcuts/plugin').shortcutsExtension, - require('jupyter-js-plugins/lib/about/plugin').aboutExtension, - require('jupyter-js-plugins/lib/landing/plugin').landingExtension, - require('jupyter-js-plugins/lib/main/plugin').mainExtension, - ], - providers: [ - require('jupyter-js-plugins/lib/filehandler/plugin').fileHandlerProvider, - require('jupyter-js-plugins/lib/services/plugin').servicesProvider, - require('jupyter-js-plugins/lib/rendermime/plugin').renderMimeProvider - ] -}); - -window.onload = function() { - app.run(); -} diff --git a/notebook/lab/package.json b/notebook/lab/package.json deleted file mode 100644 index 17001a450..000000000 --- a/notebook/lab/package.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "private": true, - "name": "jupyter-js-lab", - "version": "0.1.0", - "description": "JupyterLab", - "main": "lib/index.js", - "typings": "lib/index.d.ts", - "dependencies": { - "es6-promise": "^3.1.2", - "font-awesome": "^4.6.1", - "jupyter-js-plugins": "^0.11.13", - "phosphide": "^0.9.4" - }, - "devDependencies": { - "css-loader": "^0.23.1", - "file-loader": "^0.8.5", - "json-loader": "^0.5.4", - "rimraf": "^2.5.0", - "style-loader": "^0.13.0", - "typescript": "^1.7.5", - "url-loader": "^0.5.7", - "webpack": "^1.12.11" - }, - "scripts": { - "clean": "rimraf build", - "build": "npm update jupyter-js-plugins && webpack --config webpack.conf.js", - "postinstall": "npm dedupe", - "test": "echo 'no tests specified'" - }, - "author": "Project Jupyter", - "license": "BSD-3-Clause" -} diff --git a/notebook/lab/webpack.conf.js b/notebook/lab/webpack.conf.js deleted file mode 100644 index 98e61e012..000000000 --- a/notebook/lab/webpack.conf.js +++ /dev/null @@ -1,38 +0,0 @@ -// Support for Node 0.10 -// See https://github.com/webpack/css-loader/issues/144 -require('es6-promise').polyfill(); - -module.exports = { - entry: './index.js', - output: { - path: __dirname + "/build", - filename: "bundle.js", - publicPath: "lab/" - }, - node: { - fs: "empty" - }, - debug: true, - bail: true, - devtool: 'source-map', - module: { - loaders: [ - { test: /\.css$/, loader: 'style-loader!css-loader' }, - { test: /\.json$/, loader: 'json-loader' }, - { test: /\.html$/, loader: 'file'}, - // jquery-ui loads some images - { test: /\.(jpg|png|gif)$/, loader: "file" }, - // required to load font-awesome - { test: /\.woff2(\?v=\d+\.\d+\.\d+)?$/, loader: "url?limit=10000&minetype=application/font-woff" }, - { test: /\.woff(\?v=\d+\.\d+\.\d+)?$/, loader: "url?limit=10000&minetype=application/font-woff" }, - { test: /\.ttf(\?v=\d+\.\d+\.\d+)?$/, loader: "url?limit=10000&minetype=application/octet-stream" }, - { test: /\.eot(\?v=\d+\.\d+\.\d+)?$/, loader: "file" }, - { test: /\.svg(\?v=\d+\.\d+\.\d+)?$/, loader: "url?limit=10000&minetype=image/svg+xml" } - ] - }, - externals: { - "base/js/namespace": "base/js/namespace", - "notebook/js/outputarea": "notebook/js/outputarea", - "services/kernels/comm": "services/kernels/comm" - } -} diff --git a/notebook/templates/lab.html b/notebook/templates/lab.html deleted file mode 100644 index 2f7175eaf..000000000 --- a/notebook/templates/lab.html +++ /dev/null @@ -1,100 +0,0 @@ - - - - - - - {{page_title}} - - - - - {% block meta %} - {% endblock %} - - {% if mathjax_url %} - - {% endif %} - - - - - -{% block script %} - - -{% endblock %} - - - - diff --git a/setupbase.py b/setupbase.py index 03ab947b1..20846aaef 100644 --- a/setupbase.py +++ b/setupbase.py @@ -129,9 +129,6 @@ def find_package_data(): pjoin('static', 'services', 'built', '*contents.js'), pjoin('static', 'services', 'built', '*contents.js.map'), ]) - - # Add the Lab page contents - static_data.append(pjoin('lab', 'build', '*')) components = pjoin("static", "components") # select the components we actually need to install @@ -217,9 +214,7 @@ def check_package_data(package_data): pkg_root = pjoin(*pkg.split('.')) for d in data: path = pjoin(pkg_root, d) - if 'lab/build' in path: # Do not verify lab install yet - continue - elif '*' in path: + if '*' in path: assert len(glob(path)) > 0, "No files match pattern %s" % path else: assert os.path.exists(path), "Missing package data: %s" % path @@ -365,7 +360,6 @@ class JavascriptDependencies(Command): bower_dir = pjoin(static, 'components') node_modules = pjoin(repo_root, 'node_modules') - lab_dir = pjoin(repo_root, 'notebook', 'lab') def run(self): npm_install(repo_root) @@ -377,12 +371,6 @@ class JavascriptDependencies(Command): print("You can install js dependencies with `npm install`", file=sys.stderr) raise - try: - npm_install(self.lab_dir) - run(['npm', 'run', 'build'], cwd=self.lab_dir) - except Exception as e: - print("Failed to install JupyterLab`: %s" % e, file=sys.stderr) - # update package data in case this created new files update_package_data(self.distribution)