From 2b04f5cbf361a594411001b1f5871099d35a0a57 Mon Sep 17 00:00:00 2001 From: Kalen Goo Date: Tue, 1 Sep 2020 18:12:44 -1000 Subject: [PATCH 01/45] Added localization to datagrid example --- basics/datagrid/package.json | 5 +++-- basics/datagrid/src/index.ts | 28 +++++++++++++++++++++------- 2 files changed, 24 insertions(+), 9 deletions(-) diff --git a/basics/datagrid/package.json b/basics/datagrid/package.json index dfe1036e..4600eb67 100644 --- a/basics/datagrid/package.json +++ b/basics/datagrid/package.json @@ -34,8 +34,9 @@ "watch": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "^2.0.0", - "@jupyterlab/mainmenu": "^2.0.0", + "@jupyterlab/application": "^3.0.0-beta.1", + "@jupyterlab/mainmenu": "^3.0.0-beta.1", + "@jupyterlab/translation": "^3.0.0-beta.1", "@lumino/algorithm": "^1.2.3", "@lumino/coreutils": "^1.3.1", "@lumino/datagrid": "^0.5.2", diff --git a/basics/datagrid/src/index.ts b/basics/datagrid/src/index.ts index 64098cf8..c78e7837 100644 --- a/basics/datagrid/src/index.ts +++ b/basics/datagrid/src/index.ts @@ -7,6 +7,12 @@ import { ICommandPalette } from '@jupyterlab/apputils'; import { IMainMenu } from '@jupyterlab/mainmenu'; +import { + ITranslator, + nullTranslator, + TranslationBundle +} from '@jupyterlab/translation'; + import { DataGrid, DataModel } from '@lumino/datagrid'; import { Menu, StackedPanel } from '@lumino/widgets'; @@ -17,18 +23,20 @@ import { Menu, StackedPanel } from '@lumino/widgets'; const extension: JupyterFrontEndPlugin = { id: 'datagrid', autoStart: true, - requires: [ICommandPalette, IMainMenu], + requires: [ICommandPalette, IMainMenu, ITranslator], activate: ( app: JupyterFrontEnd, palette: ICommandPalette, - mainMenu: IMainMenu + mainMenu: IMainMenu, + translator: ITranslator ) => { const { commands, shell } = app; + const trans = translator.load('jupyterlab'); const command = 'examples:datagrid'; commands.addCommand(command, { - label: 'Open a Datagrid', - caption: 'Open a Datagrid Panel', + label: trans.__('Open a Datagrid'), + caption: trans.__('Open a Datagrid Panel'), execute: () => { const widget = new DataGridPanel(); shell.add(widget, 'main'); @@ -38,7 +46,7 @@ const extension: JupyterFrontEndPlugin = { const exampleMenu = new Menu({ commands }); - exampleMenu.title.label = 'DataGrid Example'; + exampleMenu.title.label = trans.__('DataGrid Example'); mainMenu.addMenu(exampleMenu, { rank: 80 }); exampleMenu.addItem({ command }); } @@ -47,11 +55,14 @@ const extension: JupyterFrontEndPlugin = { export default extension; class DataGridPanel extends StackedPanel { - constructor() { + constructor(translator?: ITranslator) { super(); + this._translator = translator || nullTranslator; + this._trans = this._translator.load('jupyterlab'); + this.addClass('jp-example-view'); this.id = 'datagrid-example'; - this.title.label = 'Datagrid Example View'; + this.title.label = this._trans.__('Datagrid Example View'); this.title.closable = true; const model = new LargeDataModel(); @@ -60,6 +71,9 @@ class DataGridPanel extends StackedPanel { this.addWidget(grid); } + + private _translator: ITranslator; + private _trans: TranslationBundle; } class LargeDataModel extends DataModel { From 799c85bc9e24629df8e3def4be627fd7a9ff66db Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Wed, 9 Sep 2020 15:39:09 -0500 Subject: [PATCH 02/45] ignore static files --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 8f0a97df..806685a5 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,5 @@ node_modules/ *.lock # Ensure embedme does not run ont node_modules README.md files. **/node_modules/**/README.md + +static From 063679ae79f462db08de2cabeaaf0353e32d77de Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Wed, 9 Sep 2020 16:41:50 -0500 Subject: [PATCH 03/45] Auto-upgrade server ext package.json --- advanced/server-extension/package.json | 42 +++++++++++++++----------- 1 file changed, 24 insertions(+), 18 deletions(-) diff --git a/advanced/server-extension/package.json b/advanced/server-extension/package.json index 9824feec..50fa1f26 100644 --- a/advanced/server-extension/package.json +++ b/advanced/server-extension/package.json @@ -26,36 +26,41 @@ }, "scripts": { "build": "jlpm run build:lib", - "build:labextension": "cd jlab_ext_example && rimraf labextension && mkdirp labextension && cd labextension && npm pack ../..", + "build:all": "jlpm run build:lib && jlpm run build:labextension", + "build:labextension": "jupyter labextension build .", "build:lib": "tsc", - "build:all": "jlpm run build:labextension", "clean": "jlpm run clean:lib", - "clean:lib": "rimraf lib tsconfig.tsbuildinfo", - "clean:labextension": "rimraf jlab_ext_example/labextension", "clean:all": "jlpm run clean:lib && jlpm run clean:labextension", + "clean:labextension": "rimraf jlab_ext_example/static", + "clean:lib": "rimraf lib tsconfig.tsbuildinfo", "eslint": "eslint . --ext .ts,.tsx --fix", "eslint:check": "eslint . --ext .ts,.tsx", - "install-ext": "jupyter labextension install . --no-build", + "install:extension": "jupyter labextension develop --overwrite .", "prepare": "jlpm run clean && jlpm run build", - "watch": "tsc -w" + "watch": "run-p watch:src watch:labextension", + "watch:labextension": "jupyter labextension watch .", + "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "^2.0.0", - "@jupyterlab/coreutils": "^4.0.0", - "@jupyterlab/launcher": "^2.0.0", - "@jupyterlab/services": "^5.0.0" + "@jupyterlab/application": "~3.0.0-beta.3", + "@jupyterlab/coreutils": "~5.0.0-beta.3", + "@jupyterlab/launcher": "~3.0.0-beta.3", + "@jupyterlab/services": "~6.0.0-beta.3" }, "devDependencies": { - "@typescript-eslint/eslint-plugin": "^2.21.0", - "@typescript-eslint/parser": "^2.21.0", - "eslint": "^6.8.0", - "eslint-config-prettier": "^6.10.0", + "@jupyterlab/builder": "^3.0.0-beta.3", + "@typescript-eslint/eslint-plugin": "^2.27.0", + "@typescript-eslint/parser": "^2.27.0", + "eslint": "^7.5.0", + "eslint-config-prettier": "^6.10.1", "eslint-plugin-jsdoc": "^22.0.0", "eslint-plugin-prettier": "^3.1.2", "eslint-plugin-react": "^7.18.3", "mkdirp": "^1.0.3", - "rimraf": "^3.0.0", - "typescript": "~3.7.5" + "npm-run-all": "^4.1.5", + "prettier": "^1.19.0", + "rimraf": "^3.0.2", + "typescript": "~3.9.0" }, "sideEffects": [ "style/*.css" @@ -71,6 +76,7 @@ } } }, - "extension": true + "extension": true, + "outputDir": "jlab_ext_example/static" } -} +} \ No newline at end of file From 55ea69b410da5e31640c61d03538d842af08fe15 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Wed, 9 Sep 2020 17:01:51 -0500 Subject: [PATCH 04/45] Finish updating server extension --- .../jlab_ext_example/__init__.py | 16 +++++++++++++++- .../jlab_ext_example/handlers.py | 5 +++-- .../{static => public}/index.html | 0 .../jupyter-config/jlab_ext_example.json | 4 ++-- advanced/server-extension/pyproject.toml | 2 +- advanced/server-extension/setup.py | 17 ++++++++++------- advanced/server-extension/src/index.ts | 2 +- 7 files changed, 32 insertions(+), 14 deletions(-) rename advanced/server-extension/jlab_ext_example/{static => public}/index.html (100%) diff --git a/advanced/server-extension/jlab_ext_example/__init__.py b/advanced/server-extension/jlab_ext_example/__init__.py index a296f826..bee278f8 100644 --- a/advanced/server-extension/jlab_ext_example/__init__.py +++ b/advanced/server-extension/jlab_ext_example/__init__.py @@ -1,5 +1,19 @@ -from ._version import __version__ +import json +import os.path as osp + from .handlers import setup_handlers +from ._version import __version__ + +HERE = osp.abspath(osp.dirname(__file__)) + +with open(osp.join(HERE, 'static', 'package.json')) as fid: + data = json.load(fid) + +def _jupyter_labextension_paths(): + return [{ + 'src': 'static', + 'dest': data['name'] + }] def _jupyter_server_extension_paths(): diff --git a/advanced/server-extension/jlab_ext_example/handlers.py b/advanced/server-extension/jlab_ext_example/handlers.py index b245800e..11b72e0c 100644 --- a/advanced/server-extension/jlab_ext_example/handlers.py +++ b/advanced/server-extension/jlab_ext_example/handlers.py @@ -25,6 +25,7 @@ def post(self): def setup_handlers(web_app, url_path): + import pdb; pdb.set_trace() host_pattern = ".*$" base_url = web_app.settings["base_url"] @@ -34,10 +35,10 @@ def setup_handlers(web_app, url_path): web_app.add_handlers(host_pattern, handlers) # Prepend the base_url so that it works in a jupyterhub setting - doc_url = url_path_join(base_url, url_path, "static") + doc_url = url_path_join(base_url, url_path, "public") doc_dir = os.getenv( "JLAB_SERVER_EXAMPLE_STATIC_DIR", - os.path.join(os.path.dirname(__file__), "static"), + os.path.join(os.path.dirname(__file__), "public"), ) handlers = [("{}/(.*)".format(doc_url), StaticFileHandler, {"path": doc_dir})] web_app.add_handlers(".*$", handlers) diff --git a/advanced/server-extension/jlab_ext_example/static/index.html b/advanced/server-extension/jlab_ext_example/public/index.html similarity index 100% rename from advanced/server-extension/jlab_ext_example/static/index.html rename to advanced/server-extension/jlab_ext_example/public/index.html diff --git a/advanced/server-extension/jupyter-config/jlab_ext_example.json b/advanced/server-extension/jupyter-config/jlab_ext_example.json index 26b21bd8..03f6eef1 100644 --- a/advanced/server-extension/jupyter-config/jlab_ext_example.json +++ b/advanced/server-extension/jupyter-config/jlab_ext_example.json @@ -1,6 +1,6 @@ { - "NotebookApp": { - "nbserver_extensions": { + "ServerApp": { + "jpserver_extensions": { "jlab_ext_example": true } } diff --git a/advanced/server-extension/pyproject.toml b/advanced/server-extension/pyproject.toml index 010df900..873d43f4 100644 --- a/advanced/server-extension/pyproject.toml +++ b/advanced/server-extension/pyproject.toml @@ -1,3 +1,3 @@ [build-system] -requires = ["jupyter_packaging~=0.4.0", "jupyterlab~=2.0", "setuptools>=40.8.0", "wheel"] +requires = ["jupyter_packaging~=0.6.0", "jupyterlab~=3.0.0b3", "setuptools>=40.8.0", "wheel"] build-backend = "setuptools.build_meta" diff --git a/advanced/server-extension/setup.py b/advanced/server-extension/setup.py index 7bdcd0cd..89ed6ca2 100644 --- a/advanced/server-extension/setup.py +++ b/advanced/server-extension/setup.py @@ -16,16 +16,17 @@ name="jlab_ext_example" # Ensure a valid python version -ensure_python(">=3.5") +ensure_python(">=3.6") # Get the version version = get_version(pjoin(name, "_version.py")) -lab_path = pjoin(HERE, name, "labextension") +lab_path = os.path.join(HERE, name, "static") # Representative files that should exist after a successful build jstargets = [ - pjoin(HERE, "lib", "jlabextexample.js"), + os.path.join(HERE, "lib", "index.js"), + os.path.join(HERE, name, "static", "package.json"), ] package_data_spec = { @@ -34,10 +35,12 @@ ] } +labext_name = "@jupyterlab-examples/server-extension" + data_files_spec = [ - ("share/jupyter/lab/extensions", lab_path, "*.tgz"), - ("etc/jupyter/jupyter_notebook_config.d", - "jupyter-config", "jlab_ext_example.json"), + ("share/jupyter/labextensions/%s" % labext_name, lab_path, "*.*"), + ("etc/jupyter/jupyter_server_config.d", + "jupyter-config", "jlab_ext_example.json"), ] cmdclass = create_cmdclass("jsdeps", @@ -64,7 +67,7 @@ cmdclass= cmdclass, packages=setuptools.find_packages(), install_requires=[ - "jupyterlab~=2.0", + "jupyterlab~=3.0.0b3", ], zip_safe=False, include_package_data=True, diff --git a/advanced/server-extension/src/index.ts b/advanced/server-extension/src/index.ts index 948d5752..2f68eaf7 100644 --- a/advanced/server-extension/src/index.ts +++ b/advanced/server-extension/src/index.ts @@ -86,7 +86,7 @@ class IFrameWidget extends IFrame { constructor() { super(); const baseUrl = PageConfig.getBaseUrl(); - this.url = baseUrl + 'jlab-ext-example/static/index.html'; + this.url = baseUrl + 'jlab-ext-example/public/index.html'; this.id = 'doc-example'; this.title.label = 'Server Doc'; this.title.closable = true; From 8099ef9603d1d31072e28d015164681142c686ab Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Wed, 9 Sep 2020 17:33:02 -0500 Subject: [PATCH 05/45] Update extensions and add update script Upgrade extensions for JupyterLab 3.0 debug pin nbconvert for now use nbconvert 5.6 fix uninstall method install jupyter-packaging Update server extension readme and use nbconvert 5.6 fix usages of serverextension commands Update readmes install latest pip remove nbconvert pin use verbose install try to force a true response in pip install switch to editable install try to force a true response in pip install debug print add more debug info use insensitive check Add upgrade script Remove unused jupyter-config files clean up script update server cleanup install --pre jupyterlab integrity --- .github/workflows/main.yml | 28 +++-- advanced/kernel-messaging/MANIFEST.in | 22 ++++ .../__init__.py | 19 +++ .../_version.py | 2 + advanced/kernel-messaging/package.json | 54 ++++---- advanced/kernel-messaging/pyproject.toml | 3 + advanced/kernel-messaging/setup.py | 87 +++++++++++++ advanced/kernel-output/MANIFEST.in | 22 ++++ .../__init__.py | 19 +++ .../_version.py | 2 + advanced/kernel-output/package.json | 52 +++++--- advanced/kernel-output/pyproject.toml | 3 + advanced/kernel-output/setup.py | 87 +++++++++++++ advanced/server-extension/README.md | 118 +++++++++--------- .../jlab_ext_example/handlers.py | 1 - advanced/server-extension/setup.py | 24 ++-- .../src/{jlabextexample.ts => handler.ts} | 0 advanced/server-extension/src/index.ts | 2 +- basics/datagrid/MANIFEST.in | 22 ++++ .../jupyterlab_examples_datagrid/__init__.py | 19 +++ .../jupyterlab_examples_datagrid/_version.py | 2 + basics/datagrid/package.json | 48 ++++--- basics/datagrid/pyproject.toml | 3 + basics/datagrid/setup.py | 87 +++++++++++++ basics/hello-world/MANIFEST.in | 22 ++++ basics/hello-world/README.md | 4 +- .../__init__.py | 19 +++ .../_version.py | 2 + basics/hello-world/package.json | 40 +++--- basics/hello-world/pyproject.toml | 3 + basics/hello-world/setup.py | 87 +++++++++++++ basics/signals/MANIFEST.in | 22 ++++ .../jupyterlab_examples_signals/__init__.py | 19 +++ .../jupyterlab_examples_signals/_version.py | 2 + basics/signals/package.json | 50 +++++--- basics/signals/pyproject.toml | 3 + basics/signals/setup.py | 87 +++++++++++++ command-palette/MANIFEST.in | 22 ++++ .../__init__.py | 19 +++ .../_version.py | 2 + command-palette/package.json | 40 +++--- command-palette/pyproject.toml | 3 + command-palette/setup.py | 87 +++++++++++++ commands/MANIFEST.in | 22 ++++ .../jupyterlab_examples_commands/__init__.py | 19 +++ .../jupyterlab_examples_commands/_version.py | 2 + commands/package.json | 40 +++--- commands/pyproject.toml | 3 + commands/setup.py | 87 +++++++++++++ context-menu/MANIFEST.in | 22 ++++ .../__init__.py | 19 +++ .../_version.py | 2 + context-menu/package.json | 46 ++++--- context-menu/pyproject.toml | 3 + context-menu/setup.py | 87 +++++++++++++ launcher/LICENSE | 30 ----- launcher/MANIFEST.in | 22 ++++ .../jupyterlab_examples_launcher/__init__.py | 19 +++ .../jupyterlab_examples_launcher/_version.py | 2 + launcher/package.json | 46 ++++--- launcher/pyproject.toml | 3 + launcher/setup.py | 87 +++++++++++++ log-console/custom-log-console/MANIFEST.in | 22 ++++ .../__init__.py | 19 +++ .../_version.py | 2 + log-console/custom-log-console/package.json | 58 +++++---- log-console/custom-log-console/pyproject.toml | 3 + log-console/custom-log-console/setup.py | 87 +++++++++++++ log-console/log-messages/MANIFEST.in | 22 ++++ .../__init__.py | 19 +++ .../_version.py | 2 + log-console/log-messages/package.json | 60 +++++---- log-console/log-messages/pyproject.toml | 3 + log-console/log-messages/setup.py | 87 +++++++++++++ main-menu/MANIFEST.in | 22 ++++ main-menu/README.md | 8 +- .../jupyterlab_examples_main_menu/__init__.py | 19 +++ .../jupyterlab_examples_main_menu/_version.py | 2 + main-menu/package.json | 44 ++++--- main-menu/pyproject.toml | 3 + main-menu/setup.py | 87 +++++++++++++ package.json | 5 +- react/react-widget/MANIFEST.in | 22 ++++ .../__init__.py | 19 +++ .../_version.py | 2 + react/react-widget/package.json | 43 ++++--- react/react-widget/pyproject.toml | 3 + react/react-widget/setup.py | 87 +++++++++++++ scripts/upgrade_extensions.py | 45 +++++++ settings/MANIFEST.in | 22 ++++ settings/README.md | 5 +- .../jupyterlab_examples_settings/__init__.py | 19 +++ .../jupyterlab_examples_settings/_version.py | 2 + settings/package.json | 46 ++++--- settings/pyproject.toml | 3 + settings/setup.py | 87 +++++++++++++ state/MANIFEST.in | 22 ++++ state/jupyterlab_examples_state/__init__.py | 19 +++ state/jupyterlab_examples_state/_version.py | 2 + state/package.json | 46 ++++--- state/pyproject.toml | 3 + state/setup.py | 87 +++++++++++++ widget-tracker/widgets/MANIFEST.in | 22 ++++ .../jupyterlab_examples_widgets/__init__.py | 19 +++ .../jupyterlab_examples_widgets/_version.py | 2 + widget-tracker/widgets/package.json | 48 ++++--- widget-tracker/widgets/pyproject.toml | 3 + widget-tracker/widgets/setup.py | 87 +++++++++++++ 108 files changed, 2750 insertions(+), 409 deletions(-) create mode 100644 advanced/kernel-messaging/MANIFEST.in create mode 100644 advanced/kernel-messaging/jupyterlab_examples_kernel_messaging/__init__.py create mode 100644 advanced/kernel-messaging/jupyterlab_examples_kernel_messaging/_version.py create mode 100644 advanced/kernel-messaging/pyproject.toml create mode 100644 advanced/kernel-messaging/setup.py create mode 100644 advanced/kernel-output/MANIFEST.in create mode 100644 advanced/kernel-output/jupyterlab_examples_kernel_output/__init__.py create mode 100644 advanced/kernel-output/jupyterlab_examples_kernel_output/_version.py create mode 100644 advanced/kernel-output/pyproject.toml create mode 100644 advanced/kernel-output/setup.py rename advanced/server-extension/src/{jlabextexample.ts => handler.ts} (100%) create mode 100644 basics/datagrid/MANIFEST.in create mode 100644 basics/datagrid/jupyterlab_examples_datagrid/__init__.py create mode 100644 basics/datagrid/jupyterlab_examples_datagrid/_version.py create mode 100644 basics/datagrid/pyproject.toml create mode 100644 basics/datagrid/setup.py create mode 100644 basics/hello-world/MANIFEST.in create mode 100644 basics/hello-world/jupyterlab_examples_hello_world/__init__.py create mode 100644 basics/hello-world/jupyterlab_examples_hello_world/_version.py create mode 100644 basics/hello-world/pyproject.toml create mode 100644 basics/hello-world/setup.py create mode 100644 basics/signals/MANIFEST.in create mode 100644 basics/signals/jupyterlab_examples_signals/__init__.py create mode 100644 basics/signals/jupyterlab_examples_signals/_version.py create mode 100644 basics/signals/pyproject.toml create mode 100644 basics/signals/setup.py create mode 100644 command-palette/MANIFEST.in create mode 100644 command-palette/jupyterlab_examples_command_palette/__init__.py create mode 100644 command-palette/jupyterlab_examples_command_palette/_version.py create mode 100644 command-palette/pyproject.toml create mode 100644 command-palette/setup.py create mode 100644 commands/MANIFEST.in create mode 100644 commands/jupyterlab_examples_commands/__init__.py create mode 100644 commands/jupyterlab_examples_commands/_version.py create mode 100644 commands/pyproject.toml create mode 100644 commands/setup.py create mode 100644 context-menu/MANIFEST.in create mode 100644 context-menu/jupyterlab_examples_context_menu/__init__.py create mode 100644 context-menu/jupyterlab_examples_context_menu/_version.py create mode 100644 context-menu/pyproject.toml create mode 100644 context-menu/setup.py delete mode 100644 launcher/LICENSE create mode 100644 launcher/MANIFEST.in create mode 100644 launcher/jupyterlab_examples_launcher/__init__.py create mode 100644 launcher/jupyterlab_examples_launcher/_version.py create mode 100644 launcher/pyproject.toml create mode 100644 launcher/setup.py create mode 100644 log-console/custom-log-console/MANIFEST.in create mode 100644 log-console/custom-log-console/jupyterlab_examples_custom_log_console/__init__.py create mode 100644 log-console/custom-log-console/jupyterlab_examples_custom_log_console/_version.py create mode 100644 log-console/custom-log-console/pyproject.toml create mode 100644 log-console/custom-log-console/setup.py create mode 100644 log-console/log-messages/MANIFEST.in create mode 100644 log-console/log-messages/jupyterlab_examples_log_messages/__init__.py create mode 100644 log-console/log-messages/jupyterlab_examples_log_messages/_version.py create mode 100644 log-console/log-messages/pyproject.toml create mode 100644 log-console/log-messages/setup.py create mode 100644 main-menu/MANIFEST.in create mode 100644 main-menu/jupyterlab_examples_main_menu/__init__.py create mode 100644 main-menu/jupyterlab_examples_main_menu/_version.py create mode 100644 main-menu/pyproject.toml create mode 100644 main-menu/setup.py create mode 100644 react/react-widget/MANIFEST.in create mode 100644 react/react-widget/jupyterlab_examples_react_widget/__init__.py create mode 100644 react/react-widget/jupyterlab_examples_react_widget/_version.py create mode 100644 react/react-widget/pyproject.toml create mode 100644 react/react-widget/setup.py create mode 100644 scripts/upgrade_extensions.py create mode 100644 settings/MANIFEST.in create mode 100644 settings/jupyterlab_examples_settings/__init__.py create mode 100644 settings/jupyterlab_examples_settings/_version.py create mode 100644 settings/pyproject.toml create mode 100644 settings/setup.py create mode 100644 state/MANIFEST.in create mode 100644 state/jupyterlab_examples_state/__init__.py create mode 100644 state/jupyterlab_examples_state/_version.py create mode 100644 state/pyproject.toml create mode 100644 state/setup.py create mode 100644 widget-tracker/widgets/MANIFEST.in create mode 100644 widget-tracker/widgets/jupyterlab_examples_widgets/__init__.py create mode 100644 widget-tracker/widgets/jupyterlab_examples_widgets/_version.py create mode 100644 widget-tracker/widgets/pyproject.toml create mode 100644 widget-tracker/widgets/setup.py diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5ebf30a3..974e696d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -73,7 +73,10 @@ jobs: restore-keys: | ${{ runner.os }}-pip- - name: Install the Python dependencies - run: python -m pip install jupyterlab + run: | + python -m pip install --upgrade pip + python -m pip install jupyter_packaging + python -m pip install --pre jupyterlab - name: Install the NPM dependencies run: | cd ${EXAMPLE_FOLDER} @@ -91,9 +94,12 @@ jobs: - name: Build and check by extension run: | cd ${EXAMPLE_FOLDER} - jlpm run build - jupyter labextension install . + pip install -e . + jupyter labextension list 1>labextensions 2>&1 + cat labextensions + cat labextensions | grep -i "@jupyterlab-examples/*.*OK" python -m jupyterlab.browser_check + pip uninstall -y $(python setup.py --name) env: EXAMPLE_FOLDER: ${{ matrix.example }} shell: bash @@ -145,8 +151,9 @@ jobs: ${{ runner.os }}-pip- - name: Install the Python dependencies run: | + python -m pip install --upgrade pip python -m pip install jupyter_packaging - python -m pip install jupyterlab + python -m pip install --pre jupyterlab - name: Install the NPM dependencies run: | cd advanced/server-extension @@ -161,12 +168,11 @@ jobs: cd advanced/server-extension python setup.py sdist pip install jlab_ext_example --pre --find-links=dist --no-cache-dir - jupyter lab build python -m jupyterlab.browser_check - name: Check extension as dev if: startsWith(runner.os, 'Linux') || startsWith(runner.os, 'macOS') run: | - jupyter serverextension list 1>serverextensions 2>&1 + jupyter server extension list 1>serverextensions 2>&1 cat serverextensions | grep "jlab_ext_example.*OK" jupyter labextension list 1>labextensions 2>&1 cat labextensions | grep "@jupyterlab-examples/server-extension.*OK" @@ -174,18 +180,17 @@ jobs: run: | pip uninstall -y jlab_ext_example jupyter lab clean - jupyter serverextension list + jupyter server extension list jupyter labextension list - name: Build extension as dev run: | cd advanced/server-extension pip install -e . - jupyter serverextension enable --py jlab_ext_example - jupyter labextension install . + jupyter server extension enable --py jlab_ext_example - name: Check extension as dev if: startsWith(runner.os, 'Linux') || startsWith(runner.os, 'macOS') run: | - jupyter serverextension list 1>serverextensions 2>&1 + jupyter server extension list 1>serverextensions 2>&1 cat serverextensions | grep "jlab_ext_example.*OK" jupyter labextension list 1>labextensions 2>&1 cat labextensions | grep "@jupyterlab-examples/server-extension.*OK" @@ -231,7 +236,7 @@ jobs: restore-keys: | ${{ runner.os }}-pip- - name: Install the Python dependencies - run: python -m pip install jupyterlab + run: python -m pip install --pre jupyterlab - name: Bootstrap the jlpm deps run: jlpm - name: Build all the extensions @@ -239,4 +244,3 @@ jobs: jlpm build-ext jlpm lint:check jlpm install-ext - jlpm build-jlab diff --git a/advanced/kernel-messaging/MANIFEST.in b/advanced/kernel-messaging/MANIFEST.in new file mode 100644 index 00000000..a192a4cc --- /dev/null +++ b/advanced/kernel-messaging/MANIFEST.in @@ -0,0 +1,22 @@ +include LICENSE +include README.md +include pyproject.toml +include jupyter-config/jupyterlab_examples_kernel_messaging.json + +include package.json +include ts*.json + +graft jupyterlab_examples_kernel_messaging/static + +# Javascript files +graft src +graft style +prune **/node_modules +prune lib + +# Patterns to exclude from any directory +global-exclude *~ +global-exclude *.pyc +global-exclude *.pyo +global-exclude .git +global-exclude .ipynb_checkpoints diff --git a/advanced/kernel-messaging/jupyterlab_examples_kernel_messaging/__init__.py b/advanced/kernel-messaging/jupyterlab_examples_kernel_messaging/__init__.py new file mode 100644 index 00000000..819e43e0 --- /dev/null +++ b/advanced/kernel-messaging/jupyterlab_examples_kernel_messaging/__init__.py @@ -0,0 +1,19 @@ + +import json +import os.path as osp + +from ._version import __version__ + +HERE = osp.abspath(osp.dirname(__file__)) + +with open(osp.join(HERE, 'static', 'package.json')) as fid: + data = json.load(fid) + +def _jupyter_labextension_paths(): + return [{ + 'src': 'static', + 'dest': data['name'] + }] + + + diff --git a/advanced/kernel-messaging/jupyterlab_examples_kernel_messaging/_version.py b/advanced/kernel-messaging/jupyterlab_examples_kernel_messaging/_version.py new file mode 100644 index 00000000..ee864fc9 --- /dev/null +++ b/advanced/kernel-messaging/jupyterlab_examples_kernel_messaging/_version.py @@ -0,0 +1,2 @@ +version_info = (0, 1, 0) +__version__ = ".".join(map(str, version_info)) diff --git a/advanced/kernel-messaging/package.json b/advanced/kernel-messaging/package.json index 0ba26072..d4b535cf 100644 --- a/advanced/kernel-messaging/package.json +++ b/advanced/kernel-messaging/package.json @@ -25,40 +25,52 @@ "url": "https://github.com/jupyterlab/extension-examples.git" }, "scripts": { - "build": "tsc", - "clean": "rimraf lib tsconfig.tsbuildinfo", - "install-ext": "jupyter labextension install . --no-build", - "prepare": "jlpm run clean && jlpm run build", + "build": "jlpm run build:lib", + "build:all": "jlpm run build:lib && jlpm run build:labextension", + "build:labextension": "jupyter labextension build .", + "build:lib": "tsc", + "clean": "jlpm run clean:lib", + "clean:all": "jlpm run clean:lib && jlpm run clean:labextension", + "clean:labextension": "rimraf jupyterlab_examples_kernel_messaging/static", + "clean:lib": "rimraf lib tsconfig.tsbuildinfo", "eslint": "eslint . --ext .ts,.tsx --fix", "eslint:check": "eslint . --ext .ts,.tsx", - "watch": "tsc -w" + "install:extension": "jupyter labextension develop --overwrite .", + "prepare": "jlpm run clean && jlpm run build", + "watch": "run-p watch:src watch:labextension", + "watch:labextension": "jupyter labextension watch .", + "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "^2.0.0", - "@jupyterlab/launcher": "^2.0.0", - "@jupyterlab/mainmenu": "^2.0.0", - "@jupyterlab/nbformat": "^2.0.0", - "@lumino/algorithm": "^1.2.3", - "@lumino/coreutils": "^1.3.1", + "@jupyterlab/application": "~3.0.0-beta.3", + "@jupyterlab/launcher": "~3.0.0-beta.3", + "@jupyterlab/mainmenu": "~3.0.0-beta.3", + "@jupyterlab/nbformat": "~3.0.0-beta.3", + "@lumino/algorithm": "^1.3.3", + "@lumino/coreutils": "^1.5.3", "@lumino/datagrid": "^0.5.2", - "@lumino/disposable": "^1.3.1", - "@lumino/widgets": "^1.11.0" + "@lumino/disposable": "^1.4.3", + "@lumino/widgets": "^1.14.0" }, "devDependencies": { - "@typescript-eslint/eslint-plugin": "^2.21.0", - "@typescript-eslint/parser": "^2.21.0", - "eslint": "^6.8.0", - "eslint-config-prettier": "^6.10.0", + "@jupyterlab/builder": "^3.0.0-beta.3", + "@typescript-eslint/eslint-plugin": "^2.27.0", + "@typescript-eslint/parser": "^2.27.0", + "eslint": "^7.5.0", + "eslint-config-prettier": "^6.10.1", "eslint-plugin-jsdoc": "^22.0.0", "eslint-plugin-prettier": "^3.1.2", "eslint-plugin-react": "^7.18.3", - "rimraf": "^3.0.0", - "typescript": "~3.7.5" + "npm-run-all": "^4.1.5", + "prettier": "^1.19.0", + "rimraf": "^3.0.2", + "typescript": "~3.9.0" }, "sideEffects": [ "style/*.css" ], "jupyterlab": { - "extension": true + "extension": true, + "outputDir": "jupyterlab_examples_kernel_messaging/static" } -} +} \ No newline at end of file diff --git a/advanced/kernel-messaging/pyproject.toml b/advanced/kernel-messaging/pyproject.toml new file mode 100644 index 00000000..873d43f4 --- /dev/null +++ b/advanced/kernel-messaging/pyproject.toml @@ -0,0 +1,3 @@ +[build-system] +requires = ["jupyter_packaging~=0.6.0", "jupyterlab~=3.0.0b3", "setuptools>=40.8.0", "wheel"] +build-backend = "setuptools.build_meta" diff --git a/advanced/kernel-messaging/setup.py b/advanced/kernel-messaging/setup.py new file mode 100644 index 00000000..f6b64820 --- /dev/null +++ b/advanced/kernel-messaging/setup.py @@ -0,0 +1,87 @@ +""" +jupyterlab_examples_kernel_messaging setup +""" +import os + +from jupyter_packaging import ( + create_cmdclass, install_npm, ensure_targets, + combine_commands, ensure_python, get_version, +) +import setuptools + +HERE = os.path.abspath(os.path.dirname(__file__)) + +# The name of the project +name="jupyterlab_examples_kernel_messaging" + +# Ensure a valid python version +ensure_python(">=3.6") + +# Get our version +version = get_version(os.path.join(name, "_version.py")) + +lab_path = os.path.join(HERE, name, "static") + +# Representative files that should exist after a successful build +jstargets = [ + os.path.join(HERE, "lib", "index.js"), + os.path.join(HERE, name, "static", "package.json"), +] + +package_data_spec = { + name: [ + "*" + ] +} + +labext_name = "@jupyterlab-examples/kernel-messaging" + +data_files_spec = [ + ("share/jupyter/labextensions/%s" % labext_name, lab_path, "*.*"), +] + +cmdclass = create_cmdclass("jsdeps", + package_data_spec=package_data_spec, + data_files_spec=data_files_spec +) + +cmdclass["jsdeps"] = combine_commands( + install_npm(HERE, build_cmd="build:all", npm=["jlpm"]), + ensure_targets(jstargets), +) + +with open("README.md", "r") as fh: + long_description = fh.read() + +setup_args = dict( + name=name, + version=version, + url="https://github.com/jupyterlab/extension-examples.git", + author="Project Jupyter Contributors", + description="minimal lab example", + long_description= long_description, + long_description_content_type="text/markdown", + cmdclass= cmdclass, + packages=setuptools.find_packages(), + install_requires=[ + "jupyterlab~=3.0.0b3", + ], + zip_safe=False, + include_package_data=True, + license="BSD-3-Clause", + platforms="Linux, Mac OS X, Windows", + keywords=["Jupyter", "JupyterLab"], + classifiers=[ + "License :: OSI Approved :: BSD License", + "Programming Language :: Python", + "Programming Language :: Python :: 3", + "Programming Language :: Python :: 3.6", + "Programming Language :: Python :: 3.7", + "Programming Language :: Python :: 3.8", + "Framework :: Jupyter", + ], +) + + +if __name__ == "__main__": + setuptools.setup(**setup_args) diff --git a/advanced/kernel-output/MANIFEST.in b/advanced/kernel-output/MANIFEST.in new file mode 100644 index 00000000..fbb66f9d --- /dev/null +++ b/advanced/kernel-output/MANIFEST.in @@ -0,0 +1,22 @@ +include LICENSE +include README.md +include pyproject.toml +include jupyter-config/jupyterlab_examples_kernel_output.json + +include package.json +include ts*.json + +graft jupyterlab_examples_kernel_output/static + +# Javascript files +graft src +graft style +prune **/node_modules +prune lib + +# Patterns to exclude from any directory +global-exclude *~ +global-exclude *.pyc +global-exclude *.pyo +global-exclude .git +global-exclude .ipynb_checkpoints diff --git a/advanced/kernel-output/jupyterlab_examples_kernel_output/__init__.py b/advanced/kernel-output/jupyterlab_examples_kernel_output/__init__.py new file mode 100644 index 00000000..819e43e0 --- /dev/null +++ b/advanced/kernel-output/jupyterlab_examples_kernel_output/__init__.py @@ -0,0 +1,19 @@ + +import json +import os.path as osp + +from ._version import __version__ + +HERE = osp.abspath(osp.dirname(__file__)) + +with open(osp.join(HERE, 'static', 'package.json')) as fid: + data = json.load(fid) + +def _jupyter_labextension_paths(): + return [{ + 'src': 'static', + 'dest': data['name'] + }] + + + diff --git a/advanced/kernel-output/jupyterlab_examples_kernel_output/_version.py b/advanced/kernel-output/jupyterlab_examples_kernel_output/_version.py new file mode 100644 index 00000000..ee864fc9 --- /dev/null +++ b/advanced/kernel-output/jupyterlab_examples_kernel_output/_version.py @@ -0,0 +1,2 @@ +version_info = (0, 1, 0) +__version__ = ".".join(map(str, version_info)) diff --git a/advanced/kernel-output/package.json b/advanced/kernel-output/package.json index 1c85e901..40cd3867 100644 --- a/advanced/kernel-output/package.json +++ b/advanced/kernel-output/package.json @@ -25,39 +25,51 @@ "url": "https://github.com/jupyterlab/extension-examples.git" }, "scripts": { - "build": "tsc", - "clean": "rimraf lib tsconfig.tsbuildinfo", - "install-ext": "jupyter labextension install . --no-build", - "prepare": "jlpm run clean && jlpm run build", + "build": "jlpm run build:lib", + "build:all": "jlpm run build:lib && jlpm run build:labextension", + "build:labextension": "jupyter labextension build .", + "build:lib": "tsc", + "clean": "jlpm run clean:lib", + "clean:all": "jlpm run clean:lib && jlpm run clean:labextension", + "clean:labextension": "rimraf jupyterlab_examples_kernel_output/static", + "clean:lib": "rimraf lib tsconfig.tsbuildinfo", "eslint": "eslint . --ext .ts,.tsx --fix", "eslint:check": "eslint . --ext .ts,.tsx", - "watch": "tsc -w" + "install:extension": "jupyter labextension develop --overwrite .", + "prepare": "jlpm run clean && jlpm run build", + "watch": "run-p watch:src watch:labextension", + "watch:labextension": "jupyter labextension watch .", + "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "^2.0.0", - "@jupyterlab/launcher": "^2.0.0", - "@jupyterlab/mainmenu": "^2.0.0", - "@jupyterlab/outputarea": "^2.0.0", - "@lumino/algorithm": "^1.1.2", - "@lumino/coreutils": "^1.3.0", + "@jupyterlab/application": "~3.0.0-beta.3", + "@jupyterlab/launcher": "~3.0.0-beta.3", + "@jupyterlab/mainmenu": "~3.0.0-beta.3", + "@jupyterlab/outputarea": "~3.0.0-beta.3", + "@lumino/algorithm": "^1.3.3", + "@lumino/coreutils": "^1.5.3", "@lumino/datagrid": "^0.3.1", - "@lumino/disposable": "^1.1.2" + "@lumino/disposable": "^1.4.3" }, "devDependencies": { - "@typescript-eslint/eslint-plugin": "^2.21.0", - "@typescript-eslint/parser": "^2.21.0", - "eslint": "^6.8.0", - "eslint-config-prettier": "^6.10.0", + "@jupyterlab/builder": "^3.0.0-beta.3", + "@typescript-eslint/eslint-plugin": "^2.27.0", + "@typescript-eslint/parser": "^2.27.0", + "eslint": "^7.5.0", + "eslint-config-prettier": "^6.10.1", "eslint-plugin-jsdoc": "^22.0.0", "eslint-plugin-prettier": "^3.1.2", "eslint-plugin-react": "^7.18.3", - "rimraf": "^3.0.0", - "typescript": "~3.7.5" + "npm-run-all": "^4.1.5", + "prettier": "^1.19.0", + "rimraf": "^3.0.2", + "typescript": "~3.9.0" }, "sideEffects": [ "style/*.css" ], "jupyterlab": { - "extension": true + "extension": true, + "outputDir": "jupyterlab_examples_kernel_output/static" } -} +} \ No newline at end of file diff --git a/advanced/kernel-output/pyproject.toml b/advanced/kernel-output/pyproject.toml new file mode 100644 index 00000000..873d43f4 --- /dev/null +++ b/advanced/kernel-output/pyproject.toml @@ -0,0 +1,3 @@ +[build-system] +requires = ["jupyter_packaging~=0.6.0", "jupyterlab~=3.0.0b3", "setuptools>=40.8.0", "wheel"] +build-backend = "setuptools.build_meta" diff --git a/advanced/kernel-output/setup.py b/advanced/kernel-output/setup.py new file mode 100644 index 00000000..c2341904 --- /dev/null +++ b/advanced/kernel-output/setup.py @@ -0,0 +1,87 @@ +""" +jupyterlab_examples_kernel_output setup +""" +import os + +from jupyter_packaging import ( + create_cmdclass, install_npm, ensure_targets, + combine_commands, ensure_python, get_version, +) +import setuptools + +HERE = os.path.abspath(os.path.dirname(__file__)) + +# The name of the project +name="jupyterlab_examples_kernel_output" + +# Ensure a valid python version +ensure_python(">=3.6") + +# Get our version +version = get_version(os.path.join(name, "_version.py")) + +lab_path = os.path.join(HERE, name, "static") + +# Representative files that should exist after a successful build +jstargets = [ + os.path.join(HERE, "lib", "index.js"), + os.path.join(HERE, name, "static", "package.json"), +] + +package_data_spec = { + name: [ + "*" + ] +} + +labext_name = "@jupyterlab-examples/kernel-output" + +data_files_spec = [ + ("share/jupyter/labextensions/%s" % labext_name, lab_path, "*.*"), +] + +cmdclass = create_cmdclass("jsdeps", + package_data_spec=package_data_spec, + data_files_spec=data_files_spec +) + +cmdclass["jsdeps"] = combine_commands( + install_npm(HERE, build_cmd="build:all", npm=["jlpm"]), + ensure_targets(jstargets), +) + +with open("README.md", "r") as fh: + long_description = fh.read() + +setup_args = dict( + name=name, + version=version, + url="https://github.com/jupyterlab/extension-examples.git", + author="Project Jupyter Contributors", + description="minimal lab example", + long_description= long_description, + long_description_content_type="text/markdown", + cmdclass= cmdclass, + packages=setuptools.find_packages(), + install_requires=[ + "jupyterlab~=3.0.0b3", + ], + zip_safe=False, + include_package_data=True, + license="BSD-3-Clause", + platforms="Linux, Mac OS X, Windows", + keywords=["Jupyter", "JupyterLab"], + classifiers=[ + "License :: OSI Approved :: BSD License", + "Programming Language :: Python", + "Programming Language :: Python :: 3", + "Programming Language :: Python :: 3.6", + "Programming Language :: Python :: 3.7", + "Programming Language :: Python :: 3.8", + "Framework :: Jupyter", + ], +) + + +if __name__ == "__main__": + setuptools.setup(**setup_args) diff --git a/advanced/server-extension/README.md b/advanced/server-extension/README.md index 005450e3..a046dfd2 100644 --- a/advanced/server-extension/README.md +++ b/advanced/server-extension/README.md @@ -89,12 +89,12 @@ to demonstrate the use of GET and POST HTTP requests. The entry point for the frontend extension is `src/index.ts`. The communication with the server extension is contained in another file -`src/jlabextexample.ts`. So you need to import it: +`src/handler.ts`. So you need to import it: ```ts // src/index.ts#L12-L12 -import { requestAPI } from './jlabextexample'; +import { requestAPI } from './handler'; ``` In the `activate` function, the server extension is first called through @@ -167,7 +167,7 @@ The communication logic with the server is hidden in the `requestAPI` function. Its definition is : ```ts -// src/jlabextexample.ts#L12-L37 +// src/handler.ts#L12-L37 export async function requestAPI( endPoint = '', @@ -200,7 +200,7 @@ export async function requestAPI( First the server settings are obtained from: ```ts -// src/jlabextexample.ts#L17-L17 +// src/handler.ts#L17-L17 const settings = ServerConnection.makeSettings(); ``` @@ -214,7 +214,7 @@ jlpm add @jupyterlab/services Then the class `ServerConnection` can be imported: ```ts -// src/jlabextexample.ts#L3-L3 +// src/handler.ts#L3-L3 import { ServerConnection } from '@jupyterlab/services'; ``` @@ -222,7 +222,7 @@ import { ServerConnection } from '@jupyterlab/services'; The next step is to build the full request URL: ```ts -// src/jlabextexample.ts#L18-L21 +// src/handler.ts#L18-L21 const requestUrl = URLExt.join( settings.baseUrl, @@ -233,7 +233,7 @@ const requestUrl = URLExt.join( To concatenate the various parts, the `URLExt` utility is imported: ```ts -// src/jlabextexample.ts#L1-L1 +// src/handler.ts#L1-L1 import { URLExt } from '@jupyterlab/coreutils'; ``` @@ -247,7 +247,7 @@ jlpm add @jupyterlab/coreutils You now have all the elements to make the request: ```ts -// src/jlabextexample.ts#L26-L26 +// src/handler.ts#L26-L26 response = await ServerConnection.makeRequest(requestUrl, init, settings); ``` @@ -256,7 +256,7 @@ Finally, once the server response is obtained, its body is interpreted as JSON. And the resulting data is returned. ```ts -// src/jlabextexample.ts#L31-L37 +// src/handler.ts#L31-L37 const data = await response.json(); @@ -332,8 +332,22 @@ your extension needs to be defined as a proper Python package with some hook fun ```py # jlab_ext_example/__init__.py -from ._version import __version__ +import json +import os.path as osp + from .handlers import setup_handlers +from ._version import __version__ + +HERE = osp.abspath(osp.dirname(__file__)) + +with open(osp.join(HERE, 'static', 'package.json')) as fid: + data = json.load(fid) + +def _jupyter_labextension_paths(): + return [{ + 'src': 'static', + 'dest': data['name'] + }] def _jupyter_server_extension_paths(): @@ -353,6 +367,7 @@ def load_jupyter_server_extension(lab_app): "Registered jlab_ext_example extension at URL path /{}".format(url_path) ) + ``` The `_jupyter_jlab_ext_example_paths` provides the Python package name @@ -360,7 +375,7 @@ to the server. But the most important one is `load_jupyter_jlab_ext_example` that register new handlers. ```py -# jlab_ext_example/__init__.py#L17-L17 +# jlab_ext_example/__init__.py#L31-L31 setup_handlers(lab_app.web_app, url_path) ``` @@ -441,10 +456,10 @@ is the following: ```py # jlab_ext_example/handlers.py#L37-L43 -doc_url = url_path_join(base_url, url_path, "static") +doc_url = url_path_join(base_url, url_path, "public") doc_dir = os.getenv( "JLAB_SERVER_EXAMPLE_STATIC_DIR", - os.path.join(os.path.dirname(__file__), "static"), + os.path.join(os.path.dirname(__file__), "public"), ) handlers = [("{}/(.*)".format(doc_url), StaticFileHandler, {"path": doc_dir})] web_app.add_handlers(".*$", handlers) @@ -480,14 +495,13 @@ The `setup.py` file is the entry point to describe package metadata: # setup.py """ -Setup Module to setup Python Handlers for the jlab_ext_example extension. +jlab_ext_example setup """ import os -from os.path import join as pjoin from jupyter_packaging import ( create_cmdclass, install_npm, ensure_targets, - combine_commands, ensure_python, get_version + combine_commands, ensure_python, get_version, ) import setuptools @@ -497,16 +511,17 @@ HERE = os.path.abspath(os.path.dirname(__file__)) name="jlab_ext_example" # Ensure a valid python version -ensure_python(">=3.5") +ensure_python(">=3.6") -# Get the version -version = get_version(pjoin(name, "_version.py")) +# Get our version +version = get_version(os.path.join(name, "_version.py")) -lab_path = pjoin(HERE, name, "labextension") +lab_path = os.path.join(HERE, name, "static") # Representative files that should exist after a successful build jstargets = [ - pjoin(HERE, "lib", "jlabextexample.js"), + os.path.join(HERE, "lib", "index.js"), + os.path.join(HERE, name, "static", "package.json"), ] package_data_spec = { @@ -515,13 +530,15 @@ package_data_spec = { ] } +labext_name = "@jupyterlab-examples/server-extension" + data_files_spec = [ - ("share/jupyter/lab/extensions", lab_path, "*.tgz"), - ("etc/jupyter/jupyter_notebook_config.d", + ("share/jupyter/labextensions/%s" % labext_name, lab_path, "*.*"),("etc/jupyter/jupyter_server_config.d", "jupyter-config", "jlab_ext_example.json"), + ] -cmdclass = create_cmdclass("jsdeps", +cmdclass = create_cmdclass("jsdeps", package_data_spec=package_data_spec, data_files_spec=data_files_spec ) @@ -537,15 +554,15 @@ with open("README.md", "r") as fh: setup_args = dict( name=name, version=version, - url="https://github.com/jupyterlab/extension-examples", - author="JupyterLab", + url="https://github.com/jupyterlab/extension-examples.git", + author="Project Jupyter Contributors", description="A minimal JupyterLab extension with backend and frontend parts.", long_description= long_description, long_description_content_type="text/markdown", cmdclass= cmdclass, packages=setuptools.find_packages(), install_requires=[ - "jupyterlab~=2.0", + "jupyterlab~=3.0.0b3", ], zip_safe=False, include_package_data=True, @@ -556,7 +573,6 @@ setup_args = dict( "License :: OSI Approved :: BSD License", "Programming Language :: Python", "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.5", "Programming Language :: Python :: 3.6", "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", @@ -565,9 +581,10 @@ setup_args = dict( ) -if __name__ == '__main__': +if __name__ == "__main__": setuptools.setup(**setup_args) + ``` But in this case, it is a bit more complicated to build the frontend extension and ship it @@ -576,9 +593,9 @@ the frontend NPM package needs to be built and inserted in the Python package. T done using a special `cmdclass`: ```py -# setup.py#L43-L51 +# setup.py#L45-L53 -cmdclass = create_cmdclass("jsdeps", +cmdclass = create_cmdclass("jsdeps", package_data_spec=package_data_spec, data_files_spec=data_files_spec ) @@ -592,7 +609,7 @@ cmdclass["jsdeps"] = combine_commands( Basically it will build the frontend NPM package: ```py -# setup.py#L49-L49 +# setup.py#L51-L51 install_npm(HERE, build_cmd="build:all", npm=["jlpm"]), ``` @@ -600,10 +617,11 @@ install_npm(HERE, build_cmd="build:all", npm=["jlpm"]), It will ensure one of the generated JS files is `lib/jlabextexample.js`: ```py -# setup.py#L27-L29 +# setup.py#L26-L29 jstargets = [ - pjoin(HERE, "lib", "jlabextexample.js"), + os.path.join(HERE, "lib", "index.js"), + os.path.join(HERE, name, "static", "package.json"), ] ``` @@ -611,9 +629,8 @@ It will copy the NPM package in the Python package and force it to be copied in JupyterLab is looking for frontend extensions when the Python package is installed: ```py -# setup.py#L38-L38 -("share/jupyter/lab/extensions", lab_path, "*.tgz"), +("share/jupyter/labextensions/%s" % labext_name, lab_path, "*.*") ``` The last piece of configuration needed is the enabling of the server extension. This is @@ -623,8 +640,8 @@ done by copying the following JSON file: // jupyter-config/jlab_ext_example.json { - "NotebookApp": { - "nbserver_extensions": { + "ServerApp": { + "jpserver_extensions": { "jlab_ext_example": true } } @@ -632,13 +649,12 @@ done by copying the following JSON file: ``` -in the appropriate jupyter folder (`etc/jupyter/jupyter_notebook_config.d`): +in the appropriate jupyter folder (`etc/jupyter/jupyter_server_config.d`): ```py -# setup.py#L39-L40 -("etc/jupyter/jupyter_notebook_config.d", - "jupyter-config", "jlab_ext_example.json"), + ("etc/jupyter/jupyter_server_config.d", + "jupyter-config", "jlab_ext_example.json"), ``` ### JupyterLab Extension Manager @@ -650,7 +666,7 @@ user about that dependency by adding the `discovery` metadata to your `package.j file: ```json5 -// package.json#L63-L73 +// package.json#L68-L78 "jupyterlab": { "discovery": { @@ -668,7 +684,7 @@ file: In this example, the extension requires a `server` extension: ```json5 -// package.json#L65-L65 +// package.json#L70-L70 "server": { ``` @@ -676,7 +692,7 @@ In this example, the extension requires a `server` extension: And that server extension is available through `pip`: ```json5 -// package.json#L66-L68 +// package.json#L71-L73 "managers": [ "pip" @@ -693,12 +709,8 @@ With the packaging described above, installing the extension is done in two comm # Install the server extension and # copy the frontend extension where JupyterLab can find it pip install jlab_ext_example -# Build JupyterLab to integrate the frontend extension -jupyter lab build ``` -> Note: User will need NodeJS to install the extension. - As developer, you might want to install the package in local editable mode. This will shunt the installation machinery described above. Therefore the commands to get you set are: @@ -706,18 +718,12 @@ to get you set are: ```bash # Install server extension in editable mode pip install -e . -# Register server extension -jupyter serverextension enable --py jlab_ext_example -# Install dependencies -jlpm # Build Typescript source jlpm build # Install your development version of the extension with JupyterLab -jupyter labextension install . +jupyter labextension develop . # Rebuild Typescript source after making changes jlpm build -# Rebuild JupyterLab after making any changes -jupyter lab build ``` diff --git a/advanced/server-extension/jlab_ext_example/handlers.py b/advanced/server-extension/jlab_ext_example/handlers.py index 11b72e0c..7effc12b 100644 --- a/advanced/server-extension/jlab_ext_example/handlers.py +++ b/advanced/server-extension/jlab_ext_example/handlers.py @@ -25,7 +25,6 @@ def post(self): def setup_handlers(web_app, url_path): - import pdb; pdb.set_trace() host_pattern = ".*$" base_url = web_app.settings["base_url"] diff --git a/advanced/server-extension/setup.py b/advanced/server-extension/setup.py index 89ed6ca2..9631d2da 100644 --- a/advanced/server-extension/setup.py +++ b/advanced/server-extension/setup.py @@ -1,12 +1,11 @@ """ -Setup Module to setup Python Handlers for the jlab_ext_example extension. +jlab_ext_example setup """ import os -from os.path import join as pjoin from jupyter_packaging import ( create_cmdclass, install_npm, ensure_targets, - combine_commands, ensure_python, get_version + combine_commands, ensure_python, get_version, ) import setuptools @@ -18,8 +17,8 @@ # Ensure a valid python version ensure_python(">=3.6") -# Get the version -version = get_version(pjoin(name, "_version.py")) +# Get our version +version = get_version(os.path.join(name, "_version.py")) lab_path = os.path.join(HERE, name, "static") @@ -38,12 +37,12 @@ labext_name = "@jupyterlab-examples/server-extension" data_files_spec = [ - ("share/jupyter/labextensions/%s" % labext_name, lab_path, "*.*"), - ("etc/jupyter/jupyter_server_config.d", - "jupyter-config", "jlab_ext_example.json"), + ("share/jupyter/labextensions/%s" % labext_name, lab_path, "*.*"),("etc/jupyter/jupyter_server_config.d", + "jupyter-config", "jlab_ext_example.json"), + ] -cmdclass = create_cmdclass("jsdeps", +cmdclass = create_cmdclass("jsdeps", package_data_spec=package_data_spec, data_files_spec=data_files_spec ) @@ -59,8 +58,8 @@ setup_args = dict( name=name, version=version, - url="https://github.com/jupyterlab/extension-examples", - author="JupyterLab", + url="https://github.com/jupyterlab/extension-examples.git", + author="Project Jupyter Contributors", description="A minimal JupyterLab extension with backend and frontend parts.", long_description= long_description, long_description_content_type="text/markdown", @@ -78,7 +77,6 @@ "License :: OSI Approved :: BSD License", "Programming Language :: Python", "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.5", "Programming Language :: Python :: 3.6", "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", @@ -87,5 +85,5 @@ ) -if __name__ == '__main__': +if __name__ == "__main__": setuptools.setup(**setup_args) diff --git a/advanced/server-extension/src/jlabextexample.ts b/advanced/server-extension/src/handler.ts similarity index 100% rename from advanced/server-extension/src/jlabextexample.ts rename to advanced/server-extension/src/handler.ts diff --git a/advanced/server-extension/src/index.ts b/advanced/server-extension/src/index.ts index 2f68eaf7..5883e09d 100644 --- a/advanced/server-extension/src/index.ts +++ b/advanced/server-extension/src/index.ts @@ -9,7 +9,7 @@ import { PageConfig } from '@jupyterlab/coreutils'; import { ILauncher } from '@jupyterlab/launcher'; -import { requestAPI } from './jlabextexample'; +import { requestAPI } from './handler'; /** * The command IDs used by the server extension plugin. diff --git a/basics/datagrid/MANIFEST.in b/basics/datagrid/MANIFEST.in new file mode 100644 index 00000000..ef85b8ba --- /dev/null +++ b/basics/datagrid/MANIFEST.in @@ -0,0 +1,22 @@ +include LICENSE +include README.md +include pyproject.toml +include jupyter-config/jupyterlab_examples_datagrid.json + +include package.json +include ts*.json + +graft jupyterlab_examples_datagrid/static + +# Javascript files +graft src +graft style +prune **/node_modules +prune lib + +# Patterns to exclude from any directory +global-exclude *~ +global-exclude *.pyc +global-exclude *.pyo +global-exclude .git +global-exclude .ipynb_checkpoints diff --git a/basics/datagrid/jupyterlab_examples_datagrid/__init__.py b/basics/datagrid/jupyterlab_examples_datagrid/__init__.py new file mode 100644 index 00000000..819e43e0 --- /dev/null +++ b/basics/datagrid/jupyterlab_examples_datagrid/__init__.py @@ -0,0 +1,19 @@ + +import json +import os.path as osp + +from ._version import __version__ + +HERE = osp.abspath(osp.dirname(__file__)) + +with open(osp.join(HERE, 'static', 'package.json')) as fid: + data = json.load(fid) + +def _jupyter_labextension_paths(): + return [{ + 'src': 'static', + 'dest': data['name'] + }] + + + diff --git a/basics/datagrid/jupyterlab_examples_datagrid/_version.py b/basics/datagrid/jupyterlab_examples_datagrid/_version.py new file mode 100644 index 00000000..ee864fc9 --- /dev/null +++ b/basics/datagrid/jupyterlab_examples_datagrid/_version.py @@ -0,0 +1,2 @@ +version_info = (0, 1, 0) +__version__ = ".".join(map(str, version_info)) diff --git a/basics/datagrid/package.json b/basics/datagrid/package.json index dfe1036e..ce2738f5 100644 --- a/basics/datagrid/package.json +++ b/basics/datagrid/package.json @@ -25,37 +25,49 @@ "url": "https://github.com/jupyterlab/extension-examples.git" }, "scripts": { - "build": "tsc", - "clean": "rimraf lib tsconfig.tsbuildinfo", - "install-ext": "jupyter labextension install . --no-build", - "prepare": "jlpm run clean && jlpm run build", + "build": "jlpm run build:lib", + "build:all": "jlpm run build:lib && jlpm run build:labextension", + "build:labextension": "jupyter labextension build .", + "build:lib": "tsc", + "clean": "jlpm run clean:lib", + "clean:all": "jlpm run clean:lib && jlpm run clean:labextension", + "clean:labextension": "rimraf jupyterlab_examples_datagrid/static", + "clean:lib": "rimraf lib tsconfig.tsbuildinfo", "eslint": "eslint . --ext .ts,.tsx --fix", "eslint:check": "eslint . --ext .ts,.tsx", - "watch": "tsc -w" + "install:extension": "jupyter labextension develop --overwrite .", + "prepare": "jlpm run clean && jlpm run build", + "watch": "run-p watch:src watch:labextension", + "watch:labextension": "jupyter labextension watch .", + "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "^2.0.0", - "@jupyterlab/mainmenu": "^2.0.0", - "@lumino/algorithm": "^1.2.3", - "@lumino/coreutils": "^1.3.1", + "@jupyterlab/application": "~3.0.0-beta.3", + "@jupyterlab/mainmenu": "~3.0.0-beta.3", + "@lumino/algorithm": "^1.3.3", + "@lumino/coreutils": "^1.5.3", "@lumino/datagrid": "^0.5.2", - "@lumino/disposable": "^1.3.1" + "@lumino/disposable": "^1.4.3" }, "devDependencies": { - "@typescript-eslint/eslint-plugin": "^2.21.0", - "@typescript-eslint/parser": "^2.21.0", - "eslint": "^6.8.0", - "eslint-config-prettier": "^6.10.0", + "@jupyterlab/builder": "^3.0.0-beta.3", + "@typescript-eslint/eslint-plugin": "^2.27.0", + "@typescript-eslint/parser": "^2.27.0", + "eslint": "^7.5.0", + "eslint-config-prettier": "^6.10.1", "eslint-plugin-jsdoc": "^22.0.0", "eslint-plugin-prettier": "^3.1.2", "eslint-plugin-react": "^7.18.3", - "rimraf": "^3.0.0", - "typescript": "~3.7.5" + "npm-run-all": "^4.1.5", + "prettier": "^1.19.0", + "rimraf": "^3.0.2", + "typescript": "~3.9.0" }, "sideEffects": [ "style/*.css" ], "jupyterlab": { - "extension": true + "extension": true, + "outputDir": "jupyterlab_examples_datagrid/static" } -} +} \ No newline at end of file diff --git a/basics/datagrid/pyproject.toml b/basics/datagrid/pyproject.toml new file mode 100644 index 00000000..873d43f4 --- /dev/null +++ b/basics/datagrid/pyproject.toml @@ -0,0 +1,3 @@ +[build-system] +requires = ["jupyter_packaging~=0.6.0", "jupyterlab~=3.0.0b3", "setuptools>=40.8.0", "wheel"] +build-backend = "setuptools.build_meta" diff --git a/basics/datagrid/setup.py b/basics/datagrid/setup.py new file mode 100644 index 00000000..54b85be6 --- /dev/null +++ b/basics/datagrid/setup.py @@ -0,0 +1,87 @@ +""" +jupyterlab_examples_datagrid setup +""" +import os + +from jupyter_packaging import ( + create_cmdclass, install_npm, ensure_targets, + combine_commands, ensure_python, get_version, +) +import setuptools + +HERE = os.path.abspath(os.path.dirname(__file__)) + +# The name of the project +name="jupyterlab_examples_datagrid" + +# Ensure a valid python version +ensure_python(">=3.6") + +# Get our version +version = get_version(os.path.join(name, "_version.py")) + +lab_path = os.path.join(HERE, name, "static") + +# Representative files that should exist after a successful build +jstargets = [ + os.path.join(HERE, "lib", "index.js"), + os.path.join(HERE, name, "static", "package.json"), +] + +package_data_spec = { + name: [ + "*" + ] +} + +labext_name = "@jupyterlab-examples/datagrid" + +data_files_spec = [ + ("share/jupyter/labextensions/%s" % labext_name, lab_path, "*.*"), +] + +cmdclass = create_cmdclass("jsdeps", + package_data_spec=package_data_spec, + data_files_spec=data_files_spec +) + +cmdclass["jsdeps"] = combine_commands( + install_npm(HERE, build_cmd="build:all", npm=["jlpm"]), + ensure_targets(jstargets), +) + +with open("README.md", "r") as fh: + long_description = fh.read() + +setup_args = dict( + name=name, + version=version, + url="https://github.com/jupyterlab/extension-examples.git", + author="Project Jupyter Contributors", + description="minimal lab example", + long_description= long_description, + long_description_content_type="text/markdown", + cmdclass= cmdclass, + packages=setuptools.find_packages(), + install_requires=[ + "jupyterlab~=3.0.0b3", + ], + zip_safe=False, + include_package_data=True, + license="BSD-3-Clause", + platforms="Linux, Mac OS X, Windows", + keywords=["Jupyter", "JupyterLab"], + classifiers=[ + "License :: OSI Approved :: BSD License", + "Programming Language :: Python", + "Programming Language :: Python :: 3", + "Programming Language :: Python :: 3.6", + "Programming Language :: Python :: 3.7", + "Programming Language :: Python :: 3.8", + "Framework :: Jupyter", + ], +) + + +if __name__ == "__main__": + setuptools.setup(**setup_args) diff --git a/basics/hello-world/MANIFEST.in b/basics/hello-world/MANIFEST.in new file mode 100644 index 00000000..a766c6f4 --- /dev/null +++ b/basics/hello-world/MANIFEST.in @@ -0,0 +1,22 @@ +include LICENSE +include README.md +include pyproject.toml +include jupyter-config/jupyterlab_examples_hello_world.json + +include package.json +include ts*.json + +graft jupyterlab_examples_hello_world/static + +# Javascript files +graft src +graft style +prune **/node_modules +prune lib + +# Patterns to exclude from any directory +global-exclude *~ +global-exclude *.pyc +global-exclude *.pyo +global-exclude .git +global-exclude .ipynb_checkpoints diff --git a/basics/hello-world/README.md b/basics/hello-world/README.md index 5d4e5745..4ea18e27 100644 --- a/basics/hello-world/README.md +++ b/basics/hello-world/README.md @@ -91,10 +91,10 @@ called `@jupyterlab/application`. The dependency of your extension on this package is declared in the file `package.json`: ```json5 -// package.json#L36-L38 +// package.json#L44-L46 "dependencies": { - "@jupyterlab/application": "^2.0.0" + "@jupyterlab/application": "~3.0.0-beta.3" }, ``` diff --git a/basics/hello-world/jupyterlab_examples_hello_world/__init__.py b/basics/hello-world/jupyterlab_examples_hello_world/__init__.py new file mode 100644 index 00000000..819e43e0 --- /dev/null +++ b/basics/hello-world/jupyterlab_examples_hello_world/__init__.py @@ -0,0 +1,19 @@ + +import json +import os.path as osp + +from ._version import __version__ + +HERE = osp.abspath(osp.dirname(__file__)) + +with open(osp.join(HERE, 'static', 'package.json')) as fid: + data = json.load(fid) + +def _jupyter_labextension_paths(): + return [{ + 'src': 'static', + 'dest': data['name'] + }] + + + diff --git a/basics/hello-world/jupyterlab_examples_hello_world/_version.py b/basics/hello-world/jupyterlab_examples_hello_world/_version.py new file mode 100644 index 00000000..ee864fc9 --- /dev/null +++ b/basics/hello-world/jupyterlab_examples_hello_world/_version.py @@ -0,0 +1,2 @@ +version_info = (0, 1, 0) +__version__ = ".".join(map(str, version_info)) diff --git a/basics/hello-world/package.json b/basics/hello-world/package.json index 5124b0ac..8e796d21 100644 --- a/basics/hello-world/package.json +++ b/basics/hello-world/package.json @@ -25,32 +25,44 @@ "url": "https://github.com/jupyterlab/extension-examples.git" }, "scripts": { - "build": "tsc", - "clean": "rimraf lib tsconfig.tsbuildinfo", - "install-ext": "jupyter labextension install . --no-build", - "prepare": "jlpm run clean && jlpm run build", + "build": "jlpm run build:lib", + "build:all": "jlpm run build:lib && jlpm run build:labextension", + "build:labextension": "jupyter labextension build .", + "build:lib": "tsc", + "clean": "jlpm run clean:lib", + "clean:all": "jlpm run clean:lib && jlpm run clean:labextension", + "clean:labextension": "rimraf jupyterlab_examples_hello_world/static", + "clean:lib": "rimraf lib tsconfig.tsbuildinfo", "eslint": "eslint . --ext .ts,.tsx --fix", "eslint:check": "eslint . --ext .ts,.tsx", - "watch": "tsc -w" + "install:extension": "jupyter labextension develop --overwrite .", + "prepare": "jlpm run clean && jlpm run build", + "watch": "run-p watch:src watch:labextension", + "watch:labextension": "jupyter labextension watch .", + "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "^2.0.0" + "@jupyterlab/application": "~3.0.0-beta.3" }, "devDependencies": { - "@typescript-eslint/eslint-plugin": "^2.21.0", - "@typescript-eslint/parser": "^2.21.0", - "eslint": "^6.8.0", - "eslint-config-prettier": "^6.10.0", + "@jupyterlab/builder": "^3.0.0-beta.3", + "@typescript-eslint/eslint-plugin": "^2.27.0", + "@typescript-eslint/parser": "^2.27.0", + "eslint": "^7.5.0", + "eslint-config-prettier": "^6.10.1", "eslint-plugin-jsdoc": "^22.0.0", "eslint-plugin-prettier": "^3.1.2", "eslint-plugin-react": "^7.18.3", - "rimraf": "^3.0.0", - "typescript": "~3.7.5" + "npm-run-all": "^4.1.5", + "prettier": "^1.19.0", + "rimraf": "^3.0.2", + "typescript": "~3.9.0" }, "sideEffects": [ "style/*.css" ], "jupyterlab": { - "extension": true + "extension": true, + "outputDir": "jupyterlab_examples_hello_world/static" } -} +} \ No newline at end of file diff --git a/basics/hello-world/pyproject.toml b/basics/hello-world/pyproject.toml new file mode 100644 index 00000000..873d43f4 --- /dev/null +++ b/basics/hello-world/pyproject.toml @@ -0,0 +1,3 @@ +[build-system] +requires = ["jupyter_packaging~=0.6.0", "jupyterlab~=3.0.0b3", "setuptools>=40.8.0", "wheel"] +build-backend = "setuptools.build_meta" diff --git a/basics/hello-world/setup.py b/basics/hello-world/setup.py new file mode 100644 index 00000000..56c37399 --- /dev/null +++ b/basics/hello-world/setup.py @@ -0,0 +1,87 @@ +""" +jupyterlab_examples_hello_world setup +""" +import os + +from jupyter_packaging import ( + create_cmdclass, install_npm, ensure_targets, + combine_commands, ensure_python, get_version, +) +import setuptools + +HERE = os.path.abspath(os.path.dirname(__file__)) + +# The name of the project +name="jupyterlab_examples_hello_world" + +# Ensure a valid python version +ensure_python(">=3.6") + +# Get our version +version = get_version(os.path.join(name, "_version.py")) + +lab_path = os.path.join(HERE, name, "static") + +# Representative files that should exist after a successful build +jstargets = [ + os.path.join(HERE, "lib", "index.js"), + os.path.join(HERE, name, "static", "package.json"), +] + +package_data_spec = { + name: [ + "*" + ] +} + +labext_name = "@jupyterlab-examples/hello-world" + +data_files_spec = [ + ("share/jupyter/labextensions/%s" % labext_name, lab_path, "*.*"), +] + +cmdclass = create_cmdclass("jsdeps", + package_data_spec=package_data_spec, + data_files_spec=data_files_spec +) + +cmdclass["jsdeps"] = combine_commands( + install_npm(HERE, build_cmd="build:all", npm=["jlpm"]), + ensure_targets(jstargets), +) + +with open("README.md", "r") as fh: + long_description = fh.read() + +setup_args = dict( + name=name, + version=version, + url="https://github.com/jupyterlab/extension-examples.git", + author="Project Jupyter Contributors", + description="minimal lab example", + long_description= long_description, + long_description_content_type="text/markdown", + cmdclass= cmdclass, + packages=setuptools.find_packages(), + install_requires=[ + "jupyterlab~=3.0.0b3", + ], + zip_safe=False, + include_package_data=True, + license="BSD-3-Clause", + platforms="Linux, Mac OS X, Windows", + keywords=["Jupyter", "JupyterLab"], + classifiers=[ + "License :: OSI Approved :: BSD License", + "Programming Language :: Python", + "Programming Language :: Python :: 3", + "Programming Language :: Python :: 3.6", + "Programming Language :: Python :: 3.7", + "Programming Language :: Python :: 3.8", + "Framework :: Jupyter", + ], +) + + +if __name__ == "__main__": + setuptools.setup(**setup_args) diff --git a/basics/signals/MANIFEST.in b/basics/signals/MANIFEST.in new file mode 100644 index 00000000..01de20c5 --- /dev/null +++ b/basics/signals/MANIFEST.in @@ -0,0 +1,22 @@ +include LICENSE +include README.md +include pyproject.toml +include jupyter-config/jupyterlab_examples_signals.json + +include package.json +include ts*.json + +graft jupyterlab_examples_signals/static + +# Javascript files +graft src +graft style +prune **/node_modules +prune lib + +# Patterns to exclude from any directory +global-exclude *~ +global-exclude *.pyc +global-exclude *.pyo +global-exclude .git +global-exclude .ipynb_checkpoints diff --git a/basics/signals/jupyterlab_examples_signals/__init__.py b/basics/signals/jupyterlab_examples_signals/__init__.py new file mode 100644 index 00000000..819e43e0 --- /dev/null +++ b/basics/signals/jupyterlab_examples_signals/__init__.py @@ -0,0 +1,19 @@ + +import json +import os.path as osp + +from ._version import __version__ + +HERE = osp.abspath(osp.dirname(__file__)) + +with open(osp.join(HERE, 'static', 'package.json')) as fid: + data = json.load(fid) + +def _jupyter_labextension_paths(): + return [{ + 'src': 'static', + 'dest': data['name'] + }] + + + diff --git a/basics/signals/jupyterlab_examples_signals/_version.py b/basics/signals/jupyterlab_examples_signals/_version.py new file mode 100644 index 00000000..ee864fc9 --- /dev/null +++ b/basics/signals/jupyterlab_examples_signals/_version.py @@ -0,0 +1,2 @@ +version_info = (0, 1, 0) +__version__ = ".".join(map(str, version_info)) diff --git a/basics/signals/package.json b/basics/signals/package.json index 70a46700..16c25b3f 100644 --- a/basics/signals/package.json +++ b/basics/signals/package.json @@ -25,38 +25,50 @@ "url": "https://github.com/jupyterlab/extension-examples.git" }, "scripts": { - "build": "tsc", - "clean": "rimraf lib tsconfig.tsbuildinfo", - "install-ext": "jupyter labextension install . --no-build", - "prepare": "jlpm run clean && jlpm run build", + "build": "jlpm run build:lib", + "build:all": "jlpm run build:lib && jlpm run build:labextension", + "build:labextension": "jupyter labextension build .", + "build:lib": "tsc", + "clean": "jlpm run clean:lib", + "clean:all": "jlpm run clean:lib && jlpm run clean:labextension", + "clean:labextension": "rimraf jupyterlab_examples_signals/static", + "clean:lib": "rimraf lib tsconfig.tsbuildinfo", "eslint": "eslint . --ext .ts,.tsx --fix", "eslint:check": "eslint . --ext .ts,.tsx", - "watch": "tsc -w" + "install:extension": "jupyter labextension develop --overwrite .", + "prepare": "jlpm run clean && jlpm run build", + "watch": "run-p watch:src watch:labextension", + "watch:labextension": "jupyter labextension watch .", + "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "^2.0.0", - "@jupyterlab/launcher": "^2.0.0", - "@jupyterlab/mainmenu": "^2.0.0", - "@lumino/algorithm": "^1.2.0", - "@lumino/coreutils": "^1.3.1", + "@jupyterlab/application": "~3.0.0-beta.3", + "@jupyterlab/launcher": "~3.0.0-beta.3", + "@jupyterlab/mainmenu": "~3.0.0-beta.3", + "@lumino/algorithm": "^1.3.3", + "@lumino/coreutils": "^1.5.3", "@lumino/datagrid": "^0.3.1", - "@lumino/disposable": "^1.3.1" + "@lumino/disposable": "^1.4.3" }, "devDependencies": { - "@typescript-eslint/eslint-plugin": "^2.21.0", - "@typescript-eslint/parser": "^2.21.0", - "eslint": "^6.8.0", - "eslint-config-prettier": "^6.10.0", + "@jupyterlab/builder": "^3.0.0-beta.3", + "@typescript-eslint/eslint-plugin": "^2.27.0", + "@typescript-eslint/parser": "^2.27.0", + "eslint": "^7.5.0", + "eslint-config-prettier": "^6.10.1", "eslint-plugin-jsdoc": "^22.0.0", "eslint-plugin-prettier": "^3.1.2", "eslint-plugin-react": "^7.18.3", - "rimraf": "^3.0.0", - "typescript": "~3.7.5" + "npm-run-all": "^4.1.5", + "prettier": "^1.19.0", + "rimraf": "^3.0.2", + "typescript": "~3.9.0" }, "sideEffects": [ "style/*.css" ], "jupyterlab": { - "extension": true + "extension": true, + "outputDir": "jupyterlab_examples_signals/static" } -} +} \ No newline at end of file diff --git a/basics/signals/pyproject.toml b/basics/signals/pyproject.toml new file mode 100644 index 00000000..873d43f4 --- /dev/null +++ b/basics/signals/pyproject.toml @@ -0,0 +1,3 @@ +[build-system] +requires = ["jupyter_packaging~=0.6.0", "jupyterlab~=3.0.0b3", "setuptools>=40.8.0", "wheel"] +build-backend = "setuptools.build_meta" diff --git a/basics/signals/setup.py b/basics/signals/setup.py new file mode 100644 index 00000000..fe5de71d --- /dev/null +++ b/basics/signals/setup.py @@ -0,0 +1,87 @@ +""" +jupyterlab_examples_signals setup +""" +import os + +from jupyter_packaging import ( + create_cmdclass, install_npm, ensure_targets, + combine_commands, ensure_python, get_version, +) +import setuptools + +HERE = os.path.abspath(os.path.dirname(__file__)) + +# The name of the project +name="jupyterlab_examples_signals" + +# Ensure a valid python version +ensure_python(">=3.6") + +# Get our version +version = get_version(os.path.join(name, "_version.py")) + +lab_path = os.path.join(HERE, name, "static") + +# Representative files that should exist after a successful build +jstargets = [ + os.path.join(HERE, "lib", "index.js"), + os.path.join(HERE, name, "static", "package.json"), +] + +package_data_spec = { + name: [ + "*" + ] +} + +labext_name = "@jupyterlab-examples/signals" + +data_files_spec = [ + ("share/jupyter/labextensions/%s" % labext_name, lab_path, "*.*"), +] + +cmdclass = create_cmdclass("jsdeps", + package_data_spec=package_data_spec, + data_files_spec=data_files_spec +) + +cmdclass["jsdeps"] = combine_commands( + install_npm(HERE, build_cmd="build:all", npm=["jlpm"]), + ensure_targets(jstargets), +) + +with open("README.md", "r") as fh: + long_description = fh.read() + +setup_args = dict( + name=name, + version=version, + url="https://github.com/jupyterlab/extension-examples.git", + author="Project Jupyter Contributors", + description="minimal lab example", + long_description= long_description, + long_description_content_type="text/markdown", + cmdclass= cmdclass, + packages=setuptools.find_packages(), + install_requires=[ + "jupyterlab~=3.0.0b3", + ], + zip_safe=False, + include_package_data=True, + license="BSD-3-Clause", + platforms="Linux, Mac OS X, Windows", + keywords=["Jupyter", "JupyterLab"], + classifiers=[ + "License :: OSI Approved :: BSD License", + "Programming Language :: Python", + "Programming Language :: Python :: 3", + "Programming Language :: Python :: 3.6", + "Programming Language :: Python :: 3.7", + "Programming Language :: Python :: 3.8", + "Framework :: Jupyter", + ], +) + + +if __name__ == "__main__": + setuptools.setup(**setup_args) diff --git a/command-palette/MANIFEST.in b/command-palette/MANIFEST.in new file mode 100644 index 00000000..cabb5aa7 --- /dev/null +++ b/command-palette/MANIFEST.in @@ -0,0 +1,22 @@ +include LICENSE +include README.md +include pyproject.toml +include jupyter-config/jupyterlab_examples_command_palette.json + +include package.json +include ts*.json + +graft jupyterlab_examples_command_palette/static + +# Javascript files +graft src +graft style +prune **/node_modules +prune lib + +# Patterns to exclude from any directory +global-exclude *~ +global-exclude *.pyc +global-exclude *.pyo +global-exclude .git +global-exclude .ipynb_checkpoints diff --git a/command-palette/jupyterlab_examples_command_palette/__init__.py b/command-palette/jupyterlab_examples_command_palette/__init__.py new file mode 100644 index 00000000..819e43e0 --- /dev/null +++ b/command-palette/jupyterlab_examples_command_palette/__init__.py @@ -0,0 +1,19 @@ + +import json +import os.path as osp + +from ._version import __version__ + +HERE = osp.abspath(osp.dirname(__file__)) + +with open(osp.join(HERE, 'static', 'package.json')) as fid: + data = json.load(fid) + +def _jupyter_labextension_paths(): + return [{ + 'src': 'static', + 'dest': data['name'] + }] + + + diff --git a/command-palette/jupyterlab_examples_command_palette/_version.py b/command-palette/jupyterlab_examples_command_palette/_version.py new file mode 100644 index 00000000..ee864fc9 --- /dev/null +++ b/command-palette/jupyterlab_examples_command_palette/_version.py @@ -0,0 +1,2 @@ +version_info = (0, 1, 0) +__version__ = ".".join(map(str, version_info)) diff --git a/command-palette/package.json b/command-palette/package.json index 9c534f57..6fd52106 100644 --- a/command-palette/package.json +++ b/command-palette/package.json @@ -25,32 +25,44 @@ "url": "https://github.com/jupyterlab/extension-examples.git" }, "scripts": { - "build": "tsc", - "clean": "rimraf lib tsconfig.tsbuildinfo", - "install-ext": "jupyter labextension install . --no-build", - "prepare": "jlpm run clean && jlpm run build", + "build": "jlpm run build:lib", + "build:all": "jlpm run build:lib && jlpm run build:labextension", + "build:labextension": "jupyter labextension build .", + "build:lib": "tsc", + "clean": "jlpm run clean:lib", + "clean:all": "jlpm run clean:lib && jlpm run clean:labextension", + "clean:labextension": "rimraf jupyterlab_examples_command_palette/static", + "clean:lib": "rimraf lib tsconfig.tsbuildinfo", "eslint": "eslint . --ext .ts,.tsx --fix", "eslint:check": "eslint . --ext .ts,.tsx", - "watch": "tsc -w" + "install:extension": "jupyter labextension develop --overwrite .", + "prepare": "jlpm run clean && jlpm run build", + "watch": "run-p watch:src watch:labextension", + "watch:labextension": "jupyter labextension watch .", + "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "^2.0.0" + "@jupyterlab/application": "~3.0.0-beta.3" }, "devDependencies": { - "@typescript-eslint/eslint-plugin": "^2.21.0", - "@typescript-eslint/parser": "^2.21.0", - "eslint": "^6.8.0", - "eslint-config-prettier": "^6.10.0", + "@jupyterlab/builder": "^3.0.0-beta.3", + "@typescript-eslint/eslint-plugin": "^2.27.0", + "@typescript-eslint/parser": "^2.27.0", + "eslint": "^7.5.0", + "eslint-config-prettier": "^6.10.1", "eslint-plugin-jsdoc": "^22.0.0", "eslint-plugin-prettier": "^3.1.2", "eslint-plugin-react": "^7.18.3", - "rimraf": "^3.0.0", - "typescript": "~3.7.5" + "npm-run-all": "^4.1.5", + "prettier": "^1.19.0", + "rimraf": "^3.0.2", + "typescript": "~3.9.0" }, "sideEffects": [ "style/*.css" ], "jupyterlab": { - "extension": true + "extension": true, + "outputDir": "jupyterlab_examples_command_palette/static" } -} +} \ No newline at end of file diff --git a/command-palette/pyproject.toml b/command-palette/pyproject.toml new file mode 100644 index 00000000..873d43f4 --- /dev/null +++ b/command-palette/pyproject.toml @@ -0,0 +1,3 @@ +[build-system] +requires = ["jupyter_packaging~=0.6.0", "jupyterlab~=3.0.0b3", "setuptools>=40.8.0", "wheel"] +build-backend = "setuptools.build_meta" diff --git a/command-palette/setup.py b/command-palette/setup.py new file mode 100644 index 00000000..0d7a3d1a --- /dev/null +++ b/command-palette/setup.py @@ -0,0 +1,87 @@ +""" +jupyterlab_examples_command_palette setup +""" +import os + +from jupyter_packaging import ( + create_cmdclass, install_npm, ensure_targets, + combine_commands, ensure_python, get_version, +) +import setuptools + +HERE = os.path.abspath(os.path.dirname(__file__)) + +# The name of the project +name="jupyterlab_examples_command_palette" + +# Ensure a valid python version +ensure_python(">=3.6") + +# Get our version +version = get_version(os.path.join(name, "_version.py")) + +lab_path = os.path.join(HERE, name, "static") + +# Representative files that should exist after a successful build +jstargets = [ + os.path.join(HERE, "lib", "index.js"), + os.path.join(HERE, name, "static", "package.json"), +] + +package_data_spec = { + name: [ + "*" + ] +} + +labext_name = "@jupyterlab-examples/command-palette" + +data_files_spec = [ + ("share/jupyter/labextensions/%s" % labext_name, lab_path, "*.*"), +] + +cmdclass = create_cmdclass("jsdeps", + package_data_spec=package_data_spec, + data_files_spec=data_files_spec +) + +cmdclass["jsdeps"] = combine_commands( + install_npm(HERE, build_cmd="build:all", npm=["jlpm"]), + ensure_targets(jstargets), +) + +with open("README.md", "r") as fh: + long_description = fh.read() + +setup_args = dict( + name=name, + version=version, + url="https://github.com/jupyterlab/extension-examples.git", + author="Project Jupyter Contributors", + description="Minimal JupyterLab example adding a new command to the palette.", + long_description= long_description, + long_description_content_type="text/markdown", + cmdclass= cmdclass, + packages=setuptools.find_packages(), + install_requires=[ + "jupyterlab~=3.0.0b3", + ], + zip_safe=False, + include_package_data=True, + license="BSD-3-Clause", + platforms="Linux, Mac OS X, Windows", + keywords=["Jupyter", "JupyterLab"], + classifiers=[ + "License :: OSI Approved :: BSD License", + "Programming Language :: Python", + "Programming Language :: Python :: 3", + "Programming Language :: Python :: 3.6", + "Programming Language :: Python :: 3.7", + "Programming Language :: Python :: 3.8", + "Framework :: Jupyter", + ], +) + + +if __name__ == "__main__": + setuptools.setup(**setup_args) diff --git a/commands/MANIFEST.in b/commands/MANIFEST.in new file mode 100644 index 00000000..c27952a3 --- /dev/null +++ b/commands/MANIFEST.in @@ -0,0 +1,22 @@ +include LICENSE +include README.md +include pyproject.toml +include jupyter-config/jupyterlab_examples_commands.json + +include package.json +include ts*.json + +graft jupyterlab_examples_commands/static + +# Javascript files +graft src +graft style +prune **/node_modules +prune lib + +# Patterns to exclude from any directory +global-exclude *~ +global-exclude *.pyc +global-exclude *.pyo +global-exclude .git +global-exclude .ipynb_checkpoints diff --git a/commands/jupyterlab_examples_commands/__init__.py b/commands/jupyterlab_examples_commands/__init__.py new file mode 100644 index 00000000..819e43e0 --- /dev/null +++ b/commands/jupyterlab_examples_commands/__init__.py @@ -0,0 +1,19 @@ + +import json +import os.path as osp + +from ._version import __version__ + +HERE = osp.abspath(osp.dirname(__file__)) + +with open(osp.join(HERE, 'static', 'package.json')) as fid: + data = json.load(fid) + +def _jupyter_labextension_paths(): + return [{ + 'src': 'static', + 'dest': data['name'] + }] + + + diff --git a/commands/jupyterlab_examples_commands/_version.py b/commands/jupyterlab_examples_commands/_version.py new file mode 100644 index 00000000..ee864fc9 --- /dev/null +++ b/commands/jupyterlab_examples_commands/_version.py @@ -0,0 +1,2 @@ +version_info = (0, 1, 0) +__version__ = ".".join(map(str, version_info)) diff --git a/commands/package.json b/commands/package.json index 3cdbe104..05157984 100644 --- a/commands/package.json +++ b/commands/package.json @@ -25,32 +25,44 @@ "url": "https://github.com/jupyterlab/extension-examples.git" }, "scripts": { - "build": "tsc", - "clean": "rimraf lib tsconfig.tsbuildinfo", - "install-ext": "jupyter labextension install . --no-build", - "prepare": "jlpm run clean && jlpm run build", + "build": "jlpm run build:lib", + "build:all": "jlpm run build:lib && jlpm run build:labextension", + "build:labextension": "jupyter labextension build .", + "build:lib": "tsc", + "clean": "jlpm run clean:lib", + "clean:all": "jlpm run clean:lib && jlpm run clean:labextension", + "clean:labextension": "rimraf jupyterlab_examples_commands/static", + "clean:lib": "rimraf lib tsconfig.tsbuildinfo", "eslint": "eslint . --ext .ts,.tsx --fix", "eslint:check": "eslint . --ext .ts,.tsx", - "watch": "tsc -w" + "install:extension": "jupyter labextension develop --overwrite .", + "prepare": "jlpm run clean && jlpm run build", + "watch": "run-p watch:src watch:labextension", + "watch:labextension": "jupyter labextension watch .", + "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "^2.0.0" + "@jupyterlab/application": "~3.0.0-beta.3" }, "devDependencies": { - "@typescript-eslint/eslint-plugin": "^2.21.0", - "@typescript-eslint/parser": "^2.21.0", - "eslint": "^6.8.0", - "eslint-config-prettier": "^6.10.0", + "@jupyterlab/builder": "^3.0.0-beta.3", + "@typescript-eslint/eslint-plugin": "^2.27.0", + "@typescript-eslint/parser": "^2.27.0", + "eslint": "^7.5.0", + "eslint-config-prettier": "^6.10.1", "eslint-plugin-jsdoc": "^22.0.0", "eslint-plugin-prettier": "^3.1.2", "eslint-plugin-react": "^7.18.3", - "rimraf": "^3.0.0", - "typescript": "~3.7.5" + "npm-run-all": "^4.1.5", + "prettier": "^1.19.0", + "rimraf": "^3.0.2", + "typescript": "~3.9.0" }, "sideEffects": [ "style/*.css" ], "jupyterlab": { - "extension": true + "extension": true, + "outputDir": "jupyterlab_examples_commands/static" } -} +} \ No newline at end of file diff --git a/commands/pyproject.toml b/commands/pyproject.toml new file mode 100644 index 00000000..873d43f4 --- /dev/null +++ b/commands/pyproject.toml @@ -0,0 +1,3 @@ +[build-system] +requires = ["jupyter_packaging~=0.6.0", "jupyterlab~=3.0.0b3", "setuptools>=40.8.0", "wheel"] +build-backend = "setuptools.build_meta" diff --git a/commands/setup.py b/commands/setup.py new file mode 100644 index 00000000..0f4eab13 --- /dev/null +++ b/commands/setup.py @@ -0,0 +1,87 @@ +""" +jupyterlab_examples_commands setup +""" +import os + +from jupyter_packaging import ( + create_cmdclass, install_npm, ensure_targets, + combine_commands, ensure_python, get_version, +) +import setuptools + +HERE = os.path.abspath(os.path.dirname(__file__)) + +# The name of the project +name="jupyterlab_examples_commands" + +# Ensure a valid python version +ensure_python(">=3.6") + +# Get our version +version = get_version(os.path.join(name, "_version.py")) + +lab_path = os.path.join(HERE, name, "static") + +# Representative files that should exist after a successful build +jstargets = [ + os.path.join(HERE, "lib", "index.js"), + os.path.join(HERE, name, "static", "package.json"), +] + +package_data_spec = { + name: [ + "*" + ] +} + +labext_name = "@jupyterlab-examples/commands" + +data_files_spec = [ + ("share/jupyter/labextensions/%s" % labext_name, lab_path, "*.*"), +] + +cmdclass = create_cmdclass("jsdeps", + package_data_spec=package_data_spec, + data_files_spec=data_files_spec +) + +cmdclass["jsdeps"] = combine_commands( + install_npm(HERE, build_cmd="build:all", npm=["jlpm"]), + ensure_targets(jstargets), +) + +with open("README.md", "r") as fh: + long_description = fh.read() + +setup_args = dict( + name=name, + version=version, + url="https://github.com/jupyterlab/extension-examples.git", + author="Project Jupyter Contributors", + description="Minimal JupyterLab example creating a new command.", + long_description= long_description, + long_description_content_type="text/markdown", + cmdclass= cmdclass, + packages=setuptools.find_packages(), + install_requires=[ + "jupyterlab~=3.0.0b3", + ], + zip_safe=False, + include_package_data=True, + license="BSD-3-Clause", + platforms="Linux, Mac OS X, Windows", + keywords=["Jupyter", "JupyterLab"], + classifiers=[ + "License :: OSI Approved :: BSD License", + "Programming Language :: Python", + "Programming Language :: Python :: 3", + "Programming Language :: Python :: 3.6", + "Programming Language :: Python :: 3.7", + "Programming Language :: Python :: 3.8", + "Framework :: Jupyter", + ], +) + + +if __name__ == "__main__": + setuptools.setup(**setup_args) diff --git a/context-menu/MANIFEST.in b/context-menu/MANIFEST.in new file mode 100644 index 00000000..64369514 --- /dev/null +++ b/context-menu/MANIFEST.in @@ -0,0 +1,22 @@ +include LICENSE +include README.md +include pyproject.toml +include jupyter-config/jupyterlab_examples_context_menu.json + +include package.json +include ts*.json + +graft jupyterlab_examples_context_menu/static + +# Javascript files +graft src +graft style +prune **/node_modules +prune lib + +# Patterns to exclude from any directory +global-exclude *~ +global-exclude *.pyc +global-exclude *.pyo +global-exclude .git +global-exclude .ipynb_checkpoints diff --git a/context-menu/jupyterlab_examples_context_menu/__init__.py b/context-menu/jupyterlab_examples_context_menu/__init__.py new file mode 100644 index 00000000..819e43e0 --- /dev/null +++ b/context-menu/jupyterlab_examples_context_menu/__init__.py @@ -0,0 +1,19 @@ + +import json +import os.path as osp + +from ._version import __version__ + +HERE = osp.abspath(osp.dirname(__file__)) + +with open(osp.join(HERE, 'static', 'package.json')) as fid: + data = json.load(fid) + +def _jupyter_labextension_paths(): + return [{ + 'src': 'static', + 'dest': data['name'] + }] + + + diff --git a/context-menu/jupyterlab_examples_context_menu/_version.py b/context-menu/jupyterlab_examples_context_menu/_version.py new file mode 100644 index 00000000..ee864fc9 --- /dev/null +++ b/context-menu/jupyterlab_examples_context_menu/_version.py @@ -0,0 +1,2 @@ +version_info = (0, 1, 0) +__version__ = ".".join(map(str, version_info)) diff --git a/context-menu/package.json b/context-menu/package.json index 0dffb243..ae7c9b0e 100644 --- a/context-menu/package.json +++ b/context-menu/package.json @@ -25,35 +25,47 @@ "url": "https://github.com/jupyterlab/extension-examples.git" }, "scripts": { - "build": "tsc", - "clean": "rimraf lib tsconfig.tsbuildinfo", - "install-ext": "jupyter labextension install . --no-build", - "prepare": "jlpm run clean && jlpm run build", + "build": "jlpm run build:lib", + "build:all": "jlpm run build:lib && jlpm run build:labextension", + "build:labextension": "jupyter labextension build .", + "build:lib": "tsc", + "clean": "jlpm run clean:lib", + "clean:all": "jlpm run clean:lib && jlpm run clean:labextension", + "clean:labextension": "rimraf jupyterlab_examples_context_menu/static", + "clean:lib": "rimraf lib tsconfig.tsbuildinfo", "eslint": "eslint . --ext .ts,.tsx --fix", "eslint:check": "eslint . --ext .ts,.tsx", - "watch": "tsc -w" + "install:extension": "jupyter labextension develop --overwrite .", + "prepare": "jlpm run clean && jlpm run build", + "watch": "run-p watch:src watch:labextension", + "watch:labextension": "jupyter labextension watch .", + "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "^2.1.2", - "@jupyterlab/apputils": "^2.1.1", - "@jupyterlab/filebrowser": "^2.1.2", - "@jupyterlab/ui-components": "^2.1.1" + "@jupyterlab/application": "~3.0.0-beta.3", + "@jupyterlab/apputils": "~3.0.0-beta.3", + "@jupyterlab/filebrowser": "~3.0.0-beta.3", + "@jupyterlab/ui-components": "~3.0.0-beta.3" }, "devDependencies": { - "@typescript-eslint/eslint-plugin": "^2.21.0", - "@typescript-eslint/parser": "^2.21.0", - "eslint": "^6.8.0", - "eslint-config-prettier": "^6.10.0", + "@jupyterlab/builder": "^3.0.0-beta.3", + "@typescript-eslint/eslint-plugin": "^2.27.0", + "@typescript-eslint/parser": "^2.27.0", + "eslint": "^7.5.0", + "eslint-config-prettier": "^6.10.1", "eslint-plugin-jsdoc": "^22.0.0", "eslint-plugin-prettier": "^3.1.2", "eslint-plugin-react": "^7.18.3", - "rimraf": "^3.0.0", - "typescript": "~3.7.5" + "npm-run-all": "^4.1.5", + "prettier": "^1.19.0", + "rimraf": "^3.0.2", + "typescript": "~3.9.0" }, "sideEffects": [ "style/*.css" ], "jupyterlab": { - "extension": true + "extension": true, + "outputDir": "jupyterlab_examples_context_menu/static" } -} +} \ No newline at end of file diff --git a/context-menu/pyproject.toml b/context-menu/pyproject.toml new file mode 100644 index 00000000..873d43f4 --- /dev/null +++ b/context-menu/pyproject.toml @@ -0,0 +1,3 @@ +[build-system] +requires = ["jupyter_packaging~=0.6.0", "jupyterlab~=3.0.0b3", "setuptools>=40.8.0", "wheel"] +build-backend = "setuptools.build_meta" diff --git a/context-menu/setup.py b/context-menu/setup.py new file mode 100644 index 00000000..f6f9ec16 --- /dev/null +++ b/context-menu/setup.py @@ -0,0 +1,87 @@ +""" +jupyterlab_examples_context_menu setup +""" +import os + +from jupyter_packaging import ( + create_cmdclass, install_npm, ensure_targets, + combine_commands, ensure_python, get_version, +) +import setuptools + +HERE = os.path.abspath(os.path.dirname(__file__)) + +# The name of the project +name="jupyterlab_examples_context_menu" + +# Ensure a valid python version +ensure_python(">=3.6") + +# Get our version +version = get_version(os.path.join(name, "_version.py")) + +lab_path = os.path.join(HERE, name, "static") + +# Representative files that should exist after a successful build +jstargets = [ + os.path.join(HERE, "lib", "index.js"), + os.path.join(HERE, name, "static", "package.json"), +] + +package_data_spec = { + name: [ + "*" + ] +} + +labext_name = "@jupyterlab-examples/context-menu" + +data_files_spec = [ + ("share/jupyter/labextensions/%s" % labext_name, lab_path, "*.*"), +] + +cmdclass = create_cmdclass("jsdeps", + package_data_spec=package_data_spec, + data_files_spec=data_files_spec +) + +cmdclass["jsdeps"] = combine_commands( + install_npm(HERE, build_cmd="build:all", npm=["jlpm"]), + ensure_targets(jstargets), +) + +with open("README.md", "r") as fh: + long_description = fh.read() + +setup_args = dict( + name=name, + version=version, + url="https://github.com/jupyterlab/extension-examples.git", + author="Project Jupyter Contributors", + description="A minimal JupyterLab example to develop a context-menu.", + long_description= long_description, + long_description_content_type="text/markdown", + cmdclass= cmdclass, + packages=setuptools.find_packages(), + install_requires=[ + "jupyterlab~=3.0.0b3", + ], + zip_safe=False, + include_package_data=True, + license="BSD-3-Clause", + platforms="Linux, Mac OS X, Windows", + keywords=["Jupyter", "JupyterLab"], + classifiers=[ + "License :: OSI Approved :: BSD License", + "Programming Language :: Python", + "Programming Language :: Python :: 3", + "Programming Language :: Python :: 3.6", + "Programming Language :: Python :: 3.7", + "Programming Language :: Python :: 3.8", + "Framework :: Jupyter", + ], +) + + +if __name__ == "__main__": + setuptools.setup(**setup_args) diff --git a/launcher/LICENSE b/launcher/LICENSE deleted file mode 100644 index 2649ea39..00000000 --- a/launcher/LICENSE +++ /dev/null @@ -1,30 +0,0 @@ -BSD 3-Clause License - -Copyright (c) 2019, Jeremy Tuloup -Copyright (c) 2019, Jupyter Development Team -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - -1. Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - -2. Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - -3. Neither the name of the copyright holder nor the names of its - contributors may be used to endorse or promote products derived from - this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file diff --git a/launcher/MANIFEST.in b/launcher/MANIFEST.in new file mode 100644 index 00000000..f95674be --- /dev/null +++ b/launcher/MANIFEST.in @@ -0,0 +1,22 @@ +include LICENSE +include README.md +include pyproject.toml +include jupyter-config/jupyterlab_examples_launcher.json + +include package.json +include ts*.json + +graft jupyterlab_examples_launcher/static + +# Javascript files +graft src +graft style +prune **/node_modules +prune lib + +# Patterns to exclude from any directory +global-exclude *~ +global-exclude *.pyc +global-exclude *.pyo +global-exclude .git +global-exclude .ipynb_checkpoints diff --git a/launcher/jupyterlab_examples_launcher/__init__.py b/launcher/jupyterlab_examples_launcher/__init__.py new file mode 100644 index 00000000..819e43e0 --- /dev/null +++ b/launcher/jupyterlab_examples_launcher/__init__.py @@ -0,0 +1,19 @@ + +import json +import os.path as osp + +from ._version import __version__ + +HERE = osp.abspath(osp.dirname(__file__)) + +with open(osp.join(HERE, 'static', 'package.json')) as fid: + data = json.load(fid) + +def _jupyter_labextension_paths(): + return [{ + 'src': 'static', + 'dest': data['name'] + }] + + + diff --git a/launcher/jupyterlab_examples_launcher/_version.py b/launcher/jupyterlab_examples_launcher/_version.py new file mode 100644 index 00000000..ee864fc9 --- /dev/null +++ b/launcher/jupyterlab_examples_launcher/_version.py @@ -0,0 +1,2 @@ +version_info = (0, 1, 0) +__version__ = ".".join(map(str, version_info)) diff --git a/launcher/package.json b/launcher/package.json index 2ffb3ffb..7250966c 100644 --- a/launcher/package.json +++ b/launcher/package.json @@ -25,36 +25,48 @@ "url": "https://github.com/jupyterlab/extension-examples.git" }, "scripts": { - "build": "tsc", - "clean": "rimraf lib tsconfig.tsbuildinfo", - "install-ext": "jupyter labextension install . --no-build", - "prepare": "jlpm run clean && jlpm run build", + "build": "jlpm run build:lib", + "build:all": "jlpm run build:lib && jlpm run build:labextension", + "build:labextension": "jupyter labextension build .", + "build:lib": "tsc", + "clean": "jlpm run clean:lib", + "clean:all": "jlpm run clean:lib && jlpm run clean:labextension", + "clean:labextension": "rimraf jupyterlab_examples_launcher/static", + "clean:lib": "rimraf lib tsconfig.tsbuildinfo", "eslint": "eslint . --ext .ts,.tsx --fix", "eslint:check": "eslint . --ext .ts,.tsx", - "watch": "tsc -w" + "install:extension": "jupyter labextension develop --overwrite .", + "prepare": "jlpm run clean && jlpm run build", + "watch": "run-p watch:src watch:labextension", + "watch:labextension": "jupyter labextension watch .", + "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "^2.0.0", - "@jupyterlab/filebrowser": "^2.0.0", - "@jupyterlab/launcher": "^2.0.0", - "@jupyterlab/mainmenu": "^2.0.0" + "@jupyterlab/application": "~3.0.0-beta.3", + "@jupyterlab/filebrowser": "~3.0.0-beta.3", + "@jupyterlab/launcher": "~3.0.0-beta.3", + "@jupyterlab/mainmenu": "~3.0.0-beta.3" }, "devDependencies": { - "@typescript-eslint/eslint-plugin": "^2.21.0", - "@typescript-eslint/parser": "^2.21.0", - "eslint": "^6.8.0", - "eslint-config-prettier": "^6.10.0", + "@jupyterlab/builder": "^3.0.0-beta.3", + "@typescript-eslint/eslint-plugin": "^2.27.0", + "@typescript-eslint/parser": "^2.27.0", + "eslint": "^7.5.0", + "eslint-config-prettier": "^6.10.1", "eslint-plugin-jsdoc": "^22.0.0", "eslint-plugin-prettier": "^3.1.2", "eslint-plugin-react": "^7.18.3", - "rimraf": "^3.0.0", - "typescript": "~3.7.5" + "npm-run-all": "^4.1.5", + "prettier": "^1.19.0", + "rimraf": "^3.0.2", + "typescript": "~3.9.0" }, "sideEffects": [ "style/*.css", "style/*.svg" ], "jupyterlab": { - "extension": true + "extension": true, + "outputDir": "jupyterlab_examples_launcher/static" } -} +} \ No newline at end of file diff --git a/launcher/pyproject.toml b/launcher/pyproject.toml new file mode 100644 index 00000000..873d43f4 --- /dev/null +++ b/launcher/pyproject.toml @@ -0,0 +1,3 @@ +[build-system] +requires = ["jupyter_packaging~=0.6.0", "jupyterlab~=3.0.0b3", "setuptools>=40.8.0", "wheel"] +build-backend = "setuptools.build_meta" diff --git a/launcher/setup.py b/launcher/setup.py new file mode 100644 index 00000000..108459fc --- /dev/null +++ b/launcher/setup.py @@ -0,0 +1,87 @@ +""" +jupyterlab_examples_launcher setup +""" +import os + +from jupyter_packaging import ( + create_cmdclass, install_npm, ensure_targets, + combine_commands, ensure_python, get_version, +) +import setuptools + +HERE = os.path.abspath(os.path.dirname(__file__)) + +# The name of the project +name="jupyterlab_examples_launcher" + +# Ensure a valid python version +ensure_python(">=3.6") + +# Get our version +version = get_version(os.path.join(name, "_version.py")) + +lab_path = os.path.join(HERE, name, "static") + +# Representative files that should exist after a successful build +jstargets = [ + os.path.join(HERE, "lib", "index.js"), + os.path.join(HERE, name, "static", "package.json"), +] + +package_data_spec = { + name: [ + "*" + ] +} + +labext_name = "@jupyterlab-examples/launcher" + +data_files_spec = [ + ("share/jupyter/labextensions/%s" % labext_name, lab_path, "*.*"), +] + +cmdclass = create_cmdclass("jsdeps", + package_data_spec=package_data_spec, + data_files_spec=data_files_spec +) + +cmdclass["jsdeps"] = combine_commands( + install_npm(HERE, build_cmd="build:all", npm=["jlpm"]), + ensure_targets(jstargets), +) + +with open("README.md", "r") as fh: + long_description = fh.read() + +setup_args = dict( + name=name, + version=version, + url="https://github.com/jupyterlab/extension-examples.git", + author="Project Jupyter Contributors", + description="A minimal JupyterLab example using the launcher.", + long_description= long_description, + long_description_content_type="text/markdown", + cmdclass= cmdclass, + packages=setuptools.find_packages(), + install_requires=[ + "jupyterlab~=3.0.0b3", + ], + zip_safe=False, + include_package_data=True, + license="BSD-3-Clause", + platforms="Linux, Mac OS X, Windows", + keywords=["Jupyter", "JupyterLab"], + classifiers=[ + "License :: OSI Approved :: BSD License", + "Programming Language :: Python", + "Programming Language :: Python :: 3", + "Programming Language :: Python :: 3.6", + "Programming Language :: Python :: 3.7", + "Programming Language :: Python :: 3.8", + "Framework :: Jupyter", + ], +) + + +if __name__ == "__main__": + setuptools.setup(**setup_args) diff --git a/log-console/custom-log-console/MANIFEST.in b/log-console/custom-log-console/MANIFEST.in new file mode 100644 index 00000000..2f4f46ff --- /dev/null +++ b/log-console/custom-log-console/MANIFEST.in @@ -0,0 +1,22 @@ +include LICENSE +include README.md +include pyproject.toml +include jupyter-config/jupyterlab_examples_custom_log_console.json + +include package.json +include ts*.json + +graft jupyterlab_examples_custom_log_console/static + +# Javascript files +graft src +graft style +prune **/node_modules +prune lib + +# Patterns to exclude from any directory +global-exclude *~ +global-exclude *.pyc +global-exclude *.pyo +global-exclude .git +global-exclude .ipynb_checkpoints diff --git a/log-console/custom-log-console/jupyterlab_examples_custom_log_console/__init__.py b/log-console/custom-log-console/jupyterlab_examples_custom_log_console/__init__.py new file mode 100644 index 00000000..819e43e0 --- /dev/null +++ b/log-console/custom-log-console/jupyterlab_examples_custom_log_console/__init__.py @@ -0,0 +1,19 @@ + +import json +import os.path as osp + +from ._version import __version__ + +HERE = osp.abspath(osp.dirname(__file__)) + +with open(osp.join(HERE, 'static', 'package.json')) as fid: + data = json.load(fid) + +def _jupyter_labextension_paths(): + return [{ + 'src': 'static', + 'dest': data['name'] + }] + + + diff --git a/log-console/custom-log-console/jupyterlab_examples_custom_log_console/_version.py b/log-console/custom-log-console/jupyterlab_examples_custom_log_console/_version.py new file mode 100644 index 00000000..ee864fc9 --- /dev/null +++ b/log-console/custom-log-console/jupyterlab_examples_custom_log_console/_version.py @@ -0,0 +1,2 @@ +version_info = (0, 1, 0) +__version__ = ".".join(map(str, version_info)) diff --git a/log-console/custom-log-console/package.json b/log-console/custom-log-console/package.json index a16a0a49..8be681cf 100644 --- a/log-console/custom-log-console/package.json +++ b/log-console/custom-log-console/package.json @@ -25,41 +25,53 @@ "url": "https://github.com/jupyterlab/extension-examples.git" }, "scripts": { - "build": "tsc", - "clean": "rimraf lib tsconfig.tsbuildinfo", - "install-ext": "jupyter labextension install . --no-build", - "prepare": "jlpm run clean && jlpm run build", + "build": "jlpm run build:lib", + "build:all": "jlpm run build:lib && jlpm run build:labextension", + "build:labextension": "jupyter labextension build .", + "build:lib": "tsc", + "clean": "jlpm run clean:lib", + "clean:all": "jlpm run clean:lib && jlpm run clean:labextension", + "clean:labextension": "rimraf jupyterlab_examples_custom_log_console/static", + "clean:lib": "rimraf lib tsconfig.tsbuildinfo", "eslint": "eslint . --ext .ts,.tsx --fix", "eslint:check": "eslint . --ext .ts,.tsx", - "watch": "tsc -w" + "install:extension": "jupyter labextension develop --overwrite .", + "prepare": "jlpm run clean && jlpm run build", + "watch": "run-p watch:src watch:labextension", + "watch:labextension": "jupyter labextension watch .", + "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "^2.1.2", - "@jupyterlab/apputils": "^2.1.1", - "@jupyterlab/coreutils": "^4.1.0", - "@jupyterlab/logconsole": "^2.1.1", - "@jupyterlab/mainmenu": "^2.1.1", - "@jupyterlab/nbformat": "^2.1.0", - "@jupyterlab/rendermime": "^2.1.1", - "@jupyterlab/ui-components": "^2.1.1", - "@lumino/coreutils": "^1.5.0", - "@lumino/widgets": "^1.13.0" + "@jupyterlab/application": "~3.0.0-beta.3", + "@jupyterlab/apputils": "~3.0.0-beta.3", + "@jupyterlab/coreutils": "~5.0.0-beta.3", + "@jupyterlab/logconsole": "~3.0.0-beta.3", + "@jupyterlab/mainmenu": "~3.0.0-beta.3", + "@jupyterlab/nbformat": "~3.0.0-beta.3", + "@jupyterlab/rendermime": "~3.0.0-beta.3", + "@jupyterlab/ui-components": "~3.0.0-beta.3", + "@lumino/coreutils": "^1.5.3", + "@lumino/widgets": "^1.14.0" }, "devDependencies": { - "@typescript-eslint/eslint-plugin": "^2.21.0", - "@typescript-eslint/parser": "^2.21.0", - "eslint": "^6.8.0", - "eslint-config-prettier": "^6.10.0", + "@jupyterlab/builder": "^3.0.0-beta.3", + "@typescript-eslint/eslint-plugin": "^2.27.0", + "@typescript-eslint/parser": "^2.27.0", + "eslint": "^7.5.0", + "eslint-config-prettier": "^6.10.1", "eslint-plugin-jsdoc": "^22.0.0", "eslint-plugin-prettier": "^3.1.2", "eslint-plugin-react": "^7.18.3", - "rimraf": "^3.0.0", - "typescript": "~3.7.5" + "npm-run-all": "^4.1.5", + "prettier": "^1.19.0", + "rimraf": "^3.0.2", + "typescript": "~3.9.0" }, "sideEffects": [ "style/*.css" ], "jupyterlab": { - "extension": true + "extension": true, + "outputDir": "jupyterlab_examples_custom_log_console/static" } -} +} \ No newline at end of file diff --git a/log-console/custom-log-console/pyproject.toml b/log-console/custom-log-console/pyproject.toml new file mode 100644 index 00000000..873d43f4 --- /dev/null +++ b/log-console/custom-log-console/pyproject.toml @@ -0,0 +1,3 @@ +[build-system] +requires = ["jupyter_packaging~=0.6.0", "jupyterlab~=3.0.0b3", "setuptools>=40.8.0", "wheel"] +build-backend = "setuptools.build_meta" diff --git a/log-console/custom-log-console/setup.py b/log-console/custom-log-console/setup.py new file mode 100644 index 00000000..327f52ae --- /dev/null +++ b/log-console/custom-log-console/setup.py @@ -0,0 +1,87 @@ +""" +jupyterlab_examples_custom_log_console setup +""" +import os + +from jupyter_packaging import ( + create_cmdclass, install_npm, ensure_targets, + combine_commands, ensure_python, get_version, +) +import setuptools + +HERE = os.path.abspath(os.path.dirname(__file__)) + +# The name of the project +name="jupyterlab_examples_custom_log_console" + +# Ensure a valid python version +ensure_python(">=3.6") + +# Get our version +version = get_version(os.path.join(name, "_version.py")) + +lab_path = os.path.join(HERE, name, "static") + +# Representative files that should exist after a successful build +jstargets = [ + os.path.join(HERE, "lib", "index.js"), + os.path.join(HERE, name, "static", "package.json"), +] + +package_data_spec = { + name: [ + "*" + ] +} + +labext_name = "@jupyterlab-examples/custom-log-console" + +data_files_spec = [ + ("share/jupyter/labextensions/%s" % labext_name, lab_path, "*.*"), +] + +cmdclass = create_cmdclass("jsdeps", + package_data_spec=package_data_spec, + data_files_spec=data_files_spec +) + +cmdclass["jsdeps"] = combine_commands( + install_npm(HERE, build_cmd="build:all", npm=["jlpm"]), + ensure_targets(jstargets), +) + +with open("README.md", "r") as fh: + long_description = fh.read() + +setup_args = dict( + name=name, + version=version, + url="https://github.com/jupyterlab/extension-examples.git", + author="Project Jupyter Contributors", + description="A minimal JupyterLab example to develop a custom log console.", + long_description= long_description, + long_description_content_type="text/markdown", + cmdclass= cmdclass, + packages=setuptools.find_packages(), + install_requires=[ + "jupyterlab~=3.0.0b3", + ], + zip_safe=False, + include_package_data=True, + license="BSD-3-Clause", + platforms="Linux, Mac OS X, Windows", + keywords=["Jupyter", "JupyterLab"], + classifiers=[ + "License :: OSI Approved :: BSD License", + "Programming Language :: Python", + "Programming Language :: Python :: 3", + "Programming Language :: Python :: 3.6", + "Programming Language :: Python :: 3.7", + "Programming Language :: Python :: 3.8", + "Framework :: Jupyter", + ], +) + + +if __name__ == "__main__": + setuptools.setup(**setup_args) diff --git a/log-console/log-messages/MANIFEST.in b/log-console/log-messages/MANIFEST.in new file mode 100644 index 00000000..d3382d09 --- /dev/null +++ b/log-console/log-messages/MANIFEST.in @@ -0,0 +1,22 @@ +include LICENSE +include README.md +include pyproject.toml +include jupyter-config/jupyterlab_examples_log_messages.json + +include package.json +include ts*.json + +graft jupyterlab_examples_log_messages/static + +# Javascript files +graft src +graft style +prune **/node_modules +prune lib + +# Patterns to exclude from any directory +global-exclude *~ +global-exclude *.pyc +global-exclude *.pyo +global-exclude .git +global-exclude .ipynb_checkpoints diff --git a/log-console/log-messages/jupyterlab_examples_log_messages/__init__.py b/log-console/log-messages/jupyterlab_examples_log_messages/__init__.py new file mode 100644 index 00000000..819e43e0 --- /dev/null +++ b/log-console/log-messages/jupyterlab_examples_log_messages/__init__.py @@ -0,0 +1,19 @@ + +import json +import os.path as osp + +from ._version import __version__ + +HERE = osp.abspath(osp.dirname(__file__)) + +with open(osp.join(HERE, 'static', 'package.json')) as fid: + data = json.load(fid) + +def _jupyter_labextension_paths(): + return [{ + 'src': 'static', + 'dest': data['name'] + }] + + + diff --git a/log-console/log-messages/jupyterlab_examples_log_messages/_version.py b/log-console/log-messages/jupyterlab_examples_log_messages/_version.py new file mode 100644 index 00000000..ee864fc9 --- /dev/null +++ b/log-console/log-messages/jupyterlab_examples_log_messages/_version.py @@ -0,0 +1,2 @@ +version_info = (0, 1, 0) +__version__ = ".".join(map(str, version_info)) diff --git a/log-console/log-messages/package.json b/log-console/log-messages/package.json index 9127dc0d..d7f47e22 100644 --- a/log-console/log-messages/package.json +++ b/log-console/log-messages/package.json @@ -25,42 +25,54 @@ "url": "https://github.com/jupyterlab/extension-examples.git" }, "scripts": { - "build": "tsc", - "clean": "rimraf lib tsconfig.tsbuildinfo", - "install-ext": "jupyter labextension install . --no-build", - "prepare": "jlpm run clean && jlpm run build", + "build": "jlpm run build:lib", + "build:all": "jlpm run build:lib && jlpm run build:labextension", + "build:labextension": "jupyter labextension build .", + "build:lib": "tsc", + "clean": "jlpm run clean:lib", + "clean:all": "jlpm run clean:lib && jlpm run clean:labextension", + "clean:labextension": "rimraf jupyterlab_examples_log_messages/static", + "clean:lib": "rimraf lib tsconfig.tsbuildinfo", "eslint": "eslint . --ext .ts,.tsx --fix", "eslint:check": "eslint . --ext .ts,.tsx", - "watch": "tsc -w" + "install:extension": "jupyter labextension develop --overwrite .", + "prepare": "jlpm run clean && jlpm run build", + "watch": "run-p watch:src watch:labextension", + "watch:labextension": "jupyter labextension watch .", + "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "^2.1.2", - "@jupyterlab/apputils": "^2.1.1", - "@jupyterlab/coreutils": "^4.1.0", - "@jupyterlab/logconsole": "^2.1.1", - "@jupyterlab/mainmenu": "^2.1.1", - "@jupyterlab/nbformat": "^2.1.0", - "@jupyterlab/notebook": "^2.1.2", - "@jupyterlab/rendermime": "^2.1.1", - "@jupyterlab/ui-components": "^2.1.1", - "@lumino/coreutils": "^1.5.0", - "@lumino/widgets": "^1.13.0" + "@jupyterlab/application": "~3.0.0-beta.3", + "@jupyterlab/apputils": "~3.0.0-beta.3", + "@jupyterlab/coreutils": "~5.0.0-beta.3", + "@jupyterlab/logconsole": "~3.0.0-beta.3", + "@jupyterlab/mainmenu": "~3.0.0-beta.3", + "@jupyterlab/nbformat": "~3.0.0-beta.3", + "@jupyterlab/notebook": "~3.0.0-beta.3", + "@jupyterlab/rendermime": "~3.0.0-beta.3", + "@jupyterlab/ui-components": "~3.0.0-beta.3", + "@lumino/coreutils": "^1.5.3", + "@lumino/widgets": "^1.14.0" }, "devDependencies": { - "@typescript-eslint/eslint-plugin": "^2.21.0", - "@typescript-eslint/parser": "^2.21.0", - "eslint": "^6.8.0", - "eslint-config-prettier": "^6.10.0", + "@jupyterlab/builder": "^3.0.0-beta.3", + "@typescript-eslint/eslint-plugin": "^2.27.0", + "@typescript-eslint/parser": "^2.27.0", + "eslint": "^7.5.0", + "eslint-config-prettier": "^6.10.1", "eslint-plugin-jsdoc": "^22.0.0", "eslint-plugin-prettier": "^3.1.2", "eslint-plugin-react": "^7.18.3", - "rimraf": "^3.0.0", - "typescript": "~3.7.5" + "npm-run-all": "^4.1.5", + "prettier": "^1.19.0", + "rimraf": "^3.0.2", + "typescript": "~3.9.0" }, "sideEffects": [ "style/*.css" ], "jupyterlab": { - "extension": true + "extension": true, + "outputDir": "jupyterlab_examples_log_messages/static" } -} +} \ No newline at end of file diff --git a/log-console/log-messages/pyproject.toml b/log-console/log-messages/pyproject.toml new file mode 100644 index 00000000..873d43f4 --- /dev/null +++ b/log-console/log-messages/pyproject.toml @@ -0,0 +1,3 @@ +[build-system] +requires = ["jupyter_packaging~=0.6.0", "jupyterlab~=3.0.0b3", "setuptools>=40.8.0", "wheel"] +build-backend = "setuptools.build_meta" diff --git a/log-console/log-messages/setup.py b/log-console/log-messages/setup.py new file mode 100644 index 00000000..4efff72f --- /dev/null +++ b/log-console/log-messages/setup.py @@ -0,0 +1,87 @@ +""" +jupyterlab_examples_log_messages setup +""" +import os + +from jupyter_packaging import ( + create_cmdclass, install_npm, ensure_targets, + combine_commands, ensure_python, get_version, +) +import setuptools + +HERE = os.path.abspath(os.path.dirname(__file__)) + +# The name of the project +name="jupyterlab_examples_log_messages" + +# Ensure a valid python version +ensure_python(">=3.6") + +# Get our version +version = get_version(os.path.join(name, "_version.py")) + +lab_path = os.path.join(HERE, name, "static") + +# Representative files that should exist after a successful build +jstargets = [ + os.path.join(HERE, "lib", "index.js"), + os.path.join(HERE, name, "static", "package.json"), +] + +package_data_spec = { + name: [ + "*" + ] +} + +labext_name = "@jupyterlab-examples/log-messages" + +data_files_spec = [ + ("share/jupyter/labextensions/%s" % labext_name, lab_path, "*.*"), +] + +cmdclass = create_cmdclass("jsdeps", + package_data_spec=package_data_spec, + data_files_spec=data_files_spec +) + +cmdclass["jsdeps"] = combine_commands( + install_npm(HERE, build_cmd="build:all", npm=["jlpm"]), + ensure_targets(jstargets), +) + +with open("README.md", "r") as fh: + long_description = fh.read() + +setup_args = dict( + name=name, + version=version, + url="https://github.com/jupyterlab/extension-examples.git", + author="Project Jupyter Contributors", + description="A minimal JupyterLab example to develop a custom log-messages.", + long_description= long_description, + long_description_content_type="text/markdown", + cmdclass= cmdclass, + packages=setuptools.find_packages(), + install_requires=[ + "jupyterlab~=3.0.0b3", + ], + zip_safe=False, + include_package_data=True, + license="BSD-3-Clause", + platforms="Linux, Mac OS X, Windows", + keywords=["Jupyter", "JupyterLab"], + classifiers=[ + "License :: OSI Approved :: BSD License", + "Programming Language :: Python", + "Programming Language :: Python :: 3", + "Programming Language :: Python :: 3.6", + "Programming Language :: Python :: 3.7", + "Programming Language :: Python :: 3.8", + "Framework :: Jupyter", + ], +) + + +if __name__ == "__main__": + setuptools.setup(**setup_args) diff --git a/main-menu/MANIFEST.in b/main-menu/MANIFEST.in new file mode 100644 index 00000000..31c840a3 --- /dev/null +++ b/main-menu/MANIFEST.in @@ -0,0 +1,22 @@ +include LICENSE +include README.md +include pyproject.toml +include jupyter-config/jupyterlab_examples_main_menu.json + +include package.json +include ts*.json + +graft jupyterlab_examples_main_menu/static + +# Javascript files +graft src +graft style +prune **/node_modules +prune lib + +# Patterns to exclude from any directory +global-exclude *~ +global-exclude *.pyc +global-exclude *.pyo +global-exclude .git +global-exclude .ipynb_checkpoints diff --git a/main-menu/README.md b/main-menu/README.md index 1fdb7b84..d3fda127 100644 --- a/main-menu/README.md +++ b/main-menu/README.md @@ -85,12 +85,12 @@ After the execution of that command, `package.json` should list them in the `dependencies`: ```json5 -// package.json#L36-L40 +// package.json#L44-L48 "dependencies": { - "@jupyterlab/application": "^2.0.0", - "@jupyterlab/mainmenu": "^2.0.0", - "@lumino/widgets": "^1.9.3" + "@jupyterlab/application": "~3.0.0-beta.3", + "@jupyterlab/mainmenu": "~3.0.0-beta.3", + "@lumino/widgets": "^1.14.0" }, ``` diff --git a/main-menu/jupyterlab_examples_main_menu/__init__.py b/main-menu/jupyterlab_examples_main_menu/__init__.py new file mode 100644 index 00000000..819e43e0 --- /dev/null +++ b/main-menu/jupyterlab_examples_main_menu/__init__.py @@ -0,0 +1,19 @@ + +import json +import os.path as osp + +from ._version import __version__ + +HERE = osp.abspath(osp.dirname(__file__)) + +with open(osp.join(HERE, 'static', 'package.json')) as fid: + data = json.load(fid) + +def _jupyter_labextension_paths(): + return [{ + 'src': 'static', + 'dest': data['name'] + }] + + + diff --git a/main-menu/jupyterlab_examples_main_menu/_version.py b/main-menu/jupyterlab_examples_main_menu/_version.py new file mode 100644 index 00000000..ee864fc9 --- /dev/null +++ b/main-menu/jupyterlab_examples_main_menu/_version.py @@ -0,0 +1,2 @@ +version_info = (0, 1, 0) +__version__ = ".".join(map(str, version_info)) diff --git a/main-menu/package.json b/main-menu/package.json index c84d7fca..48aa1810 100644 --- a/main-menu/package.json +++ b/main-menu/package.json @@ -25,34 +25,46 @@ "url": "https://github.com/jupyterlab/extension-examples.git" }, "scripts": { - "build": "tsc", - "clean": "rimraf lib tsconfig.tsbuildinfo", - "install-ext": "jupyter labextension install . --no-build", - "prepare": "jlpm run clean && jlpm run build", + "build": "jlpm run build:lib", + "build:all": "jlpm run build:lib && jlpm run build:labextension", + "build:labextension": "jupyter labextension build .", + "build:lib": "tsc", + "clean": "jlpm run clean:lib", + "clean:all": "jlpm run clean:lib && jlpm run clean:labextension", + "clean:labextension": "rimraf jupyterlab_examples_main_menu/static", + "clean:lib": "rimraf lib tsconfig.tsbuildinfo", "eslint": "eslint . --ext .ts,.tsx --fix", "eslint:check": "eslint . --ext .ts,.tsx", - "watch": "tsc -w" + "install:extension": "jupyter labextension develop --overwrite .", + "prepare": "jlpm run clean && jlpm run build", + "watch": "run-p watch:src watch:labextension", + "watch:labextension": "jupyter labextension watch .", + "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "^2.0.0", - "@jupyterlab/mainmenu": "^2.0.0", - "@lumino/widgets": "^1.9.3" + "@jupyterlab/application": "~3.0.0-beta.3", + "@jupyterlab/mainmenu": "~3.0.0-beta.3", + "@lumino/widgets": "^1.14.0" }, "devDependencies": { - "@typescript-eslint/eslint-plugin": "^2.21.0", - "@typescript-eslint/parser": "^2.21.0", - "eslint": "^6.8.0", - "eslint-config-prettier": "^6.10.0", + "@jupyterlab/builder": "^3.0.0-beta.3", + "@typescript-eslint/eslint-plugin": "^2.27.0", + "@typescript-eslint/parser": "^2.27.0", + "eslint": "^7.5.0", + "eslint-config-prettier": "^6.10.1", "eslint-plugin-jsdoc": "^22.0.0", "eslint-plugin-prettier": "^3.1.2", "eslint-plugin-react": "^7.18.3", - "rimraf": "^3.0.0", - "typescript": "~3.7.5" + "npm-run-all": "^4.1.5", + "prettier": "^1.19.0", + "rimraf": "^3.0.2", + "typescript": "~3.9.0" }, "sideEffects": [ "style/*.css" ], "jupyterlab": { - "extension": true + "extension": true, + "outputDir": "jupyterlab_examples_main_menu/static" } -} +} \ No newline at end of file diff --git a/main-menu/pyproject.toml b/main-menu/pyproject.toml new file mode 100644 index 00000000..873d43f4 --- /dev/null +++ b/main-menu/pyproject.toml @@ -0,0 +1,3 @@ +[build-system] +requires = ["jupyter_packaging~=0.6.0", "jupyterlab~=3.0.0b3", "setuptools>=40.8.0", "wheel"] +build-backend = "setuptools.build_meta" diff --git a/main-menu/setup.py b/main-menu/setup.py new file mode 100644 index 00000000..3a043ed3 --- /dev/null +++ b/main-menu/setup.py @@ -0,0 +1,87 @@ +""" +jupyterlab_examples_main_menu setup +""" +import os + +from jupyter_packaging import ( + create_cmdclass, install_npm, ensure_targets, + combine_commands, ensure_python, get_version, +) +import setuptools + +HERE = os.path.abspath(os.path.dirname(__file__)) + +# The name of the project +name="jupyterlab_examples_main_menu" + +# Ensure a valid python version +ensure_python(">=3.6") + +# Get our version +version = get_version(os.path.join(name, "_version.py")) + +lab_path = os.path.join(HERE, name, "static") + +# Representative files that should exist after a successful build +jstargets = [ + os.path.join(HERE, "lib", "index.js"), + os.path.join(HERE, name, "static", "package.json"), +] + +package_data_spec = { + name: [ + "*" + ] +} + +labext_name = "@jupyterlab-examples/main-menu" + +data_files_spec = [ + ("share/jupyter/labextensions/%s" % labext_name, lab_path, "*.*"), +] + +cmdclass = create_cmdclass("jsdeps", + package_data_spec=package_data_spec, + data_files_spec=data_files_spec +) + +cmdclass["jsdeps"] = combine_commands( + install_npm(HERE, build_cmd="build:all", npm=["jlpm"]), + ensure_targets(jstargets), +) + +with open("README.md", "r") as fh: + long_description = fh.read() + +setup_args = dict( + name=name, + version=version, + url="https://github.com/jupyterlab/extension-examples.git", + author="Project Jupyter Contributors", + description="Minimal JupyterLab example adding a menu.", + long_description= long_description, + long_description_content_type="text/markdown", + cmdclass= cmdclass, + packages=setuptools.find_packages(), + install_requires=[ + "jupyterlab~=3.0.0b3", + ], + zip_safe=False, + include_package_data=True, + license="BSD-3-Clause", + platforms="Linux, Mac OS X, Windows", + keywords=["Jupyter", "JupyterLab"], + classifiers=[ + "License :: OSI Approved :: BSD License", + "Programming Language :: Python", + "Programming Language :: Python :: 3", + "Programming Language :: Python :: 3.6", + "Programming Language :: Python :: 3.7", + "Programming Language :: Python :: 3.8", + "Framework :: Jupyter", + ], +) + + +if __name__ == "__main__": + setuptools.setup(**setup_args) diff --git a/package.json b/package.json index d4e6e7c2..bdcd8203 100644 --- a/package.json +++ b/package.json @@ -4,11 +4,10 @@ "scripts": { "bootstrap": "lerna bootstrap", "install": "lerna bootstrap", - "build-jlab": "jupyter lab build --debug", - "build-ext": "lerna run build", + "build-ext": "lerna run build:all", "clean-ext": "lerna run clean", "embedme": "embedme \"[!n]*/**/README.md\"", - "install-ext": "lerna run install-ext", + "install-ext": "lerna run install:extension", "lint": "jlpm && jlpm run prettier", "lint:check": "jlpm run embedme --verify && jlpm run prettier:check", "prettier": "prettier --write \"**/*{.ts,.tsx,.js,.jsx,.css,.json,.md}\"", diff --git a/react/react-widget/MANIFEST.in b/react/react-widget/MANIFEST.in new file mode 100644 index 00000000..558067e8 --- /dev/null +++ b/react/react-widget/MANIFEST.in @@ -0,0 +1,22 @@ +include LICENSE +include README.md +include pyproject.toml +include jupyter-config/jupyterlab_examples_react_widget.json + +include package.json +include ts*.json + +graft jupyterlab_examples_react_widget/static + +# Javascript files +graft src +graft style +prune **/node_modules +prune lib + +# Patterns to exclude from any directory +global-exclude *~ +global-exclude *.pyc +global-exclude *.pyo +global-exclude .git +global-exclude .ipynb_checkpoints diff --git a/react/react-widget/jupyterlab_examples_react_widget/__init__.py b/react/react-widget/jupyterlab_examples_react_widget/__init__.py new file mode 100644 index 00000000..819e43e0 --- /dev/null +++ b/react/react-widget/jupyterlab_examples_react_widget/__init__.py @@ -0,0 +1,19 @@ + +import json +import os.path as osp + +from ._version import __version__ + +HERE = osp.abspath(osp.dirname(__file__)) + +with open(osp.join(HERE, 'static', 'package.json')) as fid: + data = json.load(fid) + +def _jupyter_labextension_paths(): + return [{ + 'src': 'static', + 'dest': data['name'] + }] + + + diff --git a/react/react-widget/jupyterlab_examples_react_widget/_version.py b/react/react-widget/jupyterlab_examples_react_widget/_version.py new file mode 100644 index 00000000..ee864fc9 --- /dev/null +++ b/react/react-widget/jupyterlab_examples_react_widget/_version.py @@ -0,0 +1,2 @@ +version_info = (0, 1, 0) +__version__ = ".".join(map(str, version_info)) diff --git a/react/react-widget/package.json b/react/react-widget/package.json index 9350e99d..a6ccbf96 100644 --- a/react/react-widget/package.json +++ b/react/react-widget/package.json @@ -25,33 +25,46 @@ "url": "https://github.com/jupyterlab/extension-examples.git" }, "scripts": { - "build": "tsc", - "clean": "rimraf lib && rimraf tsconfig.tsbuildinfo", - "install-ext": "jupyter labextension install . --no-build", + "build": "jlpm run build:lib", + "build:all": "jlpm run build:lib && jlpm run build:labextension", + "build:labextension": "jupyter labextension build .", + "build:lib": "tsc", + "clean": "jlpm run clean:lib", + "clean:all": "jlpm run clean:lib && jlpm run clean:labextension", + "clean:labextension": "rimraf jupyterlab_examples_react_widget/static", + "clean:lib": "rimraf lib tsconfig.tsbuildinfo", "eslint": "eslint . --ext .ts,.tsx --fix", "eslint:check": "eslint . --ext .ts,.tsx", - "watch": "tsc -w" + "install:extension": "jupyter labextension develop --overwrite .", + "prepare": "jlpm run clean && jlpm run build", + "watch": "run-p watch:src watch:labextension", + "watch:labextension": "jupyter labextension watch .", + "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "^2.0.0", - "@jupyterlab/launcher": "^2.0.0", - "@jupyterlab/ui-components": "^2.0.0" + "@jupyterlab/application": "~3.0.0-beta.3", + "@jupyterlab/launcher": "~3.0.0-beta.3", + "@jupyterlab/ui-components": "~3.0.0-beta.3" }, "devDependencies": { - "@typescript-eslint/eslint-plugin": "^2.21.0", - "@typescript-eslint/parser": "^2.21.0", - "eslint": "^6.8.0", - "eslint-config-prettier": "^6.10.0", + "@jupyterlab/builder": "^3.0.0-beta.3", + "@typescript-eslint/eslint-plugin": "^2.27.0", + "@typescript-eslint/parser": "^2.27.0", + "eslint": "^7.5.0", + "eslint-config-prettier": "^6.10.1", "eslint-plugin-jsdoc": "^22.0.0", "eslint-plugin-prettier": "^3.1.2", "eslint-plugin-react": "^7.18.3", - "rimraf": "^3.0.0", - "typescript": "~3.7.5" + "npm-run-all": "^4.1.5", + "prettier": "^1.19.0", + "rimraf": "^3.0.2", + "typescript": "~3.9.0" }, "sideEffects": [ "style/*.css" ], "jupyterlab": { - "extension": true + "extension": true, + "outputDir": "jupyterlab_examples_react_widget/static" } -} +} \ No newline at end of file diff --git a/react/react-widget/pyproject.toml b/react/react-widget/pyproject.toml new file mode 100644 index 00000000..873d43f4 --- /dev/null +++ b/react/react-widget/pyproject.toml @@ -0,0 +1,3 @@ +[build-system] +requires = ["jupyter_packaging~=0.6.0", "jupyterlab~=3.0.0b3", "setuptools>=40.8.0", "wheel"] +build-backend = "setuptools.build_meta" diff --git a/react/react-widget/setup.py b/react/react-widget/setup.py new file mode 100644 index 00000000..03c61ead --- /dev/null +++ b/react/react-widget/setup.py @@ -0,0 +1,87 @@ +""" +jupyterlab_examples_react_widget setup +""" +import os + +from jupyter_packaging import ( + create_cmdclass, install_npm, ensure_targets, + combine_commands, ensure_python, get_version, +) +import setuptools + +HERE = os.path.abspath(os.path.dirname(__file__)) + +# The name of the project +name="jupyterlab_examples_react_widget" + +# Ensure a valid python version +ensure_python(">=3.6") + +# Get our version +version = get_version(os.path.join(name, "_version.py")) + +lab_path = os.path.join(HERE, name, "static") + +# Representative files that should exist after a successful build +jstargets = [ + os.path.join(HERE, "lib", "index.js"), + os.path.join(HERE, name, "static", "package.json"), +] + +package_data_spec = { + name: [ + "*" + ] +} + +labext_name = "@jupyterlab-examples/react-widget" + +data_files_spec = [ + ("share/jupyter/labextensions/%s" % labext_name, lab_path, "*.*"), +] + +cmdclass = create_cmdclass("jsdeps", + package_data_spec=package_data_spec, + data_files_spec=data_files_spec +) + +cmdclass["jsdeps"] = combine_commands( + install_npm(HERE, build_cmd="build:all", npm=["jlpm"]), + ensure_targets(jstargets), +) + +with open("README.md", "r") as fh: + long_description = fh.read() + +setup_args = dict( + name=name, + version=version, + url="https://github.com/jupyterlab/extension-examples.git", + author="Project Jupyter Contributors", + description="Example of using a React Widget in a Jupyterlab extension", + long_description= long_description, + long_description_content_type="text/markdown", + cmdclass= cmdclass, + packages=setuptools.find_packages(), + install_requires=[ + "jupyterlab~=3.0.0b3", + ], + zip_safe=False, + include_package_data=True, + license="BSD-3-Clause", + platforms="Linux, Mac OS X, Windows", + keywords=["Jupyter", "JupyterLab"], + classifiers=[ + "License :: OSI Approved :: BSD License", + "Programming Language :: Python", + "Programming Language :: Python :: 3", + "Programming Language :: Python :: 3.6", + "Programming Language :: Python :: 3.7", + "Programming Language :: Python :: 3.8", + "Framework :: Jupyter", + ], +) + + +if __name__ == "__main__": + setuptools.setup(**setup_args) diff --git a/scripts/upgrade_extensions.py b/scripts/upgrade_extensions.py new file mode 100644 index 00000000..da07c0c7 --- /dev/null +++ b/scripts/upgrade_extensions.py @@ -0,0 +1,45 @@ +import os +import os.path as osp +import shutil +import subprocess +import sys + + +HERE = osp.abspath(osp.dirname(__file__)) + +def get_exts(dname): + """Get the relative paths to all of the extensions""" + paths = [] + for path in os.listdir(dname): + if path in ['node_modules', '.git']: + continue + full_path = osp.join(dname, path) + package_path = osp.join(full_path, 'package.json') + if osp.exists(package_path): + paths.append(full_path) + elif osp.isdir(full_path): + paths.extend(get_exts(full_path)) + return paths + + +def main(): + """Upgrade all of the extensions""" + for ext in get_exts(osp.dirname(HERE)): + print(ext) + had_licence = osp.exists(osp.join(ext, 'LICENSE')) + subprocess.run([sys.executable, '-m', 'jupyterlab.upgrade_extension', '--no-input', ext]) + # Overwrite setup.py and pyproject.toml directly + for fname in ['setup.py', 'pyproject.toml']: + shutil.move(osp.join(ext, '_temp_extension', fname), osp.join(ext, fname)) + # Remove unused files from the cookiecutter + for fname in ['.prettierignore', '.prettierrc', 'LICENSE']: + if had_licence and fname == 'LICENSE': + continue + os.remove(osp.join(ext, fname)) + # Remove unused directories from the cookiecutter + for dname in ['.github', '_temp_extension']: + shutil.rmtree(osp.join(ext, dname)) + + +if __name__ == "__main__": + main() diff --git a/settings/MANIFEST.in b/settings/MANIFEST.in new file mode 100644 index 00000000..72283e74 --- /dev/null +++ b/settings/MANIFEST.in @@ -0,0 +1,22 @@ +include LICENSE +include README.md +include pyproject.toml +include jupyter-config/jupyterlab_examples_settings.json + +include package.json +include ts*.json + +graft jupyterlab_examples_settings/static + +# Javascript files +graft src +graft style +prune **/node_modules +prune lib + +# Patterns to exclude from any directory +global-exclude *~ +global-exclude *.pyc +global-exclude *.pyo +global-exclude .git +global-exclude .ipynb_checkpoints diff --git a/settings/README.md b/settings/README.md index 2e5460d5..d4fa19b2 100644 --- a/settings/README.md +++ b/settings/README.md @@ -109,12 +109,11 @@ the `package.json` file in the `jupyterlab` section (here `schema`): ```json5 -// package.json#L57-L60 +// package.json#L68-L70 "jupyterlab": { "extension": true, - "schemaDir": "schema" -} + "schemaDir": "schema", ``` diff --git a/settings/jupyterlab_examples_settings/__init__.py b/settings/jupyterlab_examples_settings/__init__.py new file mode 100644 index 00000000..819e43e0 --- /dev/null +++ b/settings/jupyterlab_examples_settings/__init__.py @@ -0,0 +1,19 @@ + +import json +import os.path as osp + +from ._version import __version__ + +HERE = osp.abspath(osp.dirname(__file__)) + +with open(osp.join(HERE, 'static', 'package.json')) as fid: + data = json.load(fid) + +def _jupyter_labextension_paths(): + return [{ + 'src': 'static', + 'dest': data['name'] + }] + + + diff --git a/settings/jupyterlab_examples_settings/_version.py b/settings/jupyterlab_examples_settings/_version.py new file mode 100644 index 00000000..ee864fc9 --- /dev/null +++ b/settings/jupyterlab_examples_settings/_version.py @@ -0,0 +1,2 @@ +version_info = (0, 1, 0) +__version__ = ".".join(map(str, version_info)) diff --git a/settings/package.json b/settings/package.json index 84fb3c61..5ab0de43 100644 --- a/settings/package.json +++ b/settings/package.json @@ -26,36 +26,48 @@ "url": "https://github.com/jupyterlab/extension-examples.git" }, "scripts": { - "build": "tsc", - "clean": "rimraf lib tsconfig.tsbuildinfo", - "install-ext": "jupyter labextension install . --no-build", - "prepare": "jlpm run clean && jlpm run build", + "build": "jlpm run build:lib", + "build:all": "jlpm run build:lib && jlpm run build:labextension", + "build:labextension": "jupyter labextension build .", + "build:lib": "tsc", + "clean": "jlpm run clean:lib", + "clean:all": "jlpm run clean:lib && jlpm run clean:labextension", + "clean:labextension": "rimraf jupyterlab_examples_settings/static", + "clean:lib": "rimraf lib tsconfig.tsbuildinfo", "eslint": "eslint . --ext .ts,.tsx --fix", "eslint:check": "eslint . --ext .ts,.tsx", - "watch": "tsc -w" + "install:extension": "jupyter labextension develop --overwrite .", + "prepare": "jlpm run clean && jlpm run build", + "watch": "run-p watch:src watch:labextension", + "watch:labextension": "jupyter labextension watch .", + "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "^2.0.0", - "@jupyterlab/mainmenu": "^2.0.0", - "@jupyterlab/settingregistry": "^2.0.0", - "@lumino/widgets": "^1.9.3" + "@jupyterlab/application": "~3.0.0-beta.3", + "@jupyterlab/mainmenu": "~3.0.0-beta.3", + "@jupyterlab/settingregistry": "~3.0.0-beta.3", + "@lumino/widgets": "^1.14.0" }, "devDependencies": { - "@typescript-eslint/eslint-plugin": "^2.21.0", - "@typescript-eslint/parser": "^2.21.0", - "eslint": "^6.8.0", - "eslint-config-prettier": "^6.10.0", + "@jupyterlab/builder": "^3.0.0-beta.3", + "@typescript-eslint/eslint-plugin": "^2.27.0", + "@typescript-eslint/parser": "^2.27.0", + "eslint": "^7.5.0", + "eslint-config-prettier": "^6.10.1", "eslint-plugin-jsdoc": "^22.0.0", "eslint-plugin-prettier": "^3.1.2", "eslint-plugin-react": "^7.18.3", - "rimraf": "^3.0.0", - "typescript": "~3.7.5" + "npm-run-all": "^4.1.5", + "prettier": "^1.19.0", + "rimraf": "^3.0.2", + "typescript": "~3.9.0" }, "sideEffects": [ "style/*.css" ], "jupyterlab": { "extension": true, - "schemaDir": "schema" + "schemaDir": "schema", + "outputDir": "jupyterlab_examples_settings/static" } -} +} \ No newline at end of file diff --git a/settings/pyproject.toml b/settings/pyproject.toml new file mode 100644 index 00000000..873d43f4 --- /dev/null +++ b/settings/pyproject.toml @@ -0,0 +1,3 @@ +[build-system] +requires = ["jupyter_packaging~=0.6.0", "jupyterlab~=3.0.0b3", "setuptools>=40.8.0", "wheel"] +build-backend = "setuptools.build_meta" diff --git a/settings/setup.py b/settings/setup.py new file mode 100644 index 00000000..fd81711d --- /dev/null +++ b/settings/setup.py @@ -0,0 +1,87 @@ +""" +jupyterlab_examples_settings setup +""" +import os + +from jupyter_packaging import ( + create_cmdclass, install_npm, ensure_targets, + combine_commands, ensure_python, get_version, +) +import setuptools + +HERE = os.path.abspath(os.path.dirname(__file__)) + +# The name of the project +name="jupyterlab_examples_settings" + +# Ensure a valid python version +ensure_python(">=3.6") + +# Get our version +version = get_version(os.path.join(name, "_version.py")) + +lab_path = os.path.join(HERE, name, "static") + +# Representative files that should exist after a successful build +jstargets = [ + os.path.join(HERE, "lib", "index.js"), + os.path.join(HERE, name, "static", "package.json"), +] + +package_data_spec = { + name: [ + "*" + ] +} + +labext_name = "@jupyterlab-examples/settings" + +data_files_spec = [ + ("share/jupyter/labextensions/%s" % labext_name, lab_path, "*.*"), +] + +cmdclass = create_cmdclass("jsdeps", + package_data_spec=package_data_spec, + data_files_spec=data_files_spec +) + +cmdclass["jsdeps"] = combine_commands( + install_npm(HERE, build_cmd="build:all", npm=["jlpm"]), + ensure_targets(jstargets), +) + +with open("README.md", "r") as fh: + long_description = fh.read() + +setup_args = dict( + name=name, + version=version, + url="https://github.com/jupyterlab/extension-examples.git", + author="Project Jupyter Contributors", + description="A JupyterLab minimal example using settings.", + long_description= long_description, + long_description_content_type="text/markdown", + cmdclass= cmdclass, + packages=setuptools.find_packages(), + install_requires=[ + "jupyterlab~=3.0.0b3", + ], + zip_safe=False, + include_package_data=True, + license="BSD-3-Clause", + platforms="Linux, Mac OS X, Windows", + keywords=["Jupyter", "JupyterLab"], + classifiers=[ + "License :: OSI Approved :: BSD License", + "Programming Language :: Python", + "Programming Language :: Python :: 3", + "Programming Language :: Python :: 3.6", + "Programming Language :: Python :: 3.7", + "Programming Language :: Python :: 3.8", + "Framework :: Jupyter", + ], +) + + +if __name__ == "__main__": + setuptools.setup(**setup_args) diff --git a/state/MANIFEST.in b/state/MANIFEST.in new file mode 100644 index 00000000..5f1c8b43 --- /dev/null +++ b/state/MANIFEST.in @@ -0,0 +1,22 @@ +include LICENSE +include README.md +include pyproject.toml +include jupyter-config/jupyterlab_examples_state.json + +include package.json +include ts*.json + +graft jupyterlab_examples_state/static + +# Javascript files +graft src +graft style +prune **/node_modules +prune lib + +# Patterns to exclude from any directory +global-exclude *~ +global-exclude *.pyc +global-exclude *.pyo +global-exclude .git +global-exclude .ipynb_checkpoints diff --git a/state/jupyterlab_examples_state/__init__.py b/state/jupyterlab_examples_state/__init__.py new file mode 100644 index 00000000..819e43e0 --- /dev/null +++ b/state/jupyterlab_examples_state/__init__.py @@ -0,0 +1,19 @@ + +import json +import os.path as osp + +from ._version import __version__ + +HERE = osp.abspath(osp.dirname(__file__)) + +with open(osp.join(HERE, 'static', 'package.json')) as fid: + data = json.load(fid) + +def _jupyter_labextension_paths(): + return [{ + 'src': 'static', + 'dest': data['name'] + }] + + + diff --git a/state/jupyterlab_examples_state/_version.py b/state/jupyterlab_examples_state/_version.py new file mode 100644 index 00000000..ee864fc9 --- /dev/null +++ b/state/jupyterlab_examples_state/_version.py @@ -0,0 +1,2 @@ +version_info = (0, 1, 0) +__version__ = ".".join(map(str, version_info)) diff --git a/state/package.json b/state/package.json index 192f3fdc..46456489 100644 --- a/state/package.json +++ b/state/package.json @@ -25,35 +25,47 @@ "url": "https://github.com/jupyterlab/extension-examples.git" }, "scripts": { - "build": "tsc", - "clean": "rimraf lib tsconfig.tsbuildinfo", - "install-ext": "jupyter labextension install . --no-build", - "prepare": "jlpm run clean && jlpm run build", + "build": "jlpm run build:lib", + "build:all": "jlpm run build:lib && jlpm run build:labextension", + "build:labextension": "jupyter labextension build .", + "build:lib": "tsc", + "clean": "jlpm run clean:lib", + "clean:all": "jlpm run clean:lib && jlpm run clean:labextension", + "clean:labextension": "rimraf jupyterlab_examples_state/static", + "clean:lib": "rimraf lib tsconfig.tsbuildinfo", "eslint": "eslint . --ext .ts,.tsx --fix", "eslint:check": "eslint . --ext .ts,.tsx", - "watch": "tsc -w" + "install:extension": "jupyter labextension develop --overwrite .", + "prepare": "jlpm run clean && jlpm run build", + "watch": "run-p watch:src watch:labextension", + "watch:labextension": "jupyter labextension watch .", + "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "^2.0.0", - "@jupyterlab/apputils": "^2.0.0", - "@jupyterlab/statedb": "^2.0.0", - "@lumino/coreutils": "^1.4.2" + "@jupyterlab/application": "~3.0.0-beta.3", + "@jupyterlab/apputils": "~3.0.0-beta.3", + "@jupyterlab/statedb": "~3.0.0-beta.3", + "@lumino/coreutils": "^1.5.3" }, "devDependencies": { - "@typescript-eslint/eslint-plugin": "^2.21.0", - "@typescript-eslint/parser": "^2.21.0", - "eslint": "^6.8.0", - "eslint-config-prettier": "^6.10.0", + "@jupyterlab/builder": "^3.0.0-beta.3", + "@typescript-eslint/eslint-plugin": "^2.27.0", + "@typescript-eslint/parser": "^2.27.0", + "eslint": "^7.5.0", + "eslint-config-prettier": "^6.10.1", "eslint-plugin-jsdoc": "^22.0.0", "eslint-plugin-prettier": "^3.1.2", "eslint-plugin-react": "^7.18.3", - "rimraf": "^3.0.0", - "typescript": "~3.7.5" + "npm-run-all": "^4.1.5", + "prettier": "^1.19.0", + "rimraf": "^3.0.2", + "typescript": "~3.9.0" }, "sideEffects": [ "style/*.css" ], "jupyterlab": { - "extension": true + "extension": true, + "outputDir": "jupyterlab_examples_state/static" } -} +} \ No newline at end of file diff --git a/state/pyproject.toml b/state/pyproject.toml new file mode 100644 index 00000000..873d43f4 --- /dev/null +++ b/state/pyproject.toml @@ -0,0 +1,3 @@ +[build-system] +requires = ["jupyter_packaging~=0.6.0", "jupyterlab~=3.0.0b3", "setuptools>=40.8.0", "wheel"] +build-backend = "setuptools.build_meta" diff --git a/state/setup.py b/state/setup.py new file mode 100644 index 00000000..7932cad9 --- /dev/null +++ b/state/setup.py @@ -0,0 +1,87 @@ +""" +jupyterlab_examples_state setup +""" +import os + +from jupyter_packaging import ( + create_cmdclass, install_npm, ensure_targets, + combine_commands, ensure_python, get_version, +) +import setuptools + +HERE = os.path.abspath(os.path.dirname(__file__)) + +# The name of the project +name="jupyterlab_examples_state" + +# Ensure a valid python version +ensure_python(">=3.6") + +# Get our version +version = get_version(os.path.join(name, "_version.py")) + +lab_path = os.path.join(HERE, name, "static") + +# Representative files that should exist after a successful build +jstargets = [ + os.path.join(HERE, "lib", "index.js"), + os.path.join(HERE, name, "static", "package.json"), +] + +package_data_spec = { + name: [ + "*" + ] +} + +labext_name = "@jupyterlab-examples/state" + +data_files_spec = [ + ("share/jupyter/labextensions/%s" % labext_name, lab_path, "*.*"), +] + +cmdclass = create_cmdclass("jsdeps", + package_data_spec=package_data_spec, + data_files_spec=data_files_spec +) + +cmdclass["jsdeps"] = combine_commands( + install_npm(HERE, build_cmd="build:all", npm=["jlpm"]), + ensure_targets(jstargets), +) + +with open("README.md", "r") as fh: + long_description = fh.read() + +setup_args = dict( + name=name, + version=version, + url="https://github.com/jupyterlab/extension-examples.git", + author="Project Jupyter Contributors", + description="A minimal JupyterLab example using state database (DB).", + long_description= long_description, + long_description_content_type="text/markdown", + cmdclass= cmdclass, + packages=setuptools.find_packages(), + install_requires=[ + "jupyterlab~=3.0.0b3", + ], + zip_safe=False, + include_package_data=True, + license="BSD-3-Clause", + platforms="Linux, Mac OS X, Windows", + keywords=["Jupyter", "JupyterLab"], + classifiers=[ + "License :: OSI Approved :: BSD License", + "Programming Language :: Python", + "Programming Language :: Python :: 3", + "Programming Language :: Python :: 3.6", + "Programming Language :: Python :: 3.7", + "Programming Language :: Python :: 3.8", + "Framework :: Jupyter", + ], +) + + +if __name__ == "__main__": + setuptools.setup(**setup_args) diff --git a/widget-tracker/widgets/MANIFEST.in b/widget-tracker/widgets/MANIFEST.in new file mode 100644 index 00000000..216005e6 --- /dev/null +++ b/widget-tracker/widgets/MANIFEST.in @@ -0,0 +1,22 @@ +include LICENSE +include README.md +include pyproject.toml +include jupyter-config/jupyterlab_examples_widgets.json + +include package.json +include ts*.json + +graft jupyterlab_examples_widgets/static + +# Javascript files +graft src +graft style +prune **/node_modules +prune lib + +# Patterns to exclude from any directory +global-exclude *~ +global-exclude *.pyc +global-exclude *.pyo +global-exclude .git +global-exclude .ipynb_checkpoints diff --git a/widget-tracker/widgets/jupyterlab_examples_widgets/__init__.py b/widget-tracker/widgets/jupyterlab_examples_widgets/__init__.py new file mode 100644 index 00000000..819e43e0 --- /dev/null +++ b/widget-tracker/widgets/jupyterlab_examples_widgets/__init__.py @@ -0,0 +1,19 @@ + +import json +import os.path as osp + +from ._version import __version__ + +HERE = osp.abspath(osp.dirname(__file__)) + +with open(osp.join(HERE, 'static', 'package.json')) as fid: + data = json.load(fid) + +def _jupyter_labextension_paths(): + return [{ + 'src': 'static', + 'dest': data['name'] + }] + + + diff --git a/widget-tracker/widgets/jupyterlab_examples_widgets/_version.py b/widget-tracker/widgets/jupyterlab_examples_widgets/_version.py new file mode 100644 index 00000000..ee864fc9 --- /dev/null +++ b/widget-tracker/widgets/jupyterlab_examples_widgets/_version.py @@ -0,0 +1,2 @@ +version_info = (0, 1, 0) +__version__ = ".".join(map(str, version_info)) diff --git a/widget-tracker/widgets/package.json b/widget-tracker/widgets/package.json index 27e3ab61..f493e717 100644 --- a/widget-tracker/widgets/package.json +++ b/widget-tracker/widgets/package.json @@ -25,36 +25,48 @@ "url": "https://github.com/jupyterlab/extension-examples.git" }, "scripts": { - "build": "tsc", - "clean": "rimraf lib tsconfig.tsbuildinfo", - "install-ext": "jupyter labextension install . --no-build", - "prepare": "jlpm run clean && jlpm run build", + "build": "jlpm run build:lib", + "build:all": "jlpm run build:lib && jlpm run build:labextension", + "build:labextension": "jupyter labextension build .", + "build:lib": "tsc", + "clean": "jlpm run clean:lib", + "clean:all": "jlpm run clean:lib && jlpm run clean:labextension", + "clean:labextension": "rimraf jupyterlab_examples_widgets/static", + "clean:lib": "rimraf lib tsconfig.tsbuildinfo", "eslint": "eslint . --ext .ts,.tsx --fix", "eslint:check": "eslint . --ext .ts,.tsx", - "watch": "tsc -w" + "install:extension": "jupyter labextension develop --overwrite .", + "prepare": "jlpm run clean && jlpm run build", + "watch": "run-p watch:src watch:labextension", + "watch:labextension": "jupyter labextension watch .", + "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "^2.0.0", - "@jupyterlab/mainmenu": "^2.0.0", - "@lumino/algorithm": "^1.2.0", - "@lumino/coreutils": "^1.3.1", - "@lumino/disposable": "^1.3.1" + "@jupyterlab/application": "~3.0.0-beta.3", + "@jupyterlab/mainmenu": "~3.0.0-beta.3", + "@lumino/algorithm": "^1.3.3", + "@lumino/coreutils": "^1.5.3", + "@lumino/disposable": "^1.4.3" }, "devDependencies": { - "@typescript-eslint/eslint-plugin": "^2.21.0", - "@typescript-eslint/parser": "^2.21.0", - "eslint": "^6.8.0", - "eslint-config-prettier": "^6.10.0", + "@jupyterlab/builder": "^3.0.0-beta.3", + "@typescript-eslint/eslint-plugin": "^2.27.0", + "@typescript-eslint/parser": "^2.27.0", + "eslint": "^7.5.0", + "eslint-config-prettier": "^6.10.1", "eslint-plugin-jsdoc": "^22.0.0", "eslint-plugin-prettier": "^3.1.2", "eslint-plugin-react": "^7.18.3", - "rimraf": "^3.0.0", - "typescript": "~3.7.5" + "npm-run-all": "^4.1.5", + "prettier": "^1.19.0", + "rimraf": "^3.0.2", + "typescript": "~3.9.0" }, "sideEffects": [ "style/*.css" ], "jupyterlab": { - "extension": true + "extension": true, + "outputDir": "jupyterlab_examples_widgets/static" } -} +} \ No newline at end of file diff --git a/widget-tracker/widgets/pyproject.toml b/widget-tracker/widgets/pyproject.toml new file mode 100644 index 00000000..873d43f4 --- /dev/null +++ b/widget-tracker/widgets/pyproject.toml @@ -0,0 +1,3 @@ +[build-system] +requires = ["jupyter_packaging~=0.6.0", "jupyterlab~=3.0.0b3", "setuptools>=40.8.0", "wheel"] +build-backend = "setuptools.build_meta" diff --git a/widget-tracker/widgets/setup.py b/widget-tracker/widgets/setup.py new file mode 100644 index 00000000..a7e2a139 --- /dev/null +++ b/widget-tracker/widgets/setup.py @@ -0,0 +1,87 @@ +""" +jupyterlab_examples_widgets setup +""" +import os + +from jupyter_packaging import ( + create_cmdclass, install_npm, ensure_targets, + combine_commands, ensure_python, get_version, +) +import setuptools + +HERE = os.path.abspath(os.path.dirname(__file__)) + +# The name of the project +name="jupyterlab_examples_widgets" + +# Ensure a valid python version +ensure_python(">=3.6") + +# Get our version +version = get_version(os.path.join(name, "_version.py")) + +lab_path = os.path.join(HERE, name, "static") + +# Representative files that should exist after a successful build +jstargets = [ + os.path.join(HERE, "lib", "index.js"), + os.path.join(HERE, name, "static", "package.json"), +] + +package_data_spec = { + name: [ + "*" + ] +} + +labext_name = "@jupyterlab-examples/widgets" + +data_files_spec = [ + ("share/jupyter/labextensions/%s" % labext_name, lab_path, "*.*"), +] + +cmdclass = create_cmdclass("jsdeps", + package_data_spec=package_data_spec, + data_files_spec=data_files_spec +) + +cmdclass["jsdeps"] = combine_commands( + install_npm(HERE, build_cmd="build:all", npm=["jlpm"]), + ensure_targets(jstargets), +) + +with open("README.md", "r") as fh: + long_description = fh.read() + +setup_args = dict( + name=name, + version=version, + url="https://github.com/jupyterlab/extension-examples.git", + author="Project Jupyter Contributors", + description="minimal lab example", + long_description= long_description, + long_description_content_type="text/markdown", + cmdclass= cmdclass, + packages=setuptools.find_packages(), + install_requires=[ + "jupyterlab~=3.0.0b3", + ], + zip_safe=False, + include_package_data=True, + license="BSD-3-Clause", + platforms="Linux, Mac OS X, Windows", + keywords=["Jupyter", "JupyterLab"], + classifiers=[ + "License :: OSI Approved :: BSD License", + "Programming Language :: Python", + "Programming Language :: Python :: 3", + "Programming Language :: Python :: 3.6", + "Programming Language :: Python :: 3.7", + "Programming Language :: Python :: 3.8", + "Framework :: Jupyter", + ], +) + + +if __name__ == "__main__": + setuptools.setup(**setup_args) From 2ea40c8de39855200c2812068305c2bc905962d2 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Thu, 10 Sep 2020 20:09:30 -0500 Subject: [PATCH 06/45] reinstate launcher license file --- launcher/LICENSE | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 launcher/LICENSE diff --git a/launcher/LICENSE b/launcher/LICENSE new file mode 100644 index 00000000..5df00610 --- /dev/null +++ b/launcher/LICENSE @@ -0,0 +1,30 @@ +BSD 3-Clause License + +Copyright (c) 2019, Jeremy Tuloup +Copyright (c) 2019, Jupyter Development Team +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +1. Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + +2. Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + +3. Neither the name of the copyright holder nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. From 37946dacc002a3f3ba3dbc071d962c53892ca5e1 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Thu, 10 Sep 2020 20:12:44 -0500 Subject: [PATCH 07/45] ignore static files --- .prettierignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.prettierignore b/.prettierignore index 8103ecd2..3a5875d7 100644 --- a/.prettierignore +++ b/.prettierignore @@ -2,3 +2,4 @@ node_modules **/node_modules **/lib **/package.json +**/static From 697ad67e82cabb769706fa9fcd9ec058bf80c621 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Fri, 11 Sep 2020 14:33:43 -0500 Subject: [PATCH 08/45] run upgrade script --- advanced/kernel-messaging/package.json | 10 +++++----- advanced/kernel-messaging/pyproject.toml | 2 +- advanced/kernel-messaging/setup.py | 8 +++----- advanced/kernel-output/package.json | 10 +++++----- advanced/kernel-output/pyproject.toml | 2 +- advanced/kernel-output/setup.py | 8 +++----- advanced/server-extension/package.json | 10 +++++----- advanced/server-extension/pyproject.toml | 2 +- advanced/server-extension/setup.py | 8 +++----- basics/datagrid/package.json | 6 +++--- basics/datagrid/pyproject.toml | 2 +- basics/datagrid/setup.py | 8 +++----- basics/hello-world/package.json | 4 ++-- basics/hello-world/pyproject.toml | 2 +- basics/hello-world/setup.py | 8 +++----- basics/signals/package.json | 8 ++++---- basics/signals/pyproject.toml | 2 +- basics/signals/setup.py | 8 +++----- command-palette/package.json | 4 ++-- command-palette/pyproject.toml | 2 +- command-palette/setup.py | 8 +++----- commands/package.json | 4 ++-- commands/pyproject.toml | 2 +- commands/setup.py | 8 +++----- context-menu/package.json | 10 +++++----- context-menu/pyproject.toml | 2 +- context-menu/setup.py | 8 +++----- launcher/package.json | 10 +++++----- launcher/pyproject.toml | 2 +- launcher/setup.py | 8 +++----- log-console/custom-log-console/package.json | 18 ++++++++--------- log-console/custom-log-console/pyproject.toml | 2 +- log-console/custom-log-console/setup.py | 8 +++----- log-console/log-messages/package.json | 20 +++++++++---------- log-console/log-messages/pyproject.toml | 2 +- log-console/log-messages/setup.py | 8 +++----- main-menu/package.json | 6 +++--- main-menu/pyproject.toml | 2 +- main-menu/setup.py | 8 +++----- react/react-widget/package.json | 8 ++++---- react/react-widget/pyproject.toml | 2 +- react/react-widget/setup.py | 8 +++----- settings/package.json | 8 ++++---- settings/pyproject.toml | 2 +- settings/setup.py | 8 +++----- state/package.json | 8 ++++---- state/pyproject.toml | 2 +- state/setup.py | 8 +++----- widget-tracker/widgets/package.json | 6 +++--- widget-tracker/widgets/pyproject.toml | 2 +- widget-tracker/widgets/setup.py | 8 +++----- 51 files changed, 143 insertions(+), 177 deletions(-) diff --git a/advanced/kernel-messaging/package.json b/advanced/kernel-messaging/package.json index d4b535cf..e90a6bab 100644 --- a/advanced/kernel-messaging/package.json +++ b/advanced/kernel-messaging/package.json @@ -42,10 +42,10 @@ "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "~3.0.0-beta.3", - "@jupyterlab/launcher": "~3.0.0-beta.3", - "@jupyterlab/mainmenu": "~3.0.0-beta.3", - "@jupyterlab/nbformat": "~3.0.0-beta.3", + "@jupyterlab/application": "~3.0.0-beta.4", + "@jupyterlab/launcher": "~3.0.0-beta.4", + "@jupyterlab/mainmenu": "~3.0.0-beta.4", + "@jupyterlab/nbformat": "~3.0.0-beta.4", "@lumino/algorithm": "^1.3.3", "@lumino/coreutils": "^1.5.3", "@lumino/datagrid": "^0.5.2", @@ -53,7 +53,7 @@ "@lumino/widgets": "^1.14.0" }, "devDependencies": { - "@jupyterlab/builder": "^3.0.0-beta.3", + "@jupyterlab/builder": "^3.0.0-beta.4", "@typescript-eslint/eslint-plugin": "^2.27.0", "@typescript-eslint/parser": "^2.27.0", "eslint": "^7.5.0", diff --git a/advanced/kernel-messaging/pyproject.toml b/advanced/kernel-messaging/pyproject.toml index 873d43f4..63a68190 100644 --- a/advanced/kernel-messaging/pyproject.toml +++ b/advanced/kernel-messaging/pyproject.toml @@ -1,3 +1,3 @@ [build-system] -requires = ["jupyter_packaging~=0.6.0", "jupyterlab~=3.0.0b3", "setuptools>=40.8.0", "wheel"] +requires = ["jupyter_packaging~=0.7.0", "jupyterlab~=3.0.0b4", "setuptools>=40.8.0", "wheel"] build-backend = "setuptools.build_meta" diff --git a/advanced/kernel-messaging/setup.py b/advanced/kernel-messaging/setup.py index f6b64820..14cd71ba 100644 --- a/advanced/kernel-messaging/setup.py +++ b/advanced/kernel-messaging/setup.py @@ -5,7 +5,7 @@ from jupyter_packaging import ( create_cmdclass, install_npm, ensure_targets, - combine_commands, ensure_python, get_version, + combine_commands, get_version, ) import setuptools @@ -14,9 +14,6 @@ # The name of the project name="jupyterlab_examples_kernel_messaging" -# Ensure a valid python version -ensure_python(">=3.6") - # Get our version version = get_version(os.path.join(name, "_version.py")) @@ -64,10 +61,11 @@ cmdclass= cmdclass, packages=setuptools.find_packages(), install_requires=[ - "jupyterlab~=3.0.0b3", + "jupyterlab~=3.0.0b4", ], zip_safe=False, include_package_data=True, + python_requires=">=3.6", license="BSD-3-Clause", platforms="Linux, Mac OS X, Windows", keywords=["Jupyter", "JupyterLab"], diff --git a/advanced/kernel-output/package.json b/advanced/kernel-output/package.json index 40cd3867..b319903b 100644 --- a/advanced/kernel-output/package.json +++ b/advanced/kernel-output/package.json @@ -42,17 +42,17 @@ "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "~3.0.0-beta.3", - "@jupyterlab/launcher": "~3.0.0-beta.3", - "@jupyterlab/mainmenu": "~3.0.0-beta.3", - "@jupyterlab/outputarea": "~3.0.0-beta.3", + "@jupyterlab/application": "~3.0.0-beta.4", + "@jupyterlab/launcher": "~3.0.0-beta.4", + "@jupyterlab/mainmenu": "~3.0.0-beta.4", + "@jupyterlab/outputarea": "~3.0.0-beta.4", "@lumino/algorithm": "^1.3.3", "@lumino/coreutils": "^1.5.3", "@lumino/datagrid": "^0.3.1", "@lumino/disposable": "^1.4.3" }, "devDependencies": { - "@jupyterlab/builder": "^3.0.0-beta.3", + "@jupyterlab/builder": "^3.0.0-beta.4", "@typescript-eslint/eslint-plugin": "^2.27.0", "@typescript-eslint/parser": "^2.27.0", "eslint": "^7.5.0", diff --git a/advanced/kernel-output/pyproject.toml b/advanced/kernel-output/pyproject.toml index 873d43f4..63a68190 100644 --- a/advanced/kernel-output/pyproject.toml +++ b/advanced/kernel-output/pyproject.toml @@ -1,3 +1,3 @@ [build-system] -requires = ["jupyter_packaging~=0.6.0", "jupyterlab~=3.0.0b3", "setuptools>=40.8.0", "wheel"] +requires = ["jupyter_packaging~=0.7.0", "jupyterlab~=3.0.0b4", "setuptools>=40.8.0", "wheel"] build-backend = "setuptools.build_meta" diff --git a/advanced/kernel-output/setup.py b/advanced/kernel-output/setup.py index c2341904..7d3b884e 100644 --- a/advanced/kernel-output/setup.py +++ b/advanced/kernel-output/setup.py @@ -5,7 +5,7 @@ from jupyter_packaging import ( create_cmdclass, install_npm, ensure_targets, - combine_commands, ensure_python, get_version, + combine_commands, get_version, ) import setuptools @@ -14,9 +14,6 @@ # The name of the project name="jupyterlab_examples_kernel_output" -# Ensure a valid python version -ensure_python(">=3.6") - # Get our version version = get_version(os.path.join(name, "_version.py")) @@ -64,10 +61,11 @@ cmdclass= cmdclass, packages=setuptools.find_packages(), install_requires=[ - "jupyterlab~=3.0.0b3", + "jupyterlab~=3.0.0b4", ], zip_safe=False, include_package_data=True, + python_requires=">=3.6", license="BSD-3-Clause", platforms="Linux, Mac OS X, Windows", keywords=["Jupyter", "JupyterLab"], diff --git a/advanced/server-extension/package.json b/advanced/server-extension/package.json index 50fa1f26..57fee635 100644 --- a/advanced/server-extension/package.json +++ b/advanced/server-extension/package.json @@ -42,13 +42,13 @@ "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "~3.0.0-beta.3", - "@jupyterlab/coreutils": "~5.0.0-beta.3", - "@jupyterlab/launcher": "~3.0.0-beta.3", - "@jupyterlab/services": "~6.0.0-beta.3" + "@jupyterlab/application": "~3.0.0-beta.4", + "@jupyterlab/coreutils": "~5.0.0-beta.4", + "@jupyterlab/launcher": "~3.0.0-beta.4", + "@jupyterlab/services": "~6.0.0-beta.4" }, "devDependencies": { - "@jupyterlab/builder": "^3.0.0-beta.3", + "@jupyterlab/builder": "^3.0.0-beta.4", "@typescript-eslint/eslint-plugin": "^2.27.0", "@typescript-eslint/parser": "^2.27.0", "eslint": "^7.5.0", diff --git a/advanced/server-extension/pyproject.toml b/advanced/server-extension/pyproject.toml index 873d43f4..63a68190 100644 --- a/advanced/server-extension/pyproject.toml +++ b/advanced/server-extension/pyproject.toml @@ -1,3 +1,3 @@ [build-system] -requires = ["jupyter_packaging~=0.6.0", "jupyterlab~=3.0.0b3", "setuptools>=40.8.0", "wheel"] +requires = ["jupyter_packaging~=0.7.0", "jupyterlab~=3.0.0b4", "setuptools>=40.8.0", "wheel"] build-backend = "setuptools.build_meta" diff --git a/advanced/server-extension/setup.py b/advanced/server-extension/setup.py index 9631d2da..09eb1339 100644 --- a/advanced/server-extension/setup.py +++ b/advanced/server-extension/setup.py @@ -5,7 +5,7 @@ from jupyter_packaging import ( create_cmdclass, install_npm, ensure_targets, - combine_commands, ensure_python, get_version, + combine_commands, get_version, ) import setuptools @@ -14,9 +14,6 @@ # The name of the project name="jlab_ext_example" -# Ensure a valid python version -ensure_python(">=3.6") - # Get our version version = get_version(os.path.join(name, "_version.py")) @@ -66,10 +63,11 @@ cmdclass= cmdclass, packages=setuptools.find_packages(), install_requires=[ - "jupyterlab~=3.0.0b3", + "jupyterlab~=3.0.0b4", ], zip_safe=False, include_package_data=True, + python_requires=">=3.6", license="BSD-3-Clause", platforms="Linux, Mac OS X, Windows", keywords=["Jupyter", "JupyterLab"], diff --git a/basics/datagrid/package.json b/basics/datagrid/package.json index ce2738f5..adf49a97 100644 --- a/basics/datagrid/package.json +++ b/basics/datagrid/package.json @@ -42,15 +42,15 @@ "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "~3.0.0-beta.3", - "@jupyterlab/mainmenu": "~3.0.0-beta.3", + "@jupyterlab/application": "~3.0.0-beta.4", + "@jupyterlab/mainmenu": "~3.0.0-beta.4", "@lumino/algorithm": "^1.3.3", "@lumino/coreutils": "^1.5.3", "@lumino/datagrid": "^0.5.2", "@lumino/disposable": "^1.4.3" }, "devDependencies": { - "@jupyterlab/builder": "^3.0.0-beta.3", + "@jupyterlab/builder": "^3.0.0-beta.4", "@typescript-eslint/eslint-plugin": "^2.27.0", "@typescript-eslint/parser": "^2.27.0", "eslint": "^7.5.0", diff --git a/basics/datagrid/pyproject.toml b/basics/datagrid/pyproject.toml index 873d43f4..63a68190 100644 --- a/basics/datagrid/pyproject.toml +++ b/basics/datagrid/pyproject.toml @@ -1,3 +1,3 @@ [build-system] -requires = ["jupyter_packaging~=0.6.0", "jupyterlab~=3.0.0b3", "setuptools>=40.8.0", "wheel"] +requires = ["jupyter_packaging~=0.7.0", "jupyterlab~=3.0.0b4", "setuptools>=40.8.0", "wheel"] build-backend = "setuptools.build_meta" diff --git a/basics/datagrid/setup.py b/basics/datagrid/setup.py index 54b85be6..75dd7522 100644 --- a/basics/datagrid/setup.py +++ b/basics/datagrid/setup.py @@ -5,7 +5,7 @@ from jupyter_packaging import ( create_cmdclass, install_npm, ensure_targets, - combine_commands, ensure_python, get_version, + combine_commands, get_version, ) import setuptools @@ -14,9 +14,6 @@ # The name of the project name="jupyterlab_examples_datagrid" -# Ensure a valid python version -ensure_python(">=3.6") - # Get our version version = get_version(os.path.join(name, "_version.py")) @@ -64,10 +61,11 @@ cmdclass= cmdclass, packages=setuptools.find_packages(), install_requires=[ - "jupyterlab~=3.0.0b3", + "jupyterlab~=3.0.0b4", ], zip_safe=False, include_package_data=True, + python_requires=">=3.6", license="BSD-3-Clause", platforms="Linux, Mac OS X, Windows", keywords=["Jupyter", "JupyterLab"], diff --git a/basics/hello-world/package.json b/basics/hello-world/package.json index 8e796d21..ef1a25af 100644 --- a/basics/hello-world/package.json +++ b/basics/hello-world/package.json @@ -42,10 +42,10 @@ "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "~3.0.0-beta.3" + "@jupyterlab/application": "~3.0.0-beta.4" }, "devDependencies": { - "@jupyterlab/builder": "^3.0.0-beta.3", + "@jupyterlab/builder": "^3.0.0-beta.4", "@typescript-eslint/eslint-plugin": "^2.27.0", "@typescript-eslint/parser": "^2.27.0", "eslint": "^7.5.0", diff --git a/basics/hello-world/pyproject.toml b/basics/hello-world/pyproject.toml index 873d43f4..63a68190 100644 --- a/basics/hello-world/pyproject.toml +++ b/basics/hello-world/pyproject.toml @@ -1,3 +1,3 @@ [build-system] -requires = ["jupyter_packaging~=0.6.0", "jupyterlab~=3.0.0b3", "setuptools>=40.8.0", "wheel"] +requires = ["jupyter_packaging~=0.7.0", "jupyterlab~=3.0.0b4", "setuptools>=40.8.0", "wheel"] build-backend = "setuptools.build_meta" diff --git a/basics/hello-world/setup.py b/basics/hello-world/setup.py index 56c37399..e60363e1 100644 --- a/basics/hello-world/setup.py +++ b/basics/hello-world/setup.py @@ -5,7 +5,7 @@ from jupyter_packaging import ( create_cmdclass, install_npm, ensure_targets, - combine_commands, ensure_python, get_version, + combine_commands, get_version, ) import setuptools @@ -14,9 +14,6 @@ # The name of the project name="jupyterlab_examples_hello_world" -# Ensure a valid python version -ensure_python(">=3.6") - # Get our version version = get_version(os.path.join(name, "_version.py")) @@ -64,10 +61,11 @@ cmdclass= cmdclass, packages=setuptools.find_packages(), install_requires=[ - "jupyterlab~=3.0.0b3", + "jupyterlab~=3.0.0b4", ], zip_safe=False, include_package_data=True, + python_requires=">=3.6", license="BSD-3-Clause", platforms="Linux, Mac OS X, Windows", keywords=["Jupyter", "JupyterLab"], diff --git a/basics/signals/package.json b/basics/signals/package.json index 16c25b3f..ff455bb3 100644 --- a/basics/signals/package.json +++ b/basics/signals/package.json @@ -42,16 +42,16 @@ "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "~3.0.0-beta.3", - "@jupyterlab/launcher": "~3.0.0-beta.3", - "@jupyterlab/mainmenu": "~3.0.0-beta.3", + "@jupyterlab/application": "~3.0.0-beta.4", + "@jupyterlab/launcher": "~3.0.0-beta.4", + "@jupyterlab/mainmenu": "~3.0.0-beta.4", "@lumino/algorithm": "^1.3.3", "@lumino/coreutils": "^1.5.3", "@lumino/datagrid": "^0.3.1", "@lumino/disposable": "^1.4.3" }, "devDependencies": { - "@jupyterlab/builder": "^3.0.0-beta.3", + "@jupyterlab/builder": "^3.0.0-beta.4", "@typescript-eslint/eslint-plugin": "^2.27.0", "@typescript-eslint/parser": "^2.27.0", "eslint": "^7.5.0", diff --git a/basics/signals/pyproject.toml b/basics/signals/pyproject.toml index 873d43f4..63a68190 100644 --- a/basics/signals/pyproject.toml +++ b/basics/signals/pyproject.toml @@ -1,3 +1,3 @@ [build-system] -requires = ["jupyter_packaging~=0.6.0", "jupyterlab~=3.0.0b3", "setuptools>=40.8.0", "wheel"] +requires = ["jupyter_packaging~=0.7.0", "jupyterlab~=3.0.0b4", "setuptools>=40.8.0", "wheel"] build-backend = "setuptools.build_meta" diff --git a/basics/signals/setup.py b/basics/signals/setup.py index fe5de71d..c2c69f5e 100644 --- a/basics/signals/setup.py +++ b/basics/signals/setup.py @@ -5,7 +5,7 @@ from jupyter_packaging import ( create_cmdclass, install_npm, ensure_targets, - combine_commands, ensure_python, get_version, + combine_commands, get_version, ) import setuptools @@ -14,9 +14,6 @@ # The name of the project name="jupyterlab_examples_signals" -# Ensure a valid python version -ensure_python(">=3.6") - # Get our version version = get_version(os.path.join(name, "_version.py")) @@ -64,10 +61,11 @@ cmdclass= cmdclass, packages=setuptools.find_packages(), install_requires=[ - "jupyterlab~=3.0.0b3", + "jupyterlab~=3.0.0b4", ], zip_safe=False, include_package_data=True, + python_requires=">=3.6", license="BSD-3-Clause", platforms="Linux, Mac OS X, Windows", keywords=["Jupyter", "JupyterLab"], diff --git a/command-palette/package.json b/command-palette/package.json index 6fd52106..31a98aa9 100644 --- a/command-palette/package.json +++ b/command-palette/package.json @@ -42,10 +42,10 @@ "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "~3.0.0-beta.3" + "@jupyterlab/application": "~3.0.0-beta.4" }, "devDependencies": { - "@jupyterlab/builder": "^3.0.0-beta.3", + "@jupyterlab/builder": "^3.0.0-beta.4", "@typescript-eslint/eslint-plugin": "^2.27.0", "@typescript-eslint/parser": "^2.27.0", "eslint": "^7.5.0", diff --git a/command-palette/pyproject.toml b/command-palette/pyproject.toml index 873d43f4..63a68190 100644 --- a/command-palette/pyproject.toml +++ b/command-palette/pyproject.toml @@ -1,3 +1,3 @@ [build-system] -requires = ["jupyter_packaging~=0.6.0", "jupyterlab~=3.0.0b3", "setuptools>=40.8.0", "wheel"] +requires = ["jupyter_packaging~=0.7.0", "jupyterlab~=3.0.0b4", "setuptools>=40.8.0", "wheel"] build-backend = "setuptools.build_meta" diff --git a/command-palette/setup.py b/command-palette/setup.py index 0d7a3d1a..22df5427 100644 --- a/command-palette/setup.py +++ b/command-palette/setup.py @@ -5,7 +5,7 @@ from jupyter_packaging import ( create_cmdclass, install_npm, ensure_targets, - combine_commands, ensure_python, get_version, + combine_commands, get_version, ) import setuptools @@ -14,9 +14,6 @@ # The name of the project name="jupyterlab_examples_command_palette" -# Ensure a valid python version -ensure_python(">=3.6") - # Get our version version = get_version(os.path.join(name, "_version.py")) @@ -64,10 +61,11 @@ cmdclass= cmdclass, packages=setuptools.find_packages(), install_requires=[ - "jupyterlab~=3.0.0b3", + "jupyterlab~=3.0.0b4", ], zip_safe=False, include_package_data=True, + python_requires=">=3.6", license="BSD-3-Clause", platforms="Linux, Mac OS X, Windows", keywords=["Jupyter", "JupyterLab"], diff --git a/commands/package.json b/commands/package.json index 05157984..b0c611ed 100644 --- a/commands/package.json +++ b/commands/package.json @@ -42,10 +42,10 @@ "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "~3.0.0-beta.3" + "@jupyterlab/application": "~3.0.0-beta.4" }, "devDependencies": { - "@jupyterlab/builder": "^3.0.0-beta.3", + "@jupyterlab/builder": "^3.0.0-beta.4", "@typescript-eslint/eslint-plugin": "^2.27.0", "@typescript-eslint/parser": "^2.27.0", "eslint": "^7.5.0", diff --git a/commands/pyproject.toml b/commands/pyproject.toml index 873d43f4..63a68190 100644 --- a/commands/pyproject.toml +++ b/commands/pyproject.toml @@ -1,3 +1,3 @@ [build-system] -requires = ["jupyter_packaging~=0.6.0", "jupyterlab~=3.0.0b3", "setuptools>=40.8.0", "wheel"] +requires = ["jupyter_packaging~=0.7.0", "jupyterlab~=3.0.0b4", "setuptools>=40.8.0", "wheel"] build-backend = "setuptools.build_meta" diff --git a/commands/setup.py b/commands/setup.py index 0f4eab13..dcd196c8 100644 --- a/commands/setup.py +++ b/commands/setup.py @@ -5,7 +5,7 @@ from jupyter_packaging import ( create_cmdclass, install_npm, ensure_targets, - combine_commands, ensure_python, get_version, + combine_commands, get_version, ) import setuptools @@ -14,9 +14,6 @@ # The name of the project name="jupyterlab_examples_commands" -# Ensure a valid python version -ensure_python(">=3.6") - # Get our version version = get_version(os.path.join(name, "_version.py")) @@ -64,10 +61,11 @@ cmdclass= cmdclass, packages=setuptools.find_packages(), install_requires=[ - "jupyterlab~=3.0.0b3", + "jupyterlab~=3.0.0b4", ], zip_safe=False, include_package_data=True, + python_requires=">=3.6", license="BSD-3-Clause", platforms="Linux, Mac OS X, Windows", keywords=["Jupyter", "JupyterLab"], diff --git a/context-menu/package.json b/context-menu/package.json index ae7c9b0e..b3d05e9d 100644 --- a/context-menu/package.json +++ b/context-menu/package.json @@ -42,13 +42,13 @@ "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "~3.0.0-beta.3", - "@jupyterlab/apputils": "~3.0.0-beta.3", - "@jupyterlab/filebrowser": "~3.0.0-beta.3", - "@jupyterlab/ui-components": "~3.0.0-beta.3" + "@jupyterlab/application": "~3.0.0-beta.4", + "@jupyterlab/apputils": "~3.0.0-beta.4", + "@jupyterlab/filebrowser": "~3.0.0-beta.4", + "@jupyterlab/ui-components": "~3.0.0-beta.4" }, "devDependencies": { - "@jupyterlab/builder": "^3.0.0-beta.3", + "@jupyterlab/builder": "^3.0.0-beta.4", "@typescript-eslint/eslint-plugin": "^2.27.0", "@typescript-eslint/parser": "^2.27.0", "eslint": "^7.5.0", diff --git a/context-menu/pyproject.toml b/context-menu/pyproject.toml index 873d43f4..63a68190 100644 --- a/context-menu/pyproject.toml +++ b/context-menu/pyproject.toml @@ -1,3 +1,3 @@ [build-system] -requires = ["jupyter_packaging~=0.6.0", "jupyterlab~=3.0.0b3", "setuptools>=40.8.0", "wheel"] +requires = ["jupyter_packaging~=0.7.0", "jupyterlab~=3.0.0b4", "setuptools>=40.8.0", "wheel"] build-backend = "setuptools.build_meta" diff --git a/context-menu/setup.py b/context-menu/setup.py index f6f9ec16..5aec8143 100644 --- a/context-menu/setup.py +++ b/context-menu/setup.py @@ -5,7 +5,7 @@ from jupyter_packaging import ( create_cmdclass, install_npm, ensure_targets, - combine_commands, ensure_python, get_version, + combine_commands, get_version, ) import setuptools @@ -14,9 +14,6 @@ # The name of the project name="jupyterlab_examples_context_menu" -# Ensure a valid python version -ensure_python(">=3.6") - # Get our version version = get_version(os.path.join(name, "_version.py")) @@ -64,10 +61,11 @@ cmdclass= cmdclass, packages=setuptools.find_packages(), install_requires=[ - "jupyterlab~=3.0.0b3", + "jupyterlab~=3.0.0b4", ], zip_safe=False, include_package_data=True, + python_requires=">=3.6", license="BSD-3-Clause", platforms="Linux, Mac OS X, Windows", keywords=["Jupyter", "JupyterLab"], diff --git a/launcher/package.json b/launcher/package.json index 7250966c..e914d1c0 100644 --- a/launcher/package.json +++ b/launcher/package.json @@ -42,13 +42,13 @@ "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "~3.0.0-beta.3", - "@jupyterlab/filebrowser": "~3.0.0-beta.3", - "@jupyterlab/launcher": "~3.0.0-beta.3", - "@jupyterlab/mainmenu": "~3.0.0-beta.3" + "@jupyterlab/application": "~3.0.0-beta.4", + "@jupyterlab/filebrowser": "~3.0.0-beta.4", + "@jupyterlab/launcher": "~3.0.0-beta.4", + "@jupyterlab/mainmenu": "~3.0.0-beta.4" }, "devDependencies": { - "@jupyterlab/builder": "^3.0.0-beta.3", + "@jupyterlab/builder": "^3.0.0-beta.4", "@typescript-eslint/eslint-plugin": "^2.27.0", "@typescript-eslint/parser": "^2.27.0", "eslint": "^7.5.0", diff --git a/launcher/pyproject.toml b/launcher/pyproject.toml index 873d43f4..63a68190 100644 --- a/launcher/pyproject.toml +++ b/launcher/pyproject.toml @@ -1,3 +1,3 @@ [build-system] -requires = ["jupyter_packaging~=0.6.0", "jupyterlab~=3.0.0b3", "setuptools>=40.8.0", "wheel"] +requires = ["jupyter_packaging~=0.7.0", "jupyterlab~=3.0.0b4", "setuptools>=40.8.0", "wheel"] build-backend = "setuptools.build_meta" diff --git a/launcher/setup.py b/launcher/setup.py index 108459fc..4530d029 100644 --- a/launcher/setup.py +++ b/launcher/setup.py @@ -5,7 +5,7 @@ from jupyter_packaging import ( create_cmdclass, install_npm, ensure_targets, - combine_commands, ensure_python, get_version, + combine_commands, get_version, ) import setuptools @@ -14,9 +14,6 @@ # The name of the project name="jupyterlab_examples_launcher" -# Ensure a valid python version -ensure_python(">=3.6") - # Get our version version = get_version(os.path.join(name, "_version.py")) @@ -64,10 +61,11 @@ cmdclass= cmdclass, packages=setuptools.find_packages(), install_requires=[ - "jupyterlab~=3.0.0b3", + "jupyterlab~=3.0.0b4", ], zip_safe=False, include_package_data=True, + python_requires=">=3.6", license="BSD-3-Clause", platforms="Linux, Mac OS X, Windows", keywords=["Jupyter", "JupyterLab"], diff --git a/log-console/custom-log-console/package.json b/log-console/custom-log-console/package.json index 8be681cf..27c86c70 100644 --- a/log-console/custom-log-console/package.json +++ b/log-console/custom-log-console/package.json @@ -42,19 +42,19 @@ "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "~3.0.0-beta.3", - "@jupyterlab/apputils": "~3.0.0-beta.3", - "@jupyterlab/coreutils": "~5.0.0-beta.3", - "@jupyterlab/logconsole": "~3.0.0-beta.3", - "@jupyterlab/mainmenu": "~3.0.0-beta.3", - "@jupyterlab/nbformat": "~3.0.0-beta.3", - "@jupyterlab/rendermime": "~3.0.0-beta.3", - "@jupyterlab/ui-components": "~3.0.0-beta.3", + "@jupyterlab/application": "~3.0.0-beta.4", + "@jupyterlab/apputils": "~3.0.0-beta.4", + "@jupyterlab/coreutils": "~5.0.0-beta.4", + "@jupyterlab/logconsole": "~3.0.0-beta.4", + "@jupyterlab/mainmenu": "~3.0.0-beta.4", + "@jupyterlab/nbformat": "~3.0.0-beta.4", + "@jupyterlab/rendermime": "~3.0.0-beta.4", + "@jupyterlab/ui-components": "~3.0.0-beta.4", "@lumino/coreutils": "^1.5.3", "@lumino/widgets": "^1.14.0" }, "devDependencies": { - "@jupyterlab/builder": "^3.0.0-beta.3", + "@jupyterlab/builder": "^3.0.0-beta.4", "@typescript-eslint/eslint-plugin": "^2.27.0", "@typescript-eslint/parser": "^2.27.0", "eslint": "^7.5.0", diff --git a/log-console/custom-log-console/pyproject.toml b/log-console/custom-log-console/pyproject.toml index 873d43f4..63a68190 100644 --- a/log-console/custom-log-console/pyproject.toml +++ b/log-console/custom-log-console/pyproject.toml @@ -1,3 +1,3 @@ [build-system] -requires = ["jupyter_packaging~=0.6.0", "jupyterlab~=3.0.0b3", "setuptools>=40.8.0", "wheel"] +requires = ["jupyter_packaging~=0.7.0", "jupyterlab~=3.0.0b4", "setuptools>=40.8.0", "wheel"] build-backend = "setuptools.build_meta" diff --git a/log-console/custom-log-console/setup.py b/log-console/custom-log-console/setup.py index 327f52ae..25e9cfef 100644 --- a/log-console/custom-log-console/setup.py +++ b/log-console/custom-log-console/setup.py @@ -5,7 +5,7 @@ from jupyter_packaging import ( create_cmdclass, install_npm, ensure_targets, - combine_commands, ensure_python, get_version, + combine_commands, get_version, ) import setuptools @@ -14,9 +14,6 @@ # The name of the project name="jupyterlab_examples_custom_log_console" -# Ensure a valid python version -ensure_python(">=3.6") - # Get our version version = get_version(os.path.join(name, "_version.py")) @@ -64,10 +61,11 @@ cmdclass= cmdclass, packages=setuptools.find_packages(), install_requires=[ - "jupyterlab~=3.0.0b3", + "jupyterlab~=3.0.0b4", ], zip_safe=False, include_package_data=True, + python_requires=">=3.6", license="BSD-3-Clause", platforms="Linux, Mac OS X, Windows", keywords=["Jupyter", "JupyterLab"], diff --git a/log-console/log-messages/package.json b/log-console/log-messages/package.json index d7f47e22..666358dd 100644 --- a/log-console/log-messages/package.json +++ b/log-console/log-messages/package.json @@ -42,20 +42,20 @@ "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "~3.0.0-beta.3", - "@jupyterlab/apputils": "~3.0.0-beta.3", - "@jupyterlab/coreutils": "~5.0.0-beta.3", - "@jupyterlab/logconsole": "~3.0.0-beta.3", - "@jupyterlab/mainmenu": "~3.0.0-beta.3", - "@jupyterlab/nbformat": "~3.0.0-beta.3", - "@jupyterlab/notebook": "~3.0.0-beta.3", - "@jupyterlab/rendermime": "~3.0.0-beta.3", - "@jupyterlab/ui-components": "~3.0.0-beta.3", + "@jupyterlab/application": "~3.0.0-beta.4", + "@jupyterlab/apputils": "~3.0.0-beta.4", + "@jupyterlab/coreutils": "~5.0.0-beta.4", + "@jupyterlab/logconsole": "~3.0.0-beta.4", + "@jupyterlab/mainmenu": "~3.0.0-beta.4", + "@jupyterlab/nbformat": "~3.0.0-beta.4", + "@jupyterlab/notebook": "~3.0.0-beta.4", + "@jupyterlab/rendermime": "~3.0.0-beta.4", + "@jupyterlab/ui-components": "~3.0.0-beta.4", "@lumino/coreutils": "^1.5.3", "@lumino/widgets": "^1.14.0" }, "devDependencies": { - "@jupyterlab/builder": "^3.0.0-beta.3", + "@jupyterlab/builder": "^3.0.0-beta.4", "@typescript-eslint/eslint-plugin": "^2.27.0", "@typescript-eslint/parser": "^2.27.0", "eslint": "^7.5.0", diff --git a/log-console/log-messages/pyproject.toml b/log-console/log-messages/pyproject.toml index 873d43f4..63a68190 100644 --- a/log-console/log-messages/pyproject.toml +++ b/log-console/log-messages/pyproject.toml @@ -1,3 +1,3 @@ [build-system] -requires = ["jupyter_packaging~=0.6.0", "jupyterlab~=3.0.0b3", "setuptools>=40.8.0", "wheel"] +requires = ["jupyter_packaging~=0.7.0", "jupyterlab~=3.0.0b4", "setuptools>=40.8.0", "wheel"] build-backend = "setuptools.build_meta" diff --git a/log-console/log-messages/setup.py b/log-console/log-messages/setup.py index 4efff72f..3d63b80b 100644 --- a/log-console/log-messages/setup.py +++ b/log-console/log-messages/setup.py @@ -5,7 +5,7 @@ from jupyter_packaging import ( create_cmdclass, install_npm, ensure_targets, - combine_commands, ensure_python, get_version, + combine_commands, get_version, ) import setuptools @@ -14,9 +14,6 @@ # The name of the project name="jupyterlab_examples_log_messages" -# Ensure a valid python version -ensure_python(">=3.6") - # Get our version version = get_version(os.path.join(name, "_version.py")) @@ -64,10 +61,11 @@ cmdclass= cmdclass, packages=setuptools.find_packages(), install_requires=[ - "jupyterlab~=3.0.0b3", + "jupyterlab~=3.0.0b4", ], zip_safe=False, include_package_data=True, + python_requires=">=3.6", license="BSD-3-Clause", platforms="Linux, Mac OS X, Windows", keywords=["Jupyter", "JupyterLab"], diff --git a/main-menu/package.json b/main-menu/package.json index 48aa1810..94dbfff6 100644 --- a/main-menu/package.json +++ b/main-menu/package.json @@ -42,12 +42,12 @@ "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "~3.0.0-beta.3", - "@jupyterlab/mainmenu": "~3.0.0-beta.3", + "@jupyterlab/application": "~3.0.0-beta.4", + "@jupyterlab/mainmenu": "~3.0.0-beta.4", "@lumino/widgets": "^1.14.0" }, "devDependencies": { - "@jupyterlab/builder": "^3.0.0-beta.3", + "@jupyterlab/builder": "^3.0.0-beta.4", "@typescript-eslint/eslint-plugin": "^2.27.0", "@typescript-eslint/parser": "^2.27.0", "eslint": "^7.5.0", diff --git a/main-menu/pyproject.toml b/main-menu/pyproject.toml index 873d43f4..63a68190 100644 --- a/main-menu/pyproject.toml +++ b/main-menu/pyproject.toml @@ -1,3 +1,3 @@ [build-system] -requires = ["jupyter_packaging~=0.6.0", "jupyterlab~=3.0.0b3", "setuptools>=40.8.0", "wheel"] +requires = ["jupyter_packaging~=0.7.0", "jupyterlab~=3.0.0b4", "setuptools>=40.8.0", "wheel"] build-backend = "setuptools.build_meta" diff --git a/main-menu/setup.py b/main-menu/setup.py index 3a043ed3..4c325db1 100644 --- a/main-menu/setup.py +++ b/main-menu/setup.py @@ -5,7 +5,7 @@ from jupyter_packaging import ( create_cmdclass, install_npm, ensure_targets, - combine_commands, ensure_python, get_version, + combine_commands, get_version, ) import setuptools @@ -14,9 +14,6 @@ # The name of the project name="jupyterlab_examples_main_menu" -# Ensure a valid python version -ensure_python(">=3.6") - # Get our version version = get_version(os.path.join(name, "_version.py")) @@ -64,10 +61,11 @@ cmdclass= cmdclass, packages=setuptools.find_packages(), install_requires=[ - "jupyterlab~=3.0.0b3", + "jupyterlab~=3.0.0b4", ], zip_safe=False, include_package_data=True, + python_requires=">=3.6", license="BSD-3-Clause", platforms="Linux, Mac OS X, Windows", keywords=["Jupyter", "JupyterLab"], diff --git a/react/react-widget/package.json b/react/react-widget/package.json index a6ccbf96..2e381233 100644 --- a/react/react-widget/package.json +++ b/react/react-widget/package.json @@ -42,12 +42,12 @@ "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "~3.0.0-beta.3", - "@jupyterlab/launcher": "~3.0.0-beta.3", - "@jupyterlab/ui-components": "~3.0.0-beta.3" + "@jupyterlab/application": "~3.0.0-beta.4", + "@jupyterlab/launcher": "~3.0.0-beta.4", + "@jupyterlab/ui-components": "~3.0.0-beta.4" }, "devDependencies": { - "@jupyterlab/builder": "^3.0.0-beta.3", + "@jupyterlab/builder": "^3.0.0-beta.4", "@typescript-eslint/eslint-plugin": "^2.27.0", "@typescript-eslint/parser": "^2.27.0", "eslint": "^7.5.0", diff --git a/react/react-widget/pyproject.toml b/react/react-widget/pyproject.toml index 873d43f4..63a68190 100644 --- a/react/react-widget/pyproject.toml +++ b/react/react-widget/pyproject.toml @@ -1,3 +1,3 @@ [build-system] -requires = ["jupyter_packaging~=0.6.0", "jupyterlab~=3.0.0b3", "setuptools>=40.8.0", "wheel"] +requires = ["jupyter_packaging~=0.7.0", "jupyterlab~=3.0.0b4", "setuptools>=40.8.0", "wheel"] build-backend = "setuptools.build_meta" diff --git a/react/react-widget/setup.py b/react/react-widget/setup.py index 03c61ead..74ae2915 100644 --- a/react/react-widget/setup.py +++ b/react/react-widget/setup.py @@ -5,7 +5,7 @@ from jupyter_packaging import ( create_cmdclass, install_npm, ensure_targets, - combine_commands, ensure_python, get_version, + combine_commands, get_version, ) import setuptools @@ -14,9 +14,6 @@ # The name of the project name="jupyterlab_examples_react_widget" -# Ensure a valid python version -ensure_python(">=3.6") - # Get our version version = get_version(os.path.join(name, "_version.py")) @@ -64,10 +61,11 @@ cmdclass= cmdclass, packages=setuptools.find_packages(), install_requires=[ - "jupyterlab~=3.0.0b3", + "jupyterlab~=3.0.0b4", ], zip_safe=False, include_package_data=True, + python_requires=">=3.6", license="BSD-3-Clause", platforms="Linux, Mac OS X, Windows", keywords=["Jupyter", "JupyterLab"], diff --git a/settings/package.json b/settings/package.json index 5ab0de43..a7ff6be8 100644 --- a/settings/package.json +++ b/settings/package.json @@ -43,13 +43,13 @@ "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "~3.0.0-beta.3", - "@jupyterlab/mainmenu": "~3.0.0-beta.3", - "@jupyterlab/settingregistry": "~3.0.0-beta.3", + "@jupyterlab/application": "~3.0.0-beta.4", + "@jupyterlab/mainmenu": "~3.0.0-beta.4", + "@jupyterlab/settingregistry": "~3.0.0-beta.4", "@lumino/widgets": "^1.14.0" }, "devDependencies": { - "@jupyterlab/builder": "^3.0.0-beta.3", + "@jupyterlab/builder": "^3.0.0-beta.4", "@typescript-eslint/eslint-plugin": "^2.27.0", "@typescript-eslint/parser": "^2.27.0", "eslint": "^7.5.0", diff --git a/settings/pyproject.toml b/settings/pyproject.toml index 873d43f4..63a68190 100644 --- a/settings/pyproject.toml +++ b/settings/pyproject.toml @@ -1,3 +1,3 @@ [build-system] -requires = ["jupyter_packaging~=0.6.0", "jupyterlab~=3.0.0b3", "setuptools>=40.8.0", "wheel"] +requires = ["jupyter_packaging~=0.7.0", "jupyterlab~=3.0.0b4", "setuptools>=40.8.0", "wheel"] build-backend = "setuptools.build_meta" diff --git a/settings/setup.py b/settings/setup.py index fd81711d..adc60f60 100644 --- a/settings/setup.py +++ b/settings/setup.py @@ -5,7 +5,7 @@ from jupyter_packaging import ( create_cmdclass, install_npm, ensure_targets, - combine_commands, ensure_python, get_version, + combine_commands, get_version, ) import setuptools @@ -14,9 +14,6 @@ # The name of the project name="jupyterlab_examples_settings" -# Ensure a valid python version -ensure_python(">=3.6") - # Get our version version = get_version(os.path.join(name, "_version.py")) @@ -64,10 +61,11 @@ cmdclass= cmdclass, packages=setuptools.find_packages(), install_requires=[ - "jupyterlab~=3.0.0b3", + "jupyterlab~=3.0.0b4", ], zip_safe=False, include_package_data=True, + python_requires=">=3.6", license="BSD-3-Clause", platforms="Linux, Mac OS X, Windows", keywords=["Jupyter", "JupyterLab"], diff --git a/state/package.json b/state/package.json index 46456489..31a1fcfb 100644 --- a/state/package.json +++ b/state/package.json @@ -42,13 +42,13 @@ "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "~3.0.0-beta.3", - "@jupyterlab/apputils": "~3.0.0-beta.3", - "@jupyterlab/statedb": "~3.0.0-beta.3", + "@jupyterlab/application": "~3.0.0-beta.4", + "@jupyterlab/apputils": "~3.0.0-beta.4", + "@jupyterlab/statedb": "~3.0.0-beta.4", "@lumino/coreutils": "^1.5.3" }, "devDependencies": { - "@jupyterlab/builder": "^3.0.0-beta.3", + "@jupyterlab/builder": "^3.0.0-beta.4", "@typescript-eslint/eslint-plugin": "^2.27.0", "@typescript-eslint/parser": "^2.27.0", "eslint": "^7.5.0", diff --git a/state/pyproject.toml b/state/pyproject.toml index 873d43f4..63a68190 100644 --- a/state/pyproject.toml +++ b/state/pyproject.toml @@ -1,3 +1,3 @@ [build-system] -requires = ["jupyter_packaging~=0.6.0", "jupyterlab~=3.0.0b3", "setuptools>=40.8.0", "wheel"] +requires = ["jupyter_packaging~=0.7.0", "jupyterlab~=3.0.0b4", "setuptools>=40.8.0", "wheel"] build-backend = "setuptools.build_meta" diff --git a/state/setup.py b/state/setup.py index 7932cad9..73371eb4 100644 --- a/state/setup.py +++ b/state/setup.py @@ -5,7 +5,7 @@ from jupyter_packaging import ( create_cmdclass, install_npm, ensure_targets, - combine_commands, ensure_python, get_version, + combine_commands, get_version, ) import setuptools @@ -14,9 +14,6 @@ # The name of the project name="jupyterlab_examples_state" -# Ensure a valid python version -ensure_python(">=3.6") - # Get our version version = get_version(os.path.join(name, "_version.py")) @@ -64,10 +61,11 @@ cmdclass= cmdclass, packages=setuptools.find_packages(), install_requires=[ - "jupyterlab~=3.0.0b3", + "jupyterlab~=3.0.0b4", ], zip_safe=False, include_package_data=True, + python_requires=">=3.6", license="BSD-3-Clause", platforms="Linux, Mac OS X, Windows", keywords=["Jupyter", "JupyterLab"], diff --git a/widget-tracker/widgets/package.json b/widget-tracker/widgets/package.json index f493e717..6b8c32be 100644 --- a/widget-tracker/widgets/package.json +++ b/widget-tracker/widgets/package.json @@ -42,14 +42,14 @@ "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "~3.0.0-beta.3", - "@jupyterlab/mainmenu": "~3.0.0-beta.3", + "@jupyterlab/application": "~3.0.0-beta.4", + "@jupyterlab/mainmenu": "~3.0.0-beta.4", "@lumino/algorithm": "^1.3.3", "@lumino/coreutils": "^1.5.3", "@lumino/disposable": "^1.4.3" }, "devDependencies": { - "@jupyterlab/builder": "^3.0.0-beta.3", + "@jupyterlab/builder": "^3.0.0-beta.4", "@typescript-eslint/eslint-plugin": "^2.27.0", "@typescript-eslint/parser": "^2.27.0", "eslint": "^7.5.0", diff --git a/widget-tracker/widgets/pyproject.toml b/widget-tracker/widgets/pyproject.toml index 873d43f4..63a68190 100644 --- a/widget-tracker/widgets/pyproject.toml +++ b/widget-tracker/widgets/pyproject.toml @@ -1,3 +1,3 @@ [build-system] -requires = ["jupyter_packaging~=0.6.0", "jupyterlab~=3.0.0b3", "setuptools>=40.8.0", "wheel"] +requires = ["jupyter_packaging~=0.7.0", "jupyterlab~=3.0.0b4", "setuptools>=40.8.0", "wheel"] build-backend = "setuptools.build_meta" diff --git a/widget-tracker/widgets/setup.py b/widget-tracker/widgets/setup.py index a7e2a139..a0933efd 100644 --- a/widget-tracker/widgets/setup.py +++ b/widget-tracker/widgets/setup.py @@ -5,7 +5,7 @@ from jupyter_packaging import ( create_cmdclass, install_npm, ensure_targets, - combine_commands, ensure_python, get_version, + combine_commands, get_version, ) import setuptools @@ -14,9 +14,6 @@ # The name of the project name="jupyterlab_examples_widgets" -# Ensure a valid python version -ensure_python(">=3.6") - # Get our version version = get_version(os.path.join(name, "_version.py")) @@ -64,10 +61,11 @@ cmdclass= cmdclass, packages=setuptools.find_packages(), install_requires=[ - "jupyterlab~=3.0.0b3", + "jupyterlab~=3.0.0b4", ], zip_safe=False, include_package_data=True, + python_requires=">=3.6", license="BSD-3-Clause", platforms="Linux, Mac OS X, Windows", keywords=["Jupyter", "JupyterLab"], From ea78b875b952f5906764862181cd302e0d180701 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Fri, 11 Sep 2020 14:36:37 -0500 Subject: [PATCH 09/45] update readmes --- advanced/server-extension/README.md | 15 ++++++--------- basics/hello-world/README.md | 2 +- main-menu/README.md | 4 ++-- 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/advanced/server-extension/README.md b/advanced/server-extension/README.md index a046dfd2..b7d5f0e3 100644 --- a/advanced/server-extension/README.md +++ b/advanced/server-extension/README.md @@ -501,7 +501,7 @@ import os from jupyter_packaging import ( create_cmdclass, install_npm, ensure_targets, - combine_commands, ensure_python, get_version, + combine_commands, get_version, ) import setuptools @@ -510,9 +510,6 @@ HERE = os.path.abspath(os.path.dirname(__file__)) # The name of the project name="jlab_ext_example" -# Ensure a valid python version -ensure_python(">=3.6") - # Get our version version = get_version(os.path.join(name, "_version.py")) @@ -562,10 +559,11 @@ setup_args = dict( cmdclass= cmdclass, packages=setuptools.find_packages(), install_requires=[ - "jupyterlab~=3.0.0b3", + "jupyterlab~=3.0.0b4", ], zip_safe=False, include_package_data=True, + python_requires=">=3.6", license="BSD-3-Clause", platforms="Linux, Mac OS X, Windows", keywords=["Jupyter", "JupyterLab"], @@ -584,7 +582,6 @@ setup_args = dict( if __name__ == "__main__": setuptools.setup(**setup_args) - ``` But in this case, it is a bit more complicated to build the frontend extension and ship it @@ -593,7 +590,7 @@ the frontend NPM package needs to be built and inserted in the Python package. T done using a special `cmdclass`: ```py -# setup.py#L45-L53 +# setup.py#L42-L50 cmdclass = create_cmdclass("jsdeps", package_data_spec=package_data_spec, @@ -609,7 +606,7 @@ cmdclass["jsdeps"] = combine_commands( Basically it will build the frontend NPM package: ```py -# setup.py#L51-L51 +# setup.py#L48-L48 install_npm(HERE, build_cmd="build:all", npm=["jlpm"]), ``` @@ -617,7 +614,7 @@ install_npm(HERE, build_cmd="build:all", npm=["jlpm"]), It will ensure one of the generated JS files is `lib/jlabextexample.js`: ```py -# setup.py#L26-L29 +# setup.py#L23-L26 jstargets = [ os.path.join(HERE, "lib", "index.js"), diff --git a/basics/hello-world/README.md b/basics/hello-world/README.md index 4ea18e27..8e14b0e7 100644 --- a/basics/hello-world/README.md +++ b/basics/hello-world/README.md @@ -94,7 +94,7 @@ package is declared in the file `package.json`: // package.json#L44-L46 "dependencies": { - "@jupyterlab/application": "~3.0.0-beta.3" + "@jupyterlab/application": "~3.0.0-beta.4" }, ``` diff --git a/main-menu/README.md b/main-menu/README.md index d3fda127..cbf005c1 100644 --- a/main-menu/README.md +++ b/main-menu/README.md @@ -88,8 +88,8 @@ After the execution of that command, `package.json` should list them in the // package.json#L44-L48 "dependencies": { - "@jupyterlab/application": "~3.0.0-beta.3", - "@jupyterlab/mainmenu": "~3.0.0-beta.3", + "@jupyterlab/application": "~3.0.0-beta.4", + "@jupyterlab/mainmenu": "~3.0.0-beta.4", "@lumino/widgets": "^1.14.0" }, ``` From ca282f298b7c4e7214580e482fad2e5f418627f3 Mon Sep 17 00:00:00 2001 From: Kalen Goo Date: Wed, 16 Sep 2020 05:58:31 -1000 Subject: [PATCH 10/45] Updated embedded code snippets in readme --- basics/datagrid/README.md | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/basics/datagrid/README.md b/basics/datagrid/README.md index 67cf5865..7d5d32ff 100644 --- a/basics/datagrid/README.md +++ b/basics/datagrid/README.md @@ -14,7 +14,7 @@ First you need to import `StackedPanel`, `DataGrid` and `DataModel` classes from lumino: ```ts -// src/index.ts#L10-L12 +// src/index.ts#L16-L18 import { DataGrid, DataModel } from '@lumino/datagrid'; @@ -35,14 +35,17 @@ the main area of JupyterLab as seen in the above screenshot. With these three classes, you can create your own widget, called `DataGridPanel` : ```ts -// src/index.ts#L49-L63 +// src/index.ts#L57-L77 class DataGridPanel extends StackedPanel { - constructor() { + constructor(translator?: ITranslator) { super(); + this._translator = translator || nullTranslator; + this._trans = this._translator.load('jupyterlab'); + this.addClass('jp-example-view'); this.id = 'datagrid-example'; - this.title.label = 'Datagrid Example View'; + this.title.label = this._trans.__('Datagrid Example View'); this.title.closable = true; const model = new LargeDataModel(); @@ -51,6 +54,9 @@ class DataGridPanel extends StackedPanel { this.addWidget(grid); } + + private _translator: ITranslator; + private _trans: TranslationBundle; } ``` @@ -58,12 +64,14 @@ Your widget is derived from `StackedPanel` to inherit its behavior. Then some properties for the panel. Then the `DataGrid` widget and its associated model are created. Finally the grid is inserted inside the panel. +Note that the private variables `_translator` and `_trans` are used for translating labels and other pieces of text that are displayed to the user. + The `DataModel` class is not used directly as it is an abstract class. Therefore in this example a class `LargeDataModel` is derived from it to implement its abstract methods: ```ts -// src/index.ts#L65-L74 +// src/index.ts#L79-L88 class LargeDataModel extends DataModel { rowCount(region: DataModel.RowRegion): number { @@ -108,7 +116,7 @@ values of the datagrid. In this case it simply displays the row and column index in each cell, and adds a letter prefix in the header regions: ```ts -// src/index.ts#L74-L85 +// src/index.ts#L88-L99 data(region: DataModel.CellRegion, row: number, column: number): any { if (region === 'row-header') { From 8696ce5bbf6744ee4050b58b396af2dbd3951a01 Mon Sep 17 00:00:00 2001 From: Kalen Goo Date: Thu, 3 Sep 2020 11:09:42 -1000 Subject: [PATCH 11/45] Localization for kernel-messaging example --- advanced/kernel-messaging/src/index.ts | 19 ++++++++++++------- advanced/kernel-messaging/src/panel.ts | 15 +++++++++++++-- 2 files changed, 25 insertions(+), 9 deletions(-) diff --git a/advanced/kernel-messaging/src/index.ts b/advanced/kernel-messaging/src/index.ts index 16b826cf..2c65fc87 100644 --- a/advanced/kernel-messaging/src/index.ts +++ b/advanced/kernel-messaging/src/index.ts @@ -9,6 +9,8 @@ import { ILauncher } from '@jupyterlab/launcher'; import { IMainMenu } from '@jupyterlab/mainmenu'; +import { ITranslator } from '@jupyterlab/translation'; + import { Menu } from '@lumino/widgets'; import { ExamplePanel } from './panel'; @@ -27,27 +29,30 @@ const extension: JupyterFrontEndPlugin = { id: 'kernel-messaging', autoStart: true, optional: [ILauncher], - requires: [ICommandPalette, IMainMenu], + requires: [ICommandPalette, IMainMenu, ITranslator], activate: activate }; /** * Activate the JupyterLab extension. * - * @param app Jupyter Font End + * @param app Jupyter Front End * @param palette Jupyter Commands Palette * @param mainMenu Jupyter Menu * @param launcher [optional] Jupyter Launcher + * @param translator Jupyter Translator */ function activate( app: JupyterFrontEnd, palette: ICommandPalette, mainMenu: IMainMenu, - launcher: ILauncher | null + launcher: ILauncher | null, + translator: ITranslator ): void { const manager = app.serviceManager; const { commands, shell } = app; const category = 'Extension Examples'; + const trans = translator.load('jupyterlab'); // Add launcher if (launcher) { @@ -63,20 +68,20 @@ function activate( * @returns The panel */ async function createPanel(): Promise { - const panel = new ExamplePanel(manager); + const panel = new ExamplePanel(manager, translator); shell.add(panel, 'main'); return panel; } // add menu tab const exampleMenu = new Menu({ commands }); - exampleMenu.title.label = 'Kernel Messaging'; + exampleMenu.title.label = trans.__('Kernel Messaging'); mainMenu.addMenu(exampleMenu); // add commands to registry commands.addCommand(CommandIDs.create, { - label: 'Open the Kernel Messaging Panel', - caption: 'Open the Kernel Messaging Panel', + label: trans.__('Open the Kernel Messaging Panel'), + caption: trans.__('Open the Kernel Messaging Panel'), execute: createPanel }); diff --git a/advanced/kernel-messaging/src/panel.ts b/advanced/kernel-messaging/src/panel.ts index 0fd544ee..988dd2ca 100644 --- a/advanced/kernel-messaging/src/panel.ts +++ b/advanced/kernel-messaging/src/panel.ts @@ -4,6 +4,12 @@ import { sessionContextDialogs } from '@jupyterlab/apputils'; +import { + ITranslator, + nullTranslator, + TranslationBundle +} from '@jupyterlab/translation'; + import { ServiceManager } from '@jupyterlab/services'; import { Message } from '@lumino/messaging'; @@ -23,11 +29,13 @@ const PANEL_CLASS = 'jp-RovaPanel'; * A panel which has the ability to add other children. */ export class ExamplePanel extends StackedPanel { - constructor(manager: ServiceManager.IManager) { + constructor(manager: ServiceManager.IManager, translator?: ITranslator) { super(); + this._translator = translator || nullTranslator; + this._trans = this._translator.load('jupyterlab'); this.addClass(PANEL_CLASS); this.id = 'kernel-messaging-panel'; - this.title.label = 'Kernel Messaging Example View'; + this.title.label = this._trans.__('Kernel Messaging Example View'); this.title.closable = true; this._sessionContext = new SessionContext({ @@ -71,4 +79,7 @@ export class ExamplePanel extends StackedPanel { private _model: KernelModel; private _sessionContext: SessionContext; private _example: KernelView; + + private _translator: ITranslator; + private _trans: TranslationBundle; } From 0207e5093922bd4a3723b5fbb91d94024995416f Mon Sep 17 00:00:00 2001 From: Kalen Goo Date: Sat, 19 Sep 2020 11:50:57 -1000 Subject: [PATCH 12/45] Updated embedded code snippets in readme --- advanced/kernel-messaging/README.md | 29 +++++++++++++++----------- advanced/kernel-messaging/package.json | 9 ++++---- advanced/kernel-messaging/src/index.ts | 12 +++++------ 3 files changed, 28 insertions(+), 22 deletions(-) diff --git a/advanced/kernel-messaging/README.md b/advanced/kernel-messaging/README.md index 2020957f..0c286549 100644 --- a/advanced/kernel-messaging/README.md +++ b/advanced/kernel-messaging/README.md @@ -36,17 +36,17 @@ Jupyterlab provides a class `SessionContext` that manages a single kernel session. Here is the code to initialize such session: ```ts -// src/panel.ts#L33-L37 +// src/panel.ts#L41-L45 this._sessionContext = new SessionContext({ sessionManager: manager.sessions, specsManager: manager.kernelspecs, - name: 'Extension Examples' + name: 'Extension Examples', }); ``` - + ```ts void this._sessionContext @@ -68,7 +68,7 @@ The session manager object is provided directly by the JupyterLab application: ```ts -// src/index.ts#L48-L48 +// src/index.ts#L52-L52 const manager = app.serviceManager; ``` @@ -81,20 +81,22 @@ to free the kernel session resources if the panel is closed. The whole adapted panel class looks like this: ```ts -// src/panel.ts#L25-L74 +// src/panel.ts#L31-L85 export class ExamplePanel extends StackedPanel { - constructor(manager: ServiceManager.IManager) { + constructor(manager: ServiceManager.IManager, translator?: ITranslator) { super(); + this._translator = translator || nullTranslator; + this._trans = this._translator.load('jupyterlab'); this.addClass(PANEL_CLASS); this.id = 'kernel-messaging-panel'; - this.title.label = 'Kernel Messaging Example View'; + this.title.label = this._trans.__('Kernel Messaging Example View'); this.title.closable = true; this._sessionContext = new SessionContext({ sessionManager: manager.sessions, specsManager: manager.kernelspecs, - name: 'Extension Examples' + name: 'Extension Examples', }); this._model = new KernelModel(this._sessionContext); @@ -103,12 +105,12 @@ export class ExamplePanel extends StackedPanel { this.addWidget(this._example); void this._sessionContext .initialize() - .then(async value => { + .then(async (value) => { if (value) { await sessionContextDialogs.selectKernel(this._sessionContext); } }) - .catch(reason => { + .catch((reason) => { console.error( `Failed to initialize the session in ExamplePanel.\n${reason}` ); @@ -132,6 +134,9 @@ export class ExamplePanel extends StackedPanel { private _model: KernelModel; private _sessionContext: SessionContext; private _example: KernelView; + + private _translator: ITranslator; + private _trans: TranslationBundle; } ``` @@ -143,7 +148,7 @@ Once a kernel is initialized and ready, code can be executed with the following // src/model.ts#L46-L48 this.future = this._sessionContext.session?.kernel?.requestExecute({ - code + code, }); ``` @@ -200,7 +205,7 @@ export class KernelModel { return; } this.future = this._sessionContext.session?.kernel?.requestExecute({ - code + code, }); } diff --git a/advanced/kernel-messaging/package.json b/advanced/kernel-messaging/package.json index e90a6bab..f0055f54 100644 --- a/advanced/kernel-messaging/package.json +++ b/advanced/kernel-messaging/package.json @@ -42,10 +42,11 @@ "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "~3.0.0-beta.4", - "@jupyterlab/launcher": "~3.0.0-beta.4", - "@jupyterlab/mainmenu": "~3.0.0-beta.4", - "@jupyterlab/nbformat": "~3.0.0-beta.4", + "@jupyterlab/application": "^3.0.0-beta.8", + "@jupyterlab/launcher": "^3.0.0-beta.8", + "@jupyterlab/mainmenu": "^3.0.0-beta.8", + "@jupyterlab/nbformat": "^3.0.0-beta.8", + "@jupyterlab/translation": "^3.0.0-beta.8", "@lumino/algorithm": "^1.3.3", "@lumino/coreutils": "^1.5.3", "@lumino/datagrid": "^0.5.2", diff --git a/advanced/kernel-messaging/src/index.ts b/advanced/kernel-messaging/src/index.ts index 2c65fc87..7882ab88 100644 --- a/advanced/kernel-messaging/src/index.ts +++ b/advanced/kernel-messaging/src/index.ts @@ -1,6 +1,6 @@ import { JupyterFrontEnd, - JupyterFrontEndPlugin + JupyterFrontEndPlugin, } from '@jupyterlab/application'; import { ICommandPalette } from '@jupyterlab/apputils'; @@ -30,7 +30,7 @@ const extension: JupyterFrontEndPlugin = { autoStart: true, optional: [ILauncher], requires: [ICommandPalette, IMainMenu, ITranslator], - activate: activate + activate: activate, }; /** @@ -46,8 +46,8 @@ function activate( app: JupyterFrontEnd, palette: ICommandPalette, mainMenu: IMainMenu, - launcher: ILauncher | null, - translator: ITranslator + translator: ITranslator, + launcher: ILauncher | null ): void { const manager = app.serviceManager; const { commands, shell } = app; @@ -58,7 +58,7 @@ function activate( if (launcher) { launcher.add({ command: CommandIDs.create, - category: category + category: category, }); } @@ -82,7 +82,7 @@ function activate( commands.addCommand(CommandIDs.create, { label: trans.__('Open the Kernel Messaging Panel'), caption: trans.__('Open the Kernel Messaging Panel'), - execute: createPanel + execute: createPanel, }); // add items in command palette and menu From ab4c9f23c2a3d5481e5eeb09a325945fb770c50f Mon Sep 17 00:00:00 2001 From: Kalen Goo Date: Sat, 19 Sep 2020 12:22:16 -1000 Subject: [PATCH 13/45] Fixed linting issues --- advanced/kernel-messaging/src/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/advanced/kernel-messaging/src/index.ts b/advanced/kernel-messaging/src/index.ts index 7882ab88..dc205393 100644 --- a/advanced/kernel-messaging/src/index.ts +++ b/advanced/kernel-messaging/src/index.ts @@ -39,8 +39,8 @@ const extension: JupyterFrontEndPlugin = { * @param app Jupyter Front End * @param palette Jupyter Commands Palette * @param mainMenu Jupyter Menu - * @param launcher [optional] Jupyter Launcher * @param translator Jupyter Translator + * @param launcher [optional] Jupyter Launcher */ function activate( app: JupyterFrontEnd, From 89a886665f04b7974d0904475cf39f85296752b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Collonval?= Date: Thu, 17 Sep 2020 07:08:07 +0200 Subject: [PATCH 14/45] Backport PR #121: Skip test if the extension is not touched --- .github/workflows/main.yml | 42 +++++++++++++++++++++++++++++++++--- basics/hello-world/README.md | 2 +- 2 files changed, 40 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 974e696d..5381e11c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -33,7 +33,15 @@ jobs: steps: - name: Checkout uses: actions/checkout@v2 + - name: Path filter + id: filter + uses: dorny/paths-filter@v2 + with: + filters: | + extension: + - '${{ matrix.example }}/**' - name: Cache lerna + if: steps.filter.outputs.extension == 'true' uses: actions/cache@v2 with: path: | @@ -43,6 +51,7 @@ jobs: restore-keys: | ${{ runner.os }}-lerna- - name: Check config files + if: steps.filter.outputs.extension == 'true' run: | diff basics/hello-world/tsconfig.json ${EXAMPLE_FOLDER}/tsconfig.json diff basics/hello-world/.eslintignore ${EXAMPLE_FOLDER}/.eslintignore @@ -52,20 +61,24 @@ jobs: EXAMPLE_FOLDER: ${{ matrix.example }} shell: bash - name: Install node + if: steps.filter.outputs.extension == 'true' uses: actions/setup-node@v1 with: node-version: "12.x" - name: Install Python + if: steps.filter.outputs.extension == 'true' uses: actions/setup-python@v1 with: python-version: "3.7" architecture: "x64" - name: Get pip cache dir + if: steps.filter.outputs.extension == 'true' id: pip-cache run: | echo "::set-output name=dir::$(pip cache dir)" shell: bash - name: Cache pip + if: steps.filter.outputs.extension == 'true' uses: actions/cache@v2 with: path: ${{ steps.pip-cache.outputs.dir }} @@ -73,11 +86,13 @@ jobs: restore-keys: | ${{ runner.os }}-pip- - name: Install the Python dependencies + if: steps.filter.outputs.extension == 'true' run: | python -m pip install --upgrade pip python -m pip install jupyter_packaging python -m pip install --pre jupyterlab - name: Install the NPM dependencies + if: steps.filter.outputs.extension == 'true' run: | cd ${EXAMPLE_FOLDER} jlpm @@ -85,6 +100,7 @@ jobs: EXAMPLE_FOLDER: ${{ matrix.example }} shell: bash - name: Lint the files + if: steps.filter.outputs.extension == 'true' run: | cd ${EXAMPLE_FOLDER} jlpm run eslint:check @@ -92,6 +108,7 @@ jobs: EXAMPLE_FOLDER: ${{ matrix.example }} shell: bash - name: Build and check by extension + if: steps.filter.outputs.extension == 'true' run: | cd ${EXAMPLE_FOLDER} pip install -e . @@ -113,36 +130,49 @@ jobs: steps: - name: Checkout uses: actions/checkout@v2 + - name: Path filter + id: filter + uses: dorny/paths-filter@v2 + with: + filters: | + extension: + - 'advanced/server-extension/**' - name: Cache lerna + if: steps.filter.outputs.extension == 'true' uses: actions/cache@v2 with: path: | node_modules */*/node_modules - key: ${{ runner.os }}-lerna-${{ hashFiles('**/package.json') }} + key: ${{ runner.os }}-lerna-${{ hashFiles('advanced/server-extension/package.json') }} restore-keys: | ${{ runner.os }}-lerna- - name: Install node + if: steps.filter.outputs.extension == 'true' uses: actions/setup-node@v1 with: node-version: "12.x" - name: Check config files + if: steps.filter.outputs.extension == 'true' run: | diff basics/hello-world/tsconfig.json advanced/server-extension/tsconfig.json diff basics/hello-world/.eslintignore advanced/server-extension/.eslintignore diff basics/hello-world/.eslintrc.js advanced/server-extension/.eslintrc.js shell: bash - name: Install Python + if: steps.filter.outputs.extension == 'true' uses: actions/setup-python@v1 with: python-version: "3.7" architecture: "x64" - name: Get pip cache dir + if: steps.filter.outputs.extension == 'true' id: pip-cache run: | echo "::set-output name=dir::$(pip cache dir)" shell: bash - name: Cache pip + if: steps.filter.outputs.extension == 'true' uses: actions/cache@v2 with: path: ${{ steps.pip-cache.outputs.dir }} @@ -150,19 +180,23 @@ jobs: restore-keys: | ${{ runner.os }}-pip- - name: Install the Python dependencies + if: steps.filter.outputs.extension == 'true' run: | python -m pip install --upgrade pip python -m pip install jupyter_packaging python -m pip install --pre jupyterlab - name: Install the NPM dependencies + if: steps.filter.outputs.extension == 'true' run: | cd advanced/server-extension jlpm - name: Lint the files + if: steps.filter.outputs.extension == 'true' run: | cd advanced/server-extension jlpm run eslint:check - name: Build extension as user + if: steps.filter.outputs.extension == 'true' # Force the usage of the source distribution (good practice) run: | cd advanced/server-extension @@ -170,25 +204,27 @@ jobs: pip install jlab_ext_example --pre --find-links=dist --no-cache-dir python -m jupyterlab.browser_check - name: Check extension as dev - if: startsWith(runner.os, 'Linux') || startsWith(runner.os, 'macOS') + if: steps.filter.outputs.extension == 'true' && ( startsWith(runner.os, 'Linux') || startsWith(runner.os, 'macOS') ) run: | jupyter server extension list 1>serverextensions 2>&1 cat serverextensions | grep "jlab_ext_example.*OK" jupyter labextension list 1>labextensions 2>&1 cat labextensions | grep "@jupyterlab-examples/server-extension.*OK" - name: Clean extension installation + if: steps.filter.outputs.extension == 'true' run: | pip uninstall -y jlab_ext_example jupyter lab clean jupyter server extension list jupyter labextension list - name: Build extension as dev + if: steps.filter.outputs.extension == 'true' run: | cd advanced/server-extension pip install -e . jupyter server extension enable --py jlab_ext_example - name: Check extension as dev - if: startsWith(runner.os, 'Linux') || startsWith(runner.os, 'macOS') + if: steps.filter.outputs.extension == 'true' && ( startsWith(runner.os, 'Linux') || startsWith(runner.os, 'macOS') ) run: | jupyter server extension list 1>serverextensions 2>&1 cat serverextensions | grep "jlab_ext_example.*OK" diff --git a/basics/hello-world/README.md b/basics/hello-world/README.md index 8e14b0e7..df2ca91a 100644 --- a/basics/hello-world/README.md +++ b/basics/hello-world/README.md @@ -2,7 +2,7 @@ > Set up the development environment and print to the console. -![hello-world example](./preview.png) +![hello world example](./preview.png) - [The template folder structure](#the-template-folder-structure) - [A minimal extension that prints to the browser console](#a-minimal-extension-that-prints-to-the-browser-console) From 37316076abd761480816e01b75ce139f464e4097 Mon Sep 17 00:00:00 2001 From: Kalen Goo Date: Thu, 3 Sep 2020 10:44:22 -1000 Subject: [PATCH 15/45] Localization for signals example --- basics/signals/package.json | 1 + basics/signals/src/index.ts | 16 ++++++++++------ basics/signals/src/panel.ts | 14 ++++++++++++-- 3 files changed, 23 insertions(+), 8 deletions(-) diff --git a/basics/signals/package.json b/basics/signals/package.json index ff455bb3..5b95d45c 100644 --- a/basics/signals/package.json +++ b/basics/signals/package.json @@ -45,6 +45,7 @@ "@jupyterlab/application": "~3.0.0-beta.4", "@jupyterlab/launcher": "~3.0.0-beta.4", "@jupyterlab/mainmenu": "~3.0.0-beta.4", + "@jupyterlab/translation": "^3.0.0-beta.4", "@lumino/algorithm": "^1.3.3", "@lumino/coreutils": "^1.5.3", "@lumino/datagrid": "^0.3.1", diff --git a/basics/signals/src/index.ts b/basics/signals/src/index.ts index 26f08d86..6b26fe56 100644 --- a/basics/signals/src/index.ts +++ b/basics/signals/src/index.ts @@ -9,6 +9,8 @@ import { ILauncher } from '@jupyterlab/launcher'; import { IMainMenu } from '@jupyterlab/mainmenu'; +import { ITranslator } from '@jupyterlab/translation'; + import { Menu } from '@lumino/widgets'; import { SignalExamplePanel } from './panel'; @@ -27,7 +29,7 @@ const extension: JupyterFrontEndPlugin = { id: 'signals', autoStart: true, optional: [ILauncher], - requires: [ICommandPalette, IMainMenu], + requires: [ICommandPalette, IMainMenu, ITranslator], activate: activate }; @@ -43,11 +45,13 @@ function activate( app: JupyterFrontEnd, palette: ICommandPalette, mainMenu: IMainMenu, - launcher: ILauncher | null + launcher: ILauncher | null, + translator: ITranslator ): void { const manager = app.serviceManager; const { commands, shell } = app; const category = 'Extension Examples'; + const trans = translator.load('jupyterlab'); // Add launcher if (launcher) { @@ -65,7 +69,7 @@ function activate( function createPanel(): Promise { let panel: SignalExamplePanel; return manager.ready.then(() => { - panel = new SignalExamplePanel(); + panel = new SignalExamplePanel(translator); shell.add(panel, 'main'); return panel; }); @@ -73,13 +77,13 @@ function activate( // Add menu tab const signalMenu = new Menu({ commands }); - signalMenu.title.label = 'Signal Example'; + signalMenu.title.label = trans.__('Signal Example'); mainMenu.addMenu(signalMenu); // Add commands to registry commands.addCommand(CommandIDs.create, { - label: 'Open the Signal Example Panel', - caption: 'Open the Signal Example Panel', + label: trans.__('Open the Signal Example Panel'), + caption: trans.__('Open the Signal Example Panel'), execute: createPanel }); diff --git a/basics/signals/src/panel.ts b/basics/signals/src/panel.ts index 9e870881..ff5be3df 100644 --- a/basics/signals/src/panel.ts +++ b/basics/signals/src/panel.ts @@ -1,3 +1,8 @@ +import { + ITranslator, + nullTranslator, + TranslationBundle +} from '@jupyterlab/translation'; import { StackedPanel } from '@lumino/widgets'; import { ButtonWidget, ICount } from './button'; @@ -10,11 +15,13 @@ const PANEL_CLASS = 'jp-tutorial-view'; * A panel which contains a console and the ability to add other children. */ export class SignalExamplePanel extends StackedPanel { - constructor() { + constructor(translator?: ITranslator) { super(); + this._translator = translator || nullTranslator; + this._trans = this._translator.load('jupyterlab'); this.addClass(PANEL_CLASS); this.id = 'SignalExamplePanel'; - this.title.label = 'Signal Example View'; + this.title.label = this._trans.__('Signal Example View'); this.title.closable = true; this._widget = new ButtonWidget(); @@ -33,4 +40,7 @@ export class SignalExamplePanel extends StackedPanel { } private _widget: ButtonWidget; + + private _translator: ITranslator; + private _trans: TranslationBundle; } From 28ab00e31a3d9e2af06aecf3d9d067e68b4c3d0b Mon Sep 17 00:00:00 2001 From: Kalen Goo Date: Sat, 19 Sep 2020 11:29:56 -1000 Subject: [PATCH 16/45] Updated embedded code snippets in readme --- basics/signals/README.md | 17 +++++++++-------- basics/signals/package.json | 10 +++++----- basics/signals/src/index.ts | 12 ++++++------ 3 files changed, 20 insertions(+), 19 deletions(-) diff --git a/basics/signals/README.md b/basics/signals/README.md index 0e2a7dfb..5b216e25 100644 --- a/basics/signals/README.md +++ b/basics/signals/README.md @@ -21,7 +21,7 @@ JupyterLab's Lumino engine uses the `ISignal` interface and the The basic concept is as follows: -First, a widget (`button.ts`), in this case the one that contains +First, a widget (`button.tsx`), in this case the one that contains some visual elements such as a button, defines a `_stateChanged` signal: ```ts @@ -44,7 +44,7 @@ Another widget, in this case the panel (`panel.ts`) that boxes several different subscribes to the `stateChanged` signal and links some function to it: ```ts -// src/panel.ts#L22-L22 +// src/panel.ts#L29-L29 this._widget.stateChanged.connect(this._logMessage, this); ``` @@ -141,13 +141,14 @@ The `panel.ts` class defines an extension panel that displays the This is done in the constructor. ```ts -// src/panel.ts#L13-L23 +// src/panel.ts#L19-L30 -constructor() { super(); + this._translator = translator || nullTranslator; + this._trans = this._translator.load('jupyterlab'); this.addClass(PANEL_CLASS); this.id = 'SignalExamplePanel'; - this.title.label = 'Signal Example View'; + this.title.label = this._trans.__('Signal Example View'); this.title.closable = true; this._widget = new ButtonWidget(); @@ -160,7 +161,7 @@ Subscription to a signal is done using the `connect` method of the `stateChanged` attribute. ```ts -// src/panel.ts#L22-L22 +// src/panel.ts#L29-L29 this._widget.stateChanged.connect(this._logMessage, this); ``` @@ -178,7 +179,7 @@ The `_logMessage` function receives as parameters the emitter (of type `ButtonWi and the count (of type `ICount`) sent by the signal emitter. ```ts -// src/panel.ts#L25-L25 +// src/panel.ts#L32-L32 private _logMessage(emitter: ButtonWidget, count: ICount): void { ``` @@ -187,7 +188,7 @@ In our case, that function writes `Button has been clicked ... times.` text to the browser console and in an alert when the big red button is clicked. ```ts -// src/panel.ts#L25-L29 +// src/panel.ts#L32-L36 private _logMessage(emitter: ButtonWidget, count: ICount): void { console.log('Hey, a Signal has been received from', emitter); diff --git a/basics/signals/package.json b/basics/signals/package.json index 5b95d45c..95a556d0 100644 --- a/basics/signals/package.json +++ b/basics/signals/package.json @@ -42,10 +42,10 @@ "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "~3.0.0-beta.4", - "@jupyterlab/launcher": "~3.0.0-beta.4", - "@jupyterlab/mainmenu": "~3.0.0-beta.4", - "@jupyterlab/translation": "^3.0.0-beta.4", + "@jupyterlab/application": "~3.0.0-beta.8", + "@jupyterlab/launcher": "~3.0.0-beta.8", + "@jupyterlab/mainmenu": "~3.0.0-beta.8", + "@jupyterlab/translation": "^3.0.0-beta.8", "@lumino/algorithm": "^1.3.3", "@lumino/coreutils": "^1.5.3", "@lumino/datagrid": "^0.3.1", @@ -72,4 +72,4 @@ "extension": true, "outputDir": "jupyterlab_examples_signals/static" } -} \ No newline at end of file +} diff --git a/basics/signals/src/index.ts b/basics/signals/src/index.ts index 6b26fe56..3047b8f4 100644 --- a/basics/signals/src/index.ts +++ b/basics/signals/src/index.ts @@ -1,6 +1,6 @@ import { JupyterFrontEnd, - JupyterFrontEndPlugin + JupyterFrontEndPlugin, } from '@jupyterlab/application'; import { ICommandPalette } from '@jupyterlab/apputils'; @@ -30,7 +30,7 @@ const extension: JupyterFrontEndPlugin = { autoStart: true, optional: [ILauncher], requires: [ICommandPalette, IMainMenu, ITranslator], - activate: activate + activate: activate, }; /** @@ -45,8 +45,8 @@ function activate( app: JupyterFrontEnd, palette: ICommandPalette, mainMenu: IMainMenu, - launcher: ILauncher | null, - translator: ITranslator + translator: ITranslator, + launcher: ILauncher | null ): void { const manager = app.serviceManager; const { commands, shell } = app; @@ -57,7 +57,7 @@ function activate( if (launcher) { launcher.add({ command: CommandIDs.create, - category: category + category: category, }); } @@ -84,7 +84,7 @@ function activate( commands.addCommand(CommandIDs.create, { label: trans.__('Open the Signal Example Panel'), caption: trans.__('Open the Signal Example Panel'), - execute: createPanel + execute: createPanel, }); // Add items in command palette and menu From e4935c7a76bfe2b7e30329fa5cfbab3dbd692bdb Mon Sep 17 00:00:00 2001 From: Kalen Goo Date: Sat, 19 Sep 2020 12:11:12 -1000 Subject: [PATCH 17/45] Fixed linting issues --- basics/signals/src/index.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/basics/signals/src/index.ts b/basics/signals/src/index.ts index 3047b8f4..ed6a8b5d 100644 --- a/basics/signals/src/index.ts +++ b/basics/signals/src/index.ts @@ -39,6 +39,7 @@ const extension: JupyterFrontEndPlugin = { * @param app Jupyter Font End * @param palette Jupyter Commands Palette * @param mainMenu Jupyter Menu + * @param translator Jupyter Translator * @param launcher [optional] Jupyter Launcher */ function activate( From 2de3b43bfd5389ec97948bbd18fced147f51e408 Mon Sep 17 00:00:00 2001 From: Jeremy Tuloup Date: Mon, 21 Sep 2020 09:12:54 +0200 Subject: [PATCH 18/45] Prettier for the signals example --- basics/signals/src/index.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/basics/signals/src/index.ts b/basics/signals/src/index.ts index ed6a8b5d..2ff2dd17 100644 --- a/basics/signals/src/index.ts +++ b/basics/signals/src/index.ts @@ -1,6 +1,6 @@ import { JupyterFrontEnd, - JupyterFrontEndPlugin, + JupyterFrontEndPlugin } from '@jupyterlab/application'; import { ICommandPalette } from '@jupyterlab/apputils'; @@ -30,7 +30,7 @@ const extension: JupyterFrontEndPlugin = { autoStart: true, optional: [ILauncher], requires: [ICommandPalette, IMainMenu, ITranslator], - activate: activate, + activate }; /** @@ -58,7 +58,7 @@ function activate( if (launcher) { launcher.add({ command: CommandIDs.create, - category: category, + category: category }); } @@ -85,7 +85,7 @@ function activate( commands.addCommand(CommandIDs.create, { label: trans.__('Open the Signal Example Panel'), caption: trans.__('Open the Signal Example Panel'), - execute: createPanel, + execute: createPanel }); // Add items in command palette and menu From 03cf9ed54cd5eca71eb1f19b042579c112b329d1 Mon Sep 17 00:00:00 2001 From: Kalen Goo Date: Sun, 20 Sep 2020 23:09:28 -1000 Subject: [PATCH 19/45] Fixed prettier formatting --- advanced/kernel-messaging/README.md | 12 ++++++------ advanced/kernel-messaging/src/index.ts | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/advanced/kernel-messaging/README.md b/advanced/kernel-messaging/README.md index 0c286549..e5950ae0 100644 --- a/advanced/kernel-messaging/README.md +++ b/advanced/kernel-messaging/README.md @@ -41,7 +41,7 @@ that manages a single kernel session. Here is the code to initialize such sessio this._sessionContext = new SessionContext({ sessionManager: manager.sessions, specsManager: manager.kernelspecs, - name: 'Extension Examples', + name: 'Extension Examples' }); ``` @@ -96,7 +96,7 @@ export class ExamplePanel extends StackedPanel { this._sessionContext = new SessionContext({ sessionManager: manager.sessions, specsManager: manager.kernelspecs, - name: 'Extension Examples', + name: 'Extension Examples' }); this._model = new KernelModel(this._sessionContext); @@ -105,12 +105,12 @@ export class ExamplePanel extends StackedPanel { this.addWidget(this._example); void this._sessionContext .initialize() - .then(async (value) => { + .then(async value => { if (value) { await sessionContextDialogs.selectKernel(this._sessionContext); } }) - .catch((reason) => { + .catch(reason => { console.error( `Failed to initialize the session in ExamplePanel.\n${reason}` ); @@ -148,7 +148,7 @@ Once a kernel is initialized and ready, code can be executed with the following // src/model.ts#L46-L48 this.future = this._sessionContext.session?.kernel?.requestExecute({ - code, + code }); ``` @@ -205,7 +205,7 @@ export class KernelModel { return; } this.future = this._sessionContext.session?.kernel?.requestExecute({ - code, + code }); } diff --git a/advanced/kernel-messaging/src/index.ts b/advanced/kernel-messaging/src/index.ts index dc205393..fc6a9945 100644 --- a/advanced/kernel-messaging/src/index.ts +++ b/advanced/kernel-messaging/src/index.ts @@ -1,6 +1,6 @@ import { JupyterFrontEnd, - JupyterFrontEndPlugin, + JupyterFrontEndPlugin } from '@jupyterlab/application'; import { ICommandPalette } from '@jupyterlab/apputils'; @@ -30,7 +30,7 @@ const extension: JupyterFrontEndPlugin = { autoStart: true, optional: [ILauncher], requires: [ICommandPalette, IMainMenu, ITranslator], - activate: activate, + activate: activate }; /** @@ -58,7 +58,7 @@ function activate( if (launcher) { launcher.add({ command: CommandIDs.create, - category: category, + category: category }); } @@ -82,7 +82,7 @@ function activate( commands.addCommand(CommandIDs.create, { label: trans.__('Open the Kernel Messaging Panel'), caption: trans.__('Open the Kernel Messaging Panel'), - execute: createPanel, + execute: createPanel }); // add items in command palette and menu From 9036fb6b097273b40b915be8735fa1c4bde6d5c0 Mon Sep 17 00:00:00 2001 From: Kalen Goo Date: Thu, 3 Sep 2020 11:26:58 -1000 Subject: [PATCH 20/45] Localization for kernel-output example --- advanced/kernel-output/package.json | 1 + advanced/kernel-output/src/index.ts | 27 ++++++++++++++++----------- advanced/kernel-output/src/panel.ts | 15 +++++++++++++-- 3 files changed, 30 insertions(+), 13 deletions(-) diff --git a/advanced/kernel-output/package.json b/advanced/kernel-output/package.json index b319903b..315ccc47 100644 --- a/advanced/kernel-output/package.json +++ b/advanced/kernel-output/package.json @@ -46,6 +46,7 @@ "@jupyterlab/launcher": "~3.0.0-beta.4", "@jupyterlab/mainmenu": "~3.0.0-beta.4", "@jupyterlab/outputarea": "~3.0.0-beta.4", + "@jupyterlab/translation": "^3.0.0-beta.4", "@lumino/algorithm": "^1.3.3", "@lumino/coreutils": "^1.5.3", "@lumino/datagrid": "^0.3.1", diff --git a/advanced/kernel-output/src/index.ts b/advanced/kernel-output/src/index.ts index d44715a2..f4966306 100644 --- a/advanced/kernel-output/src/index.ts +++ b/advanced/kernel-output/src/index.ts @@ -9,6 +9,8 @@ import { ILauncher } from '@jupyterlab/launcher'; import { IMainMenu } from '@jupyterlab/mainmenu'; +import { ITranslator } from '@jupyterlab/translation'; + import { IRenderMimeRegistry } from '@jupyterlab/rendermime'; import { Menu } from '@lumino/widgets'; @@ -31,17 +33,18 @@ const extension: JupyterFrontEndPlugin = { id: 'kernel-output', autoStart: true, optional: [ILauncher], - requires: [ICommandPalette, IMainMenu, IRenderMimeRegistry], + requires: [ICommandPalette, IMainMenu, IRenderMimeRegistry, ITranslator], activate: activate }; /** * Activate the JupyterLab extension. * - * @param app Jupyter Font End + * @param app Jupyter Front End * @param palette Jupyter Commands Palette * @param mainMenu Jupyter Menu * @param rendermime Jupyter Render Mime Registry + * @param translator Jupyter Translator * @param launcher [optional] Jupyter Launcher */ function activate( @@ -49,11 +52,13 @@ function activate( palette: ICommandPalette, mainMenu: IMainMenu, rendermime: IRenderMimeRegistry, + translator: ITranslator, launcher: ILauncher | null ): void { const manager = app.serviceManager; const { commands, shell } = app; const category = 'Extension Examples'; + const trans = translator.load('jupyterlab'); let panel: ExamplePanel; @@ -63,26 +68,26 @@ function activate( * @returns The panel */ async function createPanel(): Promise { - panel = new ExamplePanel(manager, rendermime); + panel = new ExamplePanel(manager, rendermime, translator); shell.add(panel, 'main'); return panel; } // add menu tab const exampleMenu = new Menu({ commands }); - exampleMenu.title.label = 'Kernel Output'; + exampleMenu.title.label = trans.__('Kernel Output'); mainMenu.addMenu(exampleMenu); // add commands to registry commands.addCommand(CommandIDs.create, { - label: 'Open the Kernel Output Panel', - caption: 'Open the Kernel Output Panel', + label: trans.__('Open the Kernel Output Panel'), + caption: trans.__('Open the Kernel Output Panel'), execute: createPanel }); commands.addCommand(CommandIDs.execute, { - label: 'Contact Kernel and Execute Code', - caption: 'Contact Kernel and Execute Code', + label: trans.__('Contact Kernel and Execute Code'), + caption: trans.__('Contact Kernel and Execute Code'), execute: async () => { // Create the panel if it does not exist if (!panel) { @@ -90,9 +95,9 @@ function activate( } // Prompt the user about the statement to be executed const input = await InputDialog.getText({ - title: 'Code to execute', - okLabel: 'Execute', - placeholder: 'Statement to execute' + title: trans.__('Code to execute'), + okLabel: trans.__('Execute'), + placeholder: trans.__('Statement to execute') }); // Execute the statement if (input.button.accept) { diff --git a/advanced/kernel-output/src/panel.ts b/advanced/kernel-output/src/panel.ts index 86849443..8494eaa1 100644 --- a/advanced/kernel-output/src/panel.ts +++ b/advanced/kernel-output/src/panel.ts @@ -9,6 +9,11 @@ import { OutputAreaModel, SimplifiedOutputArea } from '@jupyterlab/outputarea'; import { IRenderMimeRegistry } from '@jupyterlab/rendermime'; import { KernelMessage, ServiceManager } from '@jupyterlab/services'; +import { + ITranslator, + nullTranslator, + TranslationBundle +} from '@jupyterlab/translation'; import { Message } from '@lumino/messaging'; @@ -25,12 +30,15 @@ const PANEL_CLASS = 'jp-RovaPanel'; export class ExamplePanel extends StackedPanel { constructor( manager: ServiceManager.IManager, - rendermime: IRenderMimeRegistry + rendermime: IRenderMimeRegistry, + translator?: ITranslator ) { super(); + this._translator = translator || nullTranslator; + this._trans = this._translator.load('jupyterlab'); this.addClass(PANEL_CLASS); this.id = 'kernel-output-panel'; - this.title.label = 'Kernel Output Example View'; + this.title.label = this._trans.__('Kernel Output Example View'); this.title.closable = true; this._sessionContext = new SessionContext({ @@ -86,4 +94,7 @@ export class ExamplePanel extends StackedPanel { private _sessionContext: SessionContext; private _outputarea: SimplifiedOutputArea; private _outputareamodel: OutputAreaModel; + + private _translator: ITranslator; + private _trans: TranslationBundle; } From a4396c79ec00686526c3f1655cb68f5f6ad64a2f Mon Sep 17 00:00:00 2001 From: Kalen Goo Date: Sat, 19 Sep 2020 12:08:08 -1000 Subject: [PATCH 21/45] Updated embedded code snippets in readme --- advanced/kernel-output/README.md | 48 ++++++++++++++--------------- advanced/kernel-output/package.json | 10 +++--- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/advanced/kernel-output/README.md b/advanced/kernel-output/README.md index 61601a8d..0438cb19 100644 --- a/advanced/kernel-output/README.md +++ b/advanced/kernel-output/README.md @@ -41,7 +41,7 @@ object ([see the documentation](https://jupyterlab.github.io/jupyterlab/apputils Here it is stored in the private `_sessionContext` variable: ```ts -// src/panel.ts#L86-L86 +// src/panel.ts#L94-L94 private _sessionContext: SessionContext; ``` @@ -50,12 +50,12 @@ A `SessionContext` handles a single kernel session. The session itself (not yet the kernel) is started with these lines: ```ts -// src/panel.ts#L36-L40 +// src/panel.ts#L44-L48 this._sessionContext = new SessionContext({ sessionManager: manager.sessions, specsManager: manager.kernelspecs, - name: 'Kernel Output' + name: 'Kernel Output', }); ``` @@ -63,7 +63,7 @@ The private session variable is exposed as read-only for other users through a getter method: ```ts -// src/panel.ts#L64-L66 +// src/panel.ts#L72-L74 get session(): ISessionContext { return this._sessionContext; @@ -75,7 +75,7 @@ with this line: ```ts -// src/panel.ts#L50-L61 +// src/panel.ts#L58-L69 void this._sessionContext .initialize() @@ -99,7 +99,7 @@ The following two methods ensure the clean disposal of the session when you close the panel. ```ts -// src/panel.ts#L68-L71 +// src/panel.ts#L76-L79 dispose(): void { this._sessionContext.dispose(); @@ -108,7 +108,7 @@ dispose(): void { ``` ```ts -// src/panel.ts#L81-L84 +// src/panel.ts#L89-L92 protected onCloseRequest(msg: Message): void { super.onCloseRequest(msg); @@ -124,12 +124,12 @@ You can instantiate it with a new `OutputAreaModel`; this is class containing the data to show: ```ts -// src/panel.ts#L42-L46 +// src/panel.ts#L50-L54 this._outputareamodel = new OutputAreaModel(); this._outputarea = new SimplifiedOutputArea({ model: this._outputareamodel, - rendermime: rendermime + rendermime: rendermime, }); ``` @@ -138,7 +138,7 @@ some code to a kernel through a `ISessionContext` ([see documentation](https://j in the specific `SimplifiedOutputArea` object you created: ```ts -// src/panel.ts#L73-L79 +// src/panel.ts#L81-L87 execute(code: string): void { SimplifiedOutputArea.execute(code, this._outputarea, this._sessionContext) @@ -158,7 +158,7 @@ To display the `SimplifiedOutputArea` Widget you need to add it to your panel with: ```ts -// src/panel.ts#L48-L48 +// src/panel.ts#L56-L56 this.addWidget(this._outputarea); ``` @@ -172,7 +172,7 @@ The last step is to add the panel to the JupyterLab main area. First, it is a good practice to unify the extension commands into one namespace at the top of the file: ```ts -// src/index.ts#L21-L25 +// src/index.ts#L23-L27 namespace CommandIDs { export const create = 'kernel-output:create'; @@ -185,10 +185,10 @@ You can then add the commands to the palette and the menu by iterating on a list: ```ts -// src/index.ts#L105-L109 +// src/index.ts#L110-L114 // add items in command palette and menu -[CommandIDs.create, CommandIDs.execute].forEach(command => { +[CommandIDs.create, CommandIDs.execute].forEach((command) => { palette.addItem({ command, category }); exampleMenu.addItem({ command }); }); @@ -198,7 +198,7 @@ To create a new client session, the service manager must be obtained from the JupyterLab application: ```ts -// src/index.ts#L54-L54 +// src/index.ts#L58-L58 const manager = app.serviceManager; ``` @@ -208,7 +208,7 @@ ready. Then once the panel is created and its session is ready, it can be added to the JupyterLab main area: ```ts -// src/index.ts#L58-L69 +// src/index.ts#L63-L74 let panel: ExamplePanel; @@ -218,7 +218,7 @@ let panel: ExamplePanel; * @returns The panel */ async function createPanel(): Promise { - panel = new ExamplePanel(manager, rendermime); + panel = new ExamplePanel(manager, rendermime, translator); shell.add(panel, 'main'); return panel; } @@ -231,11 +231,11 @@ to be executed by the kernel. Then you will send it to your panel for execution and display: ```ts -// src/index.ts#L83-L103 +// src/index.ts#L88-L108 commands.addCommand(CommandIDs.execute, { - label: 'Contact Kernel and Execute Code', - caption: 'Contact Kernel and Execute Code', + label: trans.__('Contact Kernel and Execute Code'), + caption: trans.__('Contact Kernel and Execute Code'), execute: async () => { // Create the panel if it does not exist if (!panel) { @@ -243,16 +243,16 @@ commands.addCommand(CommandIDs.execute, { } // Prompt the user about the statement to be executed const input = await InputDialog.getText({ - title: 'Code to execute', - okLabel: 'Execute', - placeholder: 'Statement to execute' + title: trans.__('Code to execute'), + okLabel: trans.__('Execute'), + placeholder: trans.__('Statement to execute'), }); // Execute the statement if (input.button.accept) { const code = input.value; panel.execute(code); } - } + }, }); ``` diff --git a/advanced/kernel-output/package.json b/advanced/kernel-output/package.json index 315ccc47..3ca7ca7c 100644 --- a/advanced/kernel-output/package.json +++ b/advanced/kernel-output/package.json @@ -42,11 +42,11 @@ "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "~3.0.0-beta.4", - "@jupyterlab/launcher": "~3.0.0-beta.4", - "@jupyterlab/mainmenu": "~3.0.0-beta.4", - "@jupyterlab/outputarea": "~3.0.0-beta.4", - "@jupyterlab/translation": "^3.0.0-beta.4", + "@jupyterlab/application": "~3.0.0-beta.8", + "@jupyterlab/launcher": "~3.0.0-beta.8", + "@jupyterlab/mainmenu": "~3.0.0-beta.8", + "@jupyterlab/outputarea": "~3.0.0-beta.8", + "@jupyterlab/translation": "^3.0.0-beta.8", "@lumino/algorithm": "^1.3.3", "@lumino/coreutils": "^1.5.3", "@lumino/datagrid": "^0.3.1", From 4136d50add6a1e400d06b7f1287081073e99a7c1 Mon Sep 17 00:00:00 2001 From: Kalen Goo Date: Sun, 20 Sep 2020 23:08:23 -1000 Subject: [PATCH 22/45] Fixed prettier formatting --- advanced/kernel-output/README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/advanced/kernel-output/README.md b/advanced/kernel-output/README.md index 0438cb19..e03e097b 100644 --- a/advanced/kernel-output/README.md +++ b/advanced/kernel-output/README.md @@ -55,7 +55,7 @@ the kernel) is started with these lines: this._sessionContext = new SessionContext({ sessionManager: manager.sessions, specsManager: manager.kernelspecs, - name: 'Kernel Output', + name: 'Kernel Output' }); ``` @@ -129,7 +129,7 @@ the data to show: this._outputareamodel = new OutputAreaModel(); this._outputarea = new SimplifiedOutputArea({ model: this._outputareamodel, - rendermime: rendermime, + rendermime: rendermime }); ``` @@ -188,7 +188,7 @@ on a list: // src/index.ts#L110-L114 // add items in command palette and menu -[CommandIDs.create, CommandIDs.execute].forEach((command) => { +[CommandIDs.create, CommandIDs.execute].forEach(command => { palette.addItem({ command, category }); exampleMenu.addItem({ command }); }); @@ -245,14 +245,14 @@ commands.addCommand(CommandIDs.execute, { const input = await InputDialog.getText({ title: trans.__('Code to execute'), okLabel: trans.__('Execute'), - placeholder: trans.__('Statement to execute'), + placeholder: trans.__('Statement to execute') }); // Execute the statement if (input.button.accept) { const code = input.value; panel.execute(code); } - }, + } }); ``` From fab477f951ab8d4f7757aa0b8b49d6b8752c62ca Mon Sep 17 00:00:00 2001 From: Jeremy Tuloup Date: Tue, 22 Sep 2020 23:42:03 +0200 Subject: [PATCH 23/45] Update to the latest beta --- advanced/kernel-messaging/package.json | 15 ++++++------ advanced/kernel-messaging/pyproject.toml | 2 +- advanced/kernel-messaging/setup.py | 4 ++-- advanced/kernel-output/package.json | 15 ++++++------ advanced/kernel-output/pyproject.toml | 2 +- advanced/kernel-output/setup.py | 4 ++-- advanced/server-extension/README.md | 18 +++++++-------- advanced/server-extension/package.json | 13 ++++++----- advanced/server-extension/pyproject.toml | 2 +- advanced/server-extension/setup.py | 4 ++-- basics/datagrid/package.json | 11 +++++---- basics/datagrid/pyproject.toml | 2 +- basics/datagrid/setup.py | 4 ++-- basics/hello-world/README.md | 4 ++-- basics/hello-world/package.json | 7 +++--- basics/hello-world/pyproject.toml | 2 +- basics/hello-world/setup.py | 4 ++-- basics/signals/package.json | 15 ++++++------ basics/signals/pyproject.toml | 2 +- basics/signals/setup.py | 4 ++-- command-palette/package.json | 7 +++--- command-palette/pyproject.toml | 2 +- command-palette/setup.py | 4 ++-- commands/package.json | 7 +++--- commands/pyproject.toml | 2 +- commands/setup.py | 4 ++-- context-menu/package.json | 13 ++++++----- context-menu/pyproject.toml | 2 +- context-menu/setup.py | 4 ++-- launcher/package.json | 13 ++++++----- launcher/pyproject.toml | 2 +- launcher/setup.py | 4 ++-- log-console/custom-log-console/package.json | 21 +++++++++-------- log-console/custom-log-console/pyproject.toml | 2 +- log-console/custom-log-console/setup.py | 4 ++-- log-console/log-messages/package.json | 23 ++++++++++--------- log-console/log-messages/pyproject.toml | 2 +- log-console/log-messages/setup.py | 4 ++-- main-menu/README.md | 6 ++--- main-menu/package.json | 9 ++++---- main-menu/pyproject.toml | 2 +- main-menu/setup.py | 4 ++-- react/react-widget/package.json | 11 +++++---- react/react-widget/pyproject.toml | 2 +- react/react-widget/setup.py | 4 ++-- settings/README.md | 2 +- settings/package.json | 11 +++++---- settings/pyproject.toml | 2 +- settings/setup.py | 4 ++-- state/package.json | 11 +++++---- state/pyproject.toml | 2 +- state/setup.py | 4 ++-- widget-tracker/widgets/package.json | 9 ++++---- widget-tracker/widgets/pyproject.toml | 2 +- widget-tracker/widgets/setup.py | 4 ++-- 55 files changed, 180 insertions(+), 163 deletions(-) diff --git a/advanced/kernel-messaging/package.json b/advanced/kernel-messaging/package.json index f0055f54..cdc687e0 100644 --- a/advanced/kernel-messaging/package.json +++ b/advanced/kernel-messaging/package.json @@ -25,9 +25,10 @@ "url": "https://github.com/jupyterlab/extension-examples.git" }, "scripts": { - "build": "jlpm run build:lib", + "build": "jlpm run build:lib && jlpm run build:labextension", "build:all": "jlpm run build:lib && jlpm run build:labextension", "build:labextension": "jupyter labextension build .", + "build:labextension:dev": "jupyter labextension build --development True .", "build:lib": "tsc", "clean": "jlpm run clean:lib", "clean:all": "jlpm run clean:lib && jlpm run clean:labextension", @@ -42,11 +43,11 @@ "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "^3.0.0-beta.8", - "@jupyterlab/launcher": "^3.0.0-beta.8", - "@jupyterlab/mainmenu": "^3.0.0-beta.8", - "@jupyterlab/nbformat": "^3.0.0-beta.8", - "@jupyterlab/translation": "^3.0.0-beta.8", + "@jupyterlab/application": "~3.0.0-beta.6", + "@jupyterlab/launcher": "~3.0.0-beta.6", + "@jupyterlab/mainmenu": "~3.0.0-beta.6", + "@jupyterlab/nbformat": "~3.0.0-beta.6", + "@jupyterlab/translation": "~3.0.0-beta.6", "@lumino/algorithm": "^1.3.3", "@lumino/coreutils": "^1.5.3", "@lumino/datagrid": "^0.5.2", @@ -54,7 +55,7 @@ "@lumino/widgets": "^1.14.0" }, "devDependencies": { - "@jupyterlab/builder": "^3.0.0-beta.4", + "@jupyterlab/builder": "^3.0.0-beta.6", "@typescript-eslint/eslint-plugin": "^2.27.0", "@typescript-eslint/parser": "^2.27.0", "eslint": "^7.5.0", diff --git a/advanced/kernel-messaging/pyproject.toml b/advanced/kernel-messaging/pyproject.toml index 63a68190..6aa9c052 100644 --- a/advanced/kernel-messaging/pyproject.toml +++ b/advanced/kernel-messaging/pyproject.toml @@ -1,3 +1,3 @@ [build-system] -requires = ["jupyter_packaging~=0.7.0", "jupyterlab~=3.0.0b4", "setuptools>=40.8.0", "wheel"] +requires = ["jupyter_packaging~=0.7.0", "jupyterlab>=3.0.0b6,==3.*", "setuptools>=40.8.0", "wheel"] build-backend = "setuptools.build_meta" diff --git a/advanced/kernel-messaging/setup.py b/advanced/kernel-messaging/setup.py index 14cd71ba..25c199ad 100644 --- a/advanced/kernel-messaging/setup.py +++ b/advanced/kernel-messaging/setup.py @@ -43,7 +43,7 @@ ) cmdclass["jsdeps"] = combine_commands( - install_npm(HERE, build_cmd="build:all", npm=["jlpm"]), + install_npm(HERE, build_cmd="build", npm=["jlpm"]), ensure_targets(jstargets), ) @@ -61,7 +61,7 @@ cmdclass= cmdclass, packages=setuptools.find_packages(), install_requires=[ - "jupyterlab~=3.0.0b4", + "jupyterlab>=3.0.0b6,==3.*", ], zip_safe=False, include_package_data=True, diff --git a/advanced/kernel-output/package.json b/advanced/kernel-output/package.json index 3ca7ca7c..6fa1e654 100644 --- a/advanced/kernel-output/package.json +++ b/advanced/kernel-output/package.json @@ -25,9 +25,10 @@ "url": "https://github.com/jupyterlab/extension-examples.git" }, "scripts": { - "build": "jlpm run build:lib", + "build": "jlpm run build:lib && jlpm run build:labextension", "build:all": "jlpm run build:lib && jlpm run build:labextension", "build:labextension": "jupyter labextension build .", + "build:labextension:dev": "jupyter labextension build --development True .", "build:lib": "tsc", "clean": "jlpm run clean:lib", "clean:all": "jlpm run clean:lib && jlpm run clean:labextension", @@ -42,18 +43,18 @@ "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "~3.0.0-beta.8", - "@jupyterlab/launcher": "~3.0.0-beta.8", - "@jupyterlab/mainmenu": "~3.0.0-beta.8", - "@jupyterlab/outputarea": "~3.0.0-beta.8", - "@jupyterlab/translation": "^3.0.0-beta.8", + "@jupyterlab/application": "~3.0.0-beta.6", + "@jupyterlab/launcher": "~3.0.0-beta.6", + "@jupyterlab/mainmenu": "~3.0.0-beta.6", + "@jupyterlab/outputarea": "~3.0.0-beta.6", + "@jupyterlab/translation": "~3.0.0-beta.6", "@lumino/algorithm": "^1.3.3", "@lumino/coreutils": "^1.5.3", "@lumino/datagrid": "^0.3.1", "@lumino/disposable": "^1.4.3" }, "devDependencies": { - "@jupyterlab/builder": "^3.0.0-beta.4", + "@jupyterlab/builder": "^3.0.0-beta.6", "@typescript-eslint/eslint-plugin": "^2.27.0", "@typescript-eslint/parser": "^2.27.0", "eslint": "^7.5.0", diff --git a/advanced/kernel-output/pyproject.toml b/advanced/kernel-output/pyproject.toml index 63a68190..6aa9c052 100644 --- a/advanced/kernel-output/pyproject.toml +++ b/advanced/kernel-output/pyproject.toml @@ -1,3 +1,3 @@ [build-system] -requires = ["jupyter_packaging~=0.7.0", "jupyterlab~=3.0.0b4", "setuptools>=40.8.0", "wheel"] +requires = ["jupyter_packaging~=0.7.0", "jupyterlab>=3.0.0b6,==3.*", "setuptools>=40.8.0", "wheel"] build-backend = "setuptools.build_meta" diff --git a/advanced/kernel-output/setup.py b/advanced/kernel-output/setup.py index 7d3b884e..ca06d0e3 100644 --- a/advanced/kernel-output/setup.py +++ b/advanced/kernel-output/setup.py @@ -43,7 +43,7 @@ ) cmdclass["jsdeps"] = combine_commands( - install_npm(HERE, build_cmd="build:all", npm=["jlpm"]), + install_npm(HERE, build_cmd="build", npm=["jlpm"]), ensure_targets(jstargets), ) @@ -61,7 +61,7 @@ cmdclass= cmdclass, packages=setuptools.find_packages(), install_requires=[ - "jupyterlab~=3.0.0b4", + "jupyterlab>=3.0.0b6,==3.*", ], zip_safe=False, include_package_data=True, diff --git a/advanced/server-extension/README.md b/advanced/server-extension/README.md index b7d5f0e3..24168fca 100644 --- a/advanced/server-extension/README.md +++ b/advanced/server-extension/README.md @@ -541,7 +541,7 @@ cmdclass = create_cmdclass("jsdeps", ) cmdclass["jsdeps"] = combine_commands( - install_npm(HERE, build_cmd="build:all", npm=["jlpm"]), + install_npm(HERE, build_cmd="build", npm=["jlpm"]), ensure_targets(jstargets), ) @@ -559,7 +559,7 @@ setup_args = dict( cmdclass= cmdclass, packages=setuptools.find_packages(), install_requires=[ - "jupyterlab~=3.0.0b4", + "jupyterlab>=3.0.0b6,==3.*", ], zip_safe=False, include_package_data=True, @@ -598,7 +598,7 @@ cmdclass = create_cmdclass("jsdeps", ) cmdclass["jsdeps"] = combine_commands( - install_npm(HERE, build_cmd="build:all", npm=["jlpm"]), + install_npm(HERE, build_cmd="build", npm=["jlpm"]), ensure_targets(jstargets), ) ``` @@ -608,7 +608,7 @@ Basically it will build the frontend NPM package: ```py # setup.py#L48-L48 -install_npm(HERE, build_cmd="build:all", npm=["jlpm"]), +install_npm(HERE, build_cmd="build", npm=["jlpm"]), ``` It will ensure one of the generated JS files is `lib/jlabextexample.js`: @@ -665,6 +665,7 @@ file: ```json5 // package.json#L68-L78 +], "jupyterlab": { "discovery": { "server": { @@ -675,7 +676,6 @@ file: "name": "jlab_ext_example" } } - }, ``` In this example, the extension requires a `server` extension: @@ -683,7 +683,7 @@ In this example, the extension requires a `server` extension: ```json5 // package.json#L70-L70 -"server": { +"discovery": { ``` And that server extension is available through `pip`: @@ -691,9 +691,9 @@ And that server extension is available through `pip`: ```json5 // package.json#L71-L73 -"managers": [ - "pip" -], +"server": { + "managers": [ + "pip" ``` For more information on the `discovery` metadata, please refer to the [documentation](https://jupyterlab.readthedocs.io/en/stable/developer/extension_dev.html#ext-author-companion-packages). diff --git a/advanced/server-extension/package.json b/advanced/server-extension/package.json index 57fee635..7b61b4d3 100644 --- a/advanced/server-extension/package.json +++ b/advanced/server-extension/package.json @@ -25,9 +25,10 @@ "url": "https://github.com/jupyterlab/extension-examples.git" }, "scripts": { - "build": "jlpm run build:lib", + "build": "jlpm run build:lib && jlpm run build:labextension", "build:all": "jlpm run build:lib && jlpm run build:labextension", "build:labextension": "jupyter labextension build .", + "build:labextension:dev": "jupyter labextension build --development True .", "build:lib": "tsc", "clean": "jlpm run clean:lib", "clean:all": "jlpm run clean:lib && jlpm run clean:labextension", @@ -42,13 +43,13 @@ "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "~3.0.0-beta.4", - "@jupyterlab/coreutils": "~5.0.0-beta.4", - "@jupyterlab/launcher": "~3.0.0-beta.4", - "@jupyterlab/services": "~6.0.0-beta.4" + "@jupyterlab/application": "~3.0.0-beta.6", + "@jupyterlab/coreutils": "~5.0.0-beta.6", + "@jupyterlab/launcher": "~3.0.0-beta.6", + "@jupyterlab/services": "~6.0.0-beta.6" }, "devDependencies": { - "@jupyterlab/builder": "^3.0.0-beta.4", + "@jupyterlab/builder": "^3.0.0-beta.6", "@typescript-eslint/eslint-plugin": "^2.27.0", "@typescript-eslint/parser": "^2.27.0", "eslint": "^7.5.0", diff --git a/advanced/server-extension/pyproject.toml b/advanced/server-extension/pyproject.toml index 63a68190..6aa9c052 100644 --- a/advanced/server-extension/pyproject.toml +++ b/advanced/server-extension/pyproject.toml @@ -1,3 +1,3 @@ [build-system] -requires = ["jupyter_packaging~=0.7.0", "jupyterlab~=3.0.0b4", "setuptools>=40.8.0", "wheel"] +requires = ["jupyter_packaging~=0.7.0", "jupyterlab>=3.0.0b6,==3.*", "setuptools>=40.8.0", "wheel"] build-backend = "setuptools.build_meta" diff --git a/advanced/server-extension/setup.py b/advanced/server-extension/setup.py index 09eb1339..2f6958f9 100644 --- a/advanced/server-extension/setup.py +++ b/advanced/server-extension/setup.py @@ -45,7 +45,7 @@ ) cmdclass["jsdeps"] = combine_commands( - install_npm(HERE, build_cmd="build:all", npm=["jlpm"]), + install_npm(HERE, build_cmd="build", npm=["jlpm"]), ensure_targets(jstargets), ) @@ -63,7 +63,7 @@ cmdclass= cmdclass, packages=setuptools.find_packages(), install_requires=[ - "jupyterlab~=3.0.0b4", + "jupyterlab>=3.0.0b6,==3.*", ], zip_safe=False, include_package_data=True, diff --git a/basics/datagrid/package.json b/basics/datagrid/package.json index 7094236f..e6a7000d 100644 --- a/basics/datagrid/package.json +++ b/basics/datagrid/package.json @@ -25,9 +25,10 @@ "url": "https://github.com/jupyterlab/extension-examples.git" }, "scripts": { - "build": "jlpm run build:lib", + "build": "jlpm run build:lib && jlpm run build:labextension", "build:all": "jlpm run build:lib && jlpm run build:labextension", "build:labextension": "jupyter labextension build .", + "build:labextension:dev": "jupyter labextension build --development True .", "build:lib": "tsc", "clean": "jlpm run clean:lib", "clean:all": "jlpm run clean:lib && jlpm run clean:labextension", @@ -42,16 +43,16 @@ "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "~3.0.0-beta.4", - "@jupyterlab/mainmenu": "~3.0.0-beta.4", - "@jupyterlab/translation": "^3.0.0-beta.4", + "@jupyterlab/application": "~3.0.0-beta.6", + "@jupyterlab/mainmenu": "~3.0.0-beta.6", + "@jupyterlab/translation": "~3.0.0-beta.6", "@lumino/algorithm": "^1.3.3", "@lumino/coreutils": "^1.5.3", "@lumino/datagrid": "^0.5.2", "@lumino/disposable": "^1.4.3" }, "devDependencies": { - "@jupyterlab/builder": "^3.0.0-beta.4", + "@jupyterlab/builder": "^3.0.0-beta.6", "@typescript-eslint/eslint-plugin": "^2.27.0", "@typescript-eslint/parser": "^2.27.0", "eslint": "^7.5.0", diff --git a/basics/datagrid/pyproject.toml b/basics/datagrid/pyproject.toml index 63a68190..6aa9c052 100644 --- a/basics/datagrid/pyproject.toml +++ b/basics/datagrid/pyproject.toml @@ -1,3 +1,3 @@ [build-system] -requires = ["jupyter_packaging~=0.7.0", "jupyterlab~=3.0.0b4", "setuptools>=40.8.0", "wheel"] +requires = ["jupyter_packaging~=0.7.0", "jupyterlab>=3.0.0b6,==3.*", "setuptools>=40.8.0", "wheel"] build-backend = "setuptools.build_meta" diff --git a/basics/datagrid/setup.py b/basics/datagrid/setup.py index 75dd7522..b33eee7b 100644 --- a/basics/datagrid/setup.py +++ b/basics/datagrid/setup.py @@ -43,7 +43,7 @@ ) cmdclass["jsdeps"] = combine_commands( - install_npm(HERE, build_cmd="build:all", npm=["jlpm"]), + install_npm(HERE, build_cmd="build", npm=["jlpm"]), ensure_targets(jstargets), ) @@ -61,7 +61,7 @@ cmdclass= cmdclass, packages=setuptools.find_packages(), install_requires=[ - "jupyterlab~=3.0.0b4", + "jupyterlab>=3.0.0b6,==3.*", ], zip_safe=False, include_package_data=True, diff --git a/basics/hello-world/README.md b/basics/hello-world/README.md index df2ca91a..3d4747a9 100644 --- a/basics/hello-world/README.md +++ b/basics/hello-world/README.md @@ -93,9 +93,9 @@ package is declared in the file `package.json`: ```json5 // package.json#L44-L46 -"dependencies": { - "@jupyterlab/application": "~3.0.0-beta.4" }, +"dependencies": { + "@jupyterlab/application": "~3.0.0-beta.6" ``` With this basic import setup, you can move on to construct a new instance diff --git a/basics/hello-world/package.json b/basics/hello-world/package.json index ef1a25af..a5636724 100644 --- a/basics/hello-world/package.json +++ b/basics/hello-world/package.json @@ -25,9 +25,10 @@ "url": "https://github.com/jupyterlab/extension-examples.git" }, "scripts": { - "build": "jlpm run build:lib", + "build": "jlpm run build:lib && jlpm run build:labextension", "build:all": "jlpm run build:lib && jlpm run build:labextension", "build:labextension": "jupyter labextension build .", + "build:labextension:dev": "jupyter labextension build --development True .", "build:lib": "tsc", "clean": "jlpm run clean:lib", "clean:all": "jlpm run clean:lib && jlpm run clean:labextension", @@ -42,10 +43,10 @@ "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "~3.0.0-beta.4" + "@jupyterlab/application": "~3.0.0-beta.6" }, "devDependencies": { - "@jupyterlab/builder": "^3.0.0-beta.4", + "@jupyterlab/builder": "^3.0.0-beta.6", "@typescript-eslint/eslint-plugin": "^2.27.0", "@typescript-eslint/parser": "^2.27.0", "eslint": "^7.5.0", diff --git a/basics/hello-world/pyproject.toml b/basics/hello-world/pyproject.toml index 63a68190..6aa9c052 100644 --- a/basics/hello-world/pyproject.toml +++ b/basics/hello-world/pyproject.toml @@ -1,3 +1,3 @@ [build-system] -requires = ["jupyter_packaging~=0.7.0", "jupyterlab~=3.0.0b4", "setuptools>=40.8.0", "wheel"] +requires = ["jupyter_packaging~=0.7.0", "jupyterlab>=3.0.0b6,==3.*", "setuptools>=40.8.0", "wheel"] build-backend = "setuptools.build_meta" diff --git a/basics/hello-world/setup.py b/basics/hello-world/setup.py index e60363e1..441c17d9 100644 --- a/basics/hello-world/setup.py +++ b/basics/hello-world/setup.py @@ -43,7 +43,7 @@ ) cmdclass["jsdeps"] = combine_commands( - install_npm(HERE, build_cmd="build:all", npm=["jlpm"]), + install_npm(HERE, build_cmd="build", npm=["jlpm"]), ensure_targets(jstargets), ) @@ -61,7 +61,7 @@ cmdclass= cmdclass, packages=setuptools.find_packages(), install_requires=[ - "jupyterlab~=3.0.0b4", + "jupyterlab>=3.0.0b6,==3.*", ], zip_safe=False, include_package_data=True, diff --git a/basics/signals/package.json b/basics/signals/package.json index 95a556d0..2f161f0c 100644 --- a/basics/signals/package.json +++ b/basics/signals/package.json @@ -25,9 +25,10 @@ "url": "https://github.com/jupyterlab/extension-examples.git" }, "scripts": { - "build": "jlpm run build:lib", + "build": "jlpm run build:lib && jlpm run build:labextension", "build:all": "jlpm run build:lib && jlpm run build:labextension", "build:labextension": "jupyter labextension build .", + "build:labextension:dev": "jupyter labextension build --development True .", "build:lib": "tsc", "clean": "jlpm run clean:lib", "clean:all": "jlpm run clean:lib && jlpm run clean:labextension", @@ -42,17 +43,17 @@ "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "~3.0.0-beta.8", - "@jupyterlab/launcher": "~3.0.0-beta.8", - "@jupyterlab/mainmenu": "~3.0.0-beta.8", - "@jupyterlab/translation": "^3.0.0-beta.8", + "@jupyterlab/application": "~3.0.0-beta.6", + "@jupyterlab/launcher": "~3.0.0-beta.6", + "@jupyterlab/mainmenu": "~3.0.0-beta.6", + "@jupyterlab/translation": "~3.0.0-beta.6", "@lumino/algorithm": "^1.3.3", "@lumino/coreutils": "^1.5.3", "@lumino/datagrid": "^0.3.1", "@lumino/disposable": "^1.4.3" }, "devDependencies": { - "@jupyterlab/builder": "^3.0.0-beta.4", + "@jupyterlab/builder": "^3.0.0-beta.6", "@typescript-eslint/eslint-plugin": "^2.27.0", "@typescript-eslint/parser": "^2.27.0", "eslint": "^7.5.0", @@ -72,4 +73,4 @@ "extension": true, "outputDir": "jupyterlab_examples_signals/static" } -} +} \ No newline at end of file diff --git a/basics/signals/pyproject.toml b/basics/signals/pyproject.toml index 63a68190..6aa9c052 100644 --- a/basics/signals/pyproject.toml +++ b/basics/signals/pyproject.toml @@ -1,3 +1,3 @@ [build-system] -requires = ["jupyter_packaging~=0.7.0", "jupyterlab~=3.0.0b4", "setuptools>=40.8.0", "wheel"] +requires = ["jupyter_packaging~=0.7.0", "jupyterlab>=3.0.0b6,==3.*", "setuptools>=40.8.0", "wheel"] build-backend = "setuptools.build_meta" diff --git a/basics/signals/setup.py b/basics/signals/setup.py index c2c69f5e..1eb9b6a6 100644 --- a/basics/signals/setup.py +++ b/basics/signals/setup.py @@ -43,7 +43,7 @@ ) cmdclass["jsdeps"] = combine_commands( - install_npm(HERE, build_cmd="build:all", npm=["jlpm"]), + install_npm(HERE, build_cmd="build", npm=["jlpm"]), ensure_targets(jstargets), ) @@ -61,7 +61,7 @@ cmdclass= cmdclass, packages=setuptools.find_packages(), install_requires=[ - "jupyterlab~=3.0.0b4", + "jupyterlab>=3.0.0b6,==3.*", ], zip_safe=False, include_package_data=True, diff --git a/command-palette/package.json b/command-palette/package.json index 31a98aa9..57b7eb2e 100644 --- a/command-palette/package.json +++ b/command-palette/package.json @@ -25,9 +25,10 @@ "url": "https://github.com/jupyterlab/extension-examples.git" }, "scripts": { - "build": "jlpm run build:lib", + "build": "jlpm run build:lib && jlpm run build:labextension", "build:all": "jlpm run build:lib && jlpm run build:labextension", "build:labextension": "jupyter labextension build .", + "build:labextension:dev": "jupyter labextension build --development True .", "build:lib": "tsc", "clean": "jlpm run clean:lib", "clean:all": "jlpm run clean:lib && jlpm run clean:labextension", @@ -42,10 +43,10 @@ "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "~3.0.0-beta.4" + "@jupyterlab/application": "~3.0.0-beta.6" }, "devDependencies": { - "@jupyterlab/builder": "^3.0.0-beta.4", + "@jupyterlab/builder": "^3.0.0-beta.6", "@typescript-eslint/eslint-plugin": "^2.27.0", "@typescript-eslint/parser": "^2.27.0", "eslint": "^7.5.0", diff --git a/command-palette/pyproject.toml b/command-palette/pyproject.toml index 63a68190..6aa9c052 100644 --- a/command-palette/pyproject.toml +++ b/command-palette/pyproject.toml @@ -1,3 +1,3 @@ [build-system] -requires = ["jupyter_packaging~=0.7.0", "jupyterlab~=3.0.0b4", "setuptools>=40.8.0", "wheel"] +requires = ["jupyter_packaging~=0.7.0", "jupyterlab>=3.0.0b6,==3.*", "setuptools>=40.8.0", "wheel"] build-backend = "setuptools.build_meta" diff --git a/command-palette/setup.py b/command-palette/setup.py index 22df5427..dc9d4fa5 100644 --- a/command-palette/setup.py +++ b/command-palette/setup.py @@ -43,7 +43,7 @@ ) cmdclass["jsdeps"] = combine_commands( - install_npm(HERE, build_cmd="build:all", npm=["jlpm"]), + install_npm(HERE, build_cmd="build", npm=["jlpm"]), ensure_targets(jstargets), ) @@ -61,7 +61,7 @@ cmdclass= cmdclass, packages=setuptools.find_packages(), install_requires=[ - "jupyterlab~=3.0.0b4", + "jupyterlab>=3.0.0b6,==3.*", ], zip_safe=False, include_package_data=True, diff --git a/commands/package.json b/commands/package.json index b0c611ed..13347fa6 100644 --- a/commands/package.json +++ b/commands/package.json @@ -25,9 +25,10 @@ "url": "https://github.com/jupyterlab/extension-examples.git" }, "scripts": { - "build": "jlpm run build:lib", + "build": "jlpm run build:lib && jlpm run build:labextension", "build:all": "jlpm run build:lib && jlpm run build:labextension", "build:labextension": "jupyter labextension build .", + "build:labextension:dev": "jupyter labextension build --development True .", "build:lib": "tsc", "clean": "jlpm run clean:lib", "clean:all": "jlpm run clean:lib && jlpm run clean:labextension", @@ -42,10 +43,10 @@ "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "~3.0.0-beta.4" + "@jupyterlab/application": "~3.0.0-beta.6" }, "devDependencies": { - "@jupyterlab/builder": "^3.0.0-beta.4", + "@jupyterlab/builder": "^3.0.0-beta.6", "@typescript-eslint/eslint-plugin": "^2.27.0", "@typescript-eslint/parser": "^2.27.0", "eslint": "^7.5.0", diff --git a/commands/pyproject.toml b/commands/pyproject.toml index 63a68190..6aa9c052 100644 --- a/commands/pyproject.toml +++ b/commands/pyproject.toml @@ -1,3 +1,3 @@ [build-system] -requires = ["jupyter_packaging~=0.7.0", "jupyterlab~=3.0.0b4", "setuptools>=40.8.0", "wheel"] +requires = ["jupyter_packaging~=0.7.0", "jupyterlab>=3.0.0b6,==3.*", "setuptools>=40.8.0", "wheel"] build-backend = "setuptools.build_meta" diff --git a/commands/setup.py b/commands/setup.py index dcd196c8..15d9529a 100644 --- a/commands/setup.py +++ b/commands/setup.py @@ -43,7 +43,7 @@ ) cmdclass["jsdeps"] = combine_commands( - install_npm(HERE, build_cmd="build:all", npm=["jlpm"]), + install_npm(HERE, build_cmd="build", npm=["jlpm"]), ensure_targets(jstargets), ) @@ -61,7 +61,7 @@ cmdclass= cmdclass, packages=setuptools.find_packages(), install_requires=[ - "jupyterlab~=3.0.0b4", + "jupyterlab>=3.0.0b6,==3.*", ], zip_safe=False, include_package_data=True, diff --git a/context-menu/package.json b/context-menu/package.json index b3d05e9d..40bdca79 100644 --- a/context-menu/package.json +++ b/context-menu/package.json @@ -25,9 +25,10 @@ "url": "https://github.com/jupyterlab/extension-examples.git" }, "scripts": { - "build": "jlpm run build:lib", + "build": "jlpm run build:lib && jlpm run build:labextension", "build:all": "jlpm run build:lib && jlpm run build:labextension", "build:labextension": "jupyter labextension build .", + "build:labextension:dev": "jupyter labextension build --development True .", "build:lib": "tsc", "clean": "jlpm run clean:lib", "clean:all": "jlpm run clean:lib && jlpm run clean:labextension", @@ -42,13 +43,13 @@ "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "~3.0.0-beta.4", - "@jupyterlab/apputils": "~3.0.0-beta.4", - "@jupyterlab/filebrowser": "~3.0.0-beta.4", - "@jupyterlab/ui-components": "~3.0.0-beta.4" + "@jupyterlab/application": "~3.0.0-beta.6", + "@jupyterlab/apputils": "~3.0.0-beta.6", + "@jupyterlab/filebrowser": "~3.0.0-beta.6", + "@jupyterlab/ui-components": "~3.0.0-beta.6" }, "devDependencies": { - "@jupyterlab/builder": "^3.0.0-beta.4", + "@jupyterlab/builder": "^3.0.0-beta.6", "@typescript-eslint/eslint-plugin": "^2.27.0", "@typescript-eslint/parser": "^2.27.0", "eslint": "^7.5.0", diff --git a/context-menu/pyproject.toml b/context-menu/pyproject.toml index 63a68190..6aa9c052 100644 --- a/context-menu/pyproject.toml +++ b/context-menu/pyproject.toml @@ -1,3 +1,3 @@ [build-system] -requires = ["jupyter_packaging~=0.7.0", "jupyterlab~=3.0.0b4", "setuptools>=40.8.0", "wheel"] +requires = ["jupyter_packaging~=0.7.0", "jupyterlab>=3.0.0b6,==3.*", "setuptools>=40.8.0", "wheel"] build-backend = "setuptools.build_meta" diff --git a/context-menu/setup.py b/context-menu/setup.py index 5aec8143..15280fbf 100644 --- a/context-menu/setup.py +++ b/context-menu/setup.py @@ -43,7 +43,7 @@ ) cmdclass["jsdeps"] = combine_commands( - install_npm(HERE, build_cmd="build:all", npm=["jlpm"]), + install_npm(HERE, build_cmd="build", npm=["jlpm"]), ensure_targets(jstargets), ) @@ -61,7 +61,7 @@ cmdclass= cmdclass, packages=setuptools.find_packages(), install_requires=[ - "jupyterlab~=3.0.0b4", + "jupyterlab>=3.0.0b6,==3.*", ], zip_safe=False, include_package_data=True, diff --git a/launcher/package.json b/launcher/package.json index e914d1c0..88c99cfb 100644 --- a/launcher/package.json +++ b/launcher/package.json @@ -25,9 +25,10 @@ "url": "https://github.com/jupyterlab/extension-examples.git" }, "scripts": { - "build": "jlpm run build:lib", + "build": "jlpm run build:lib && jlpm run build:labextension", "build:all": "jlpm run build:lib && jlpm run build:labextension", "build:labextension": "jupyter labextension build .", + "build:labextension:dev": "jupyter labextension build --development True .", "build:lib": "tsc", "clean": "jlpm run clean:lib", "clean:all": "jlpm run clean:lib && jlpm run clean:labextension", @@ -42,13 +43,13 @@ "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "~3.0.0-beta.4", - "@jupyterlab/filebrowser": "~3.0.0-beta.4", - "@jupyterlab/launcher": "~3.0.0-beta.4", - "@jupyterlab/mainmenu": "~3.0.0-beta.4" + "@jupyterlab/application": "~3.0.0-beta.6", + "@jupyterlab/filebrowser": "~3.0.0-beta.6", + "@jupyterlab/launcher": "~3.0.0-beta.6", + "@jupyterlab/mainmenu": "~3.0.0-beta.6" }, "devDependencies": { - "@jupyterlab/builder": "^3.0.0-beta.4", + "@jupyterlab/builder": "^3.0.0-beta.6", "@typescript-eslint/eslint-plugin": "^2.27.0", "@typescript-eslint/parser": "^2.27.0", "eslint": "^7.5.0", diff --git a/launcher/pyproject.toml b/launcher/pyproject.toml index 63a68190..6aa9c052 100644 --- a/launcher/pyproject.toml +++ b/launcher/pyproject.toml @@ -1,3 +1,3 @@ [build-system] -requires = ["jupyter_packaging~=0.7.0", "jupyterlab~=3.0.0b4", "setuptools>=40.8.0", "wheel"] +requires = ["jupyter_packaging~=0.7.0", "jupyterlab>=3.0.0b6,==3.*", "setuptools>=40.8.0", "wheel"] build-backend = "setuptools.build_meta" diff --git a/launcher/setup.py b/launcher/setup.py index 4530d029..5f0cf598 100644 --- a/launcher/setup.py +++ b/launcher/setup.py @@ -43,7 +43,7 @@ ) cmdclass["jsdeps"] = combine_commands( - install_npm(HERE, build_cmd="build:all", npm=["jlpm"]), + install_npm(HERE, build_cmd="build", npm=["jlpm"]), ensure_targets(jstargets), ) @@ -61,7 +61,7 @@ cmdclass= cmdclass, packages=setuptools.find_packages(), install_requires=[ - "jupyterlab~=3.0.0b4", + "jupyterlab>=3.0.0b6,==3.*", ], zip_safe=False, include_package_data=True, diff --git a/log-console/custom-log-console/package.json b/log-console/custom-log-console/package.json index 27c86c70..c52df2ce 100644 --- a/log-console/custom-log-console/package.json +++ b/log-console/custom-log-console/package.json @@ -25,9 +25,10 @@ "url": "https://github.com/jupyterlab/extension-examples.git" }, "scripts": { - "build": "jlpm run build:lib", + "build": "jlpm run build:lib && jlpm run build:labextension", "build:all": "jlpm run build:lib && jlpm run build:labextension", "build:labextension": "jupyter labextension build .", + "build:labextension:dev": "jupyter labextension build --development True .", "build:lib": "tsc", "clean": "jlpm run clean:lib", "clean:all": "jlpm run clean:lib && jlpm run clean:labextension", @@ -42,19 +43,19 @@ "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "~3.0.0-beta.4", - "@jupyterlab/apputils": "~3.0.0-beta.4", - "@jupyterlab/coreutils": "~5.0.0-beta.4", - "@jupyterlab/logconsole": "~3.0.0-beta.4", - "@jupyterlab/mainmenu": "~3.0.0-beta.4", - "@jupyterlab/nbformat": "~3.0.0-beta.4", - "@jupyterlab/rendermime": "~3.0.0-beta.4", - "@jupyterlab/ui-components": "~3.0.0-beta.4", + "@jupyterlab/application": "~3.0.0-beta.6", + "@jupyterlab/apputils": "~3.0.0-beta.6", + "@jupyterlab/coreutils": "~5.0.0-beta.6", + "@jupyterlab/logconsole": "~3.0.0-beta.6", + "@jupyterlab/mainmenu": "~3.0.0-beta.6", + "@jupyterlab/nbformat": "~3.0.0-beta.6", + "@jupyterlab/rendermime": "~3.0.0-beta.6", + "@jupyterlab/ui-components": "~3.0.0-beta.6", "@lumino/coreutils": "^1.5.3", "@lumino/widgets": "^1.14.0" }, "devDependencies": { - "@jupyterlab/builder": "^3.0.0-beta.4", + "@jupyterlab/builder": "^3.0.0-beta.6", "@typescript-eslint/eslint-plugin": "^2.27.0", "@typescript-eslint/parser": "^2.27.0", "eslint": "^7.5.0", diff --git a/log-console/custom-log-console/pyproject.toml b/log-console/custom-log-console/pyproject.toml index 63a68190..6aa9c052 100644 --- a/log-console/custom-log-console/pyproject.toml +++ b/log-console/custom-log-console/pyproject.toml @@ -1,3 +1,3 @@ [build-system] -requires = ["jupyter_packaging~=0.7.0", "jupyterlab~=3.0.0b4", "setuptools>=40.8.0", "wheel"] +requires = ["jupyter_packaging~=0.7.0", "jupyterlab>=3.0.0b6,==3.*", "setuptools>=40.8.0", "wheel"] build-backend = "setuptools.build_meta" diff --git a/log-console/custom-log-console/setup.py b/log-console/custom-log-console/setup.py index 25e9cfef..e5e24282 100644 --- a/log-console/custom-log-console/setup.py +++ b/log-console/custom-log-console/setup.py @@ -43,7 +43,7 @@ ) cmdclass["jsdeps"] = combine_commands( - install_npm(HERE, build_cmd="build:all", npm=["jlpm"]), + install_npm(HERE, build_cmd="build", npm=["jlpm"]), ensure_targets(jstargets), ) @@ -61,7 +61,7 @@ cmdclass= cmdclass, packages=setuptools.find_packages(), install_requires=[ - "jupyterlab~=3.0.0b4", + "jupyterlab>=3.0.0b6,==3.*", ], zip_safe=False, include_package_data=True, diff --git a/log-console/log-messages/package.json b/log-console/log-messages/package.json index 666358dd..86b5c8cf 100644 --- a/log-console/log-messages/package.json +++ b/log-console/log-messages/package.json @@ -25,9 +25,10 @@ "url": "https://github.com/jupyterlab/extension-examples.git" }, "scripts": { - "build": "jlpm run build:lib", + "build": "jlpm run build:lib && jlpm run build:labextension", "build:all": "jlpm run build:lib && jlpm run build:labextension", "build:labextension": "jupyter labextension build .", + "build:labextension:dev": "jupyter labextension build --development True .", "build:lib": "tsc", "clean": "jlpm run clean:lib", "clean:all": "jlpm run clean:lib && jlpm run clean:labextension", @@ -42,20 +43,20 @@ "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "~3.0.0-beta.4", - "@jupyterlab/apputils": "~3.0.0-beta.4", - "@jupyterlab/coreutils": "~5.0.0-beta.4", - "@jupyterlab/logconsole": "~3.0.0-beta.4", - "@jupyterlab/mainmenu": "~3.0.0-beta.4", - "@jupyterlab/nbformat": "~3.0.0-beta.4", - "@jupyterlab/notebook": "~3.0.0-beta.4", - "@jupyterlab/rendermime": "~3.0.0-beta.4", - "@jupyterlab/ui-components": "~3.0.0-beta.4", + "@jupyterlab/application": "~3.0.0-beta.6", + "@jupyterlab/apputils": "~3.0.0-beta.6", + "@jupyterlab/coreutils": "~5.0.0-beta.6", + "@jupyterlab/logconsole": "~3.0.0-beta.6", + "@jupyterlab/mainmenu": "~3.0.0-beta.6", + "@jupyterlab/nbformat": "~3.0.0-beta.6", + "@jupyterlab/notebook": "~3.0.0-beta.6", + "@jupyterlab/rendermime": "~3.0.0-beta.6", + "@jupyterlab/ui-components": "~3.0.0-beta.6", "@lumino/coreutils": "^1.5.3", "@lumino/widgets": "^1.14.0" }, "devDependencies": { - "@jupyterlab/builder": "^3.0.0-beta.4", + "@jupyterlab/builder": "^3.0.0-beta.6", "@typescript-eslint/eslint-plugin": "^2.27.0", "@typescript-eslint/parser": "^2.27.0", "eslint": "^7.5.0", diff --git a/log-console/log-messages/pyproject.toml b/log-console/log-messages/pyproject.toml index 63a68190..6aa9c052 100644 --- a/log-console/log-messages/pyproject.toml +++ b/log-console/log-messages/pyproject.toml @@ -1,3 +1,3 @@ [build-system] -requires = ["jupyter_packaging~=0.7.0", "jupyterlab~=3.0.0b4", "setuptools>=40.8.0", "wheel"] +requires = ["jupyter_packaging~=0.7.0", "jupyterlab>=3.0.0b6,==3.*", "setuptools>=40.8.0", "wheel"] build-backend = "setuptools.build_meta" diff --git a/log-console/log-messages/setup.py b/log-console/log-messages/setup.py index 3d63b80b..d2376009 100644 --- a/log-console/log-messages/setup.py +++ b/log-console/log-messages/setup.py @@ -43,7 +43,7 @@ ) cmdclass["jsdeps"] = combine_commands( - install_npm(HERE, build_cmd="build:all", npm=["jlpm"]), + install_npm(HERE, build_cmd="build", npm=["jlpm"]), ensure_targets(jstargets), ) @@ -61,7 +61,7 @@ cmdclass= cmdclass, packages=setuptools.find_packages(), install_requires=[ - "jupyterlab~=3.0.0b4", + "jupyterlab>=3.0.0b6,==3.*", ], zip_safe=False, include_package_data=True, diff --git a/main-menu/README.md b/main-menu/README.md index cbf005c1..44e9d82f 100644 --- a/main-menu/README.md +++ b/main-menu/README.md @@ -87,11 +87,11 @@ After the execution of that command, `package.json` should list them in the ```json5 // package.json#L44-L48 +}, "dependencies": { - "@jupyterlab/application": "~3.0.0-beta.4", - "@jupyterlab/mainmenu": "~3.0.0-beta.4", + "@jupyterlab/application": "~3.0.0-beta.6", + "@jupyterlab/mainmenu": "~3.0.0-beta.6", "@lumino/widgets": "^1.14.0" -}, ``` With this extension installed, a new menu _Main Menu Example_ should be present. And when diff --git a/main-menu/package.json b/main-menu/package.json index 94dbfff6..2586af32 100644 --- a/main-menu/package.json +++ b/main-menu/package.json @@ -25,9 +25,10 @@ "url": "https://github.com/jupyterlab/extension-examples.git" }, "scripts": { - "build": "jlpm run build:lib", + "build": "jlpm run build:lib && jlpm run build:labextension", "build:all": "jlpm run build:lib && jlpm run build:labextension", "build:labextension": "jupyter labextension build .", + "build:labextension:dev": "jupyter labextension build --development True .", "build:lib": "tsc", "clean": "jlpm run clean:lib", "clean:all": "jlpm run clean:lib && jlpm run clean:labextension", @@ -42,12 +43,12 @@ "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "~3.0.0-beta.4", - "@jupyterlab/mainmenu": "~3.0.0-beta.4", + "@jupyterlab/application": "~3.0.0-beta.6", + "@jupyterlab/mainmenu": "~3.0.0-beta.6", "@lumino/widgets": "^1.14.0" }, "devDependencies": { - "@jupyterlab/builder": "^3.0.0-beta.4", + "@jupyterlab/builder": "^3.0.0-beta.6", "@typescript-eslint/eslint-plugin": "^2.27.0", "@typescript-eslint/parser": "^2.27.0", "eslint": "^7.5.0", diff --git a/main-menu/pyproject.toml b/main-menu/pyproject.toml index 63a68190..6aa9c052 100644 --- a/main-menu/pyproject.toml +++ b/main-menu/pyproject.toml @@ -1,3 +1,3 @@ [build-system] -requires = ["jupyter_packaging~=0.7.0", "jupyterlab~=3.0.0b4", "setuptools>=40.8.0", "wheel"] +requires = ["jupyter_packaging~=0.7.0", "jupyterlab>=3.0.0b6,==3.*", "setuptools>=40.8.0", "wheel"] build-backend = "setuptools.build_meta" diff --git a/main-menu/setup.py b/main-menu/setup.py index 4c325db1..1df3b569 100644 --- a/main-menu/setup.py +++ b/main-menu/setup.py @@ -43,7 +43,7 @@ ) cmdclass["jsdeps"] = combine_commands( - install_npm(HERE, build_cmd="build:all", npm=["jlpm"]), + install_npm(HERE, build_cmd="build", npm=["jlpm"]), ensure_targets(jstargets), ) @@ -61,7 +61,7 @@ cmdclass= cmdclass, packages=setuptools.find_packages(), install_requires=[ - "jupyterlab~=3.0.0b4", + "jupyterlab>=3.0.0b6,==3.*", ], zip_safe=False, include_package_data=True, diff --git a/react/react-widget/package.json b/react/react-widget/package.json index 2e381233..0157644d 100644 --- a/react/react-widget/package.json +++ b/react/react-widget/package.json @@ -25,9 +25,10 @@ "url": "https://github.com/jupyterlab/extension-examples.git" }, "scripts": { - "build": "jlpm run build:lib", + "build": "jlpm run build:lib && jlpm run build:labextension", "build:all": "jlpm run build:lib && jlpm run build:labextension", "build:labextension": "jupyter labextension build .", + "build:labextension:dev": "jupyter labextension build --development True .", "build:lib": "tsc", "clean": "jlpm run clean:lib", "clean:all": "jlpm run clean:lib && jlpm run clean:labextension", @@ -42,12 +43,12 @@ "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "~3.0.0-beta.4", - "@jupyterlab/launcher": "~3.0.0-beta.4", - "@jupyterlab/ui-components": "~3.0.0-beta.4" + "@jupyterlab/application": "~3.0.0-beta.6", + "@jupyterlab/launcher": "~3.0.0-beta.6", + "@jupyterlab/ui-components": "~3.0.0-beta.6" }, "devDependencies": { - "@jupyterlab/builder": "^3.0.0-beta.4", + "@jupyterlab/builder": "^3.0.0-beta.6", "@typescript-eslint/eslint-plugin": "^2.27.0", "@typescript-eslint/parser": "^2.27.0", "eslint": "^7.5.0", diff --git a/react/react-widget/pyproject.toml b/react/react-widget/pyproject.toml index 63a68190..6aa9c052 100644 --- a/react/react-widget/pyproject.toml +++ b/react/react-widget/pyproject.toml @@ -1,3 +1,3 @@ [build-system] -requires = ["jupyter_packaging~=0.7.0", "jupyterlab~=3.0.0b4", "setuptools>=40.8.0", "wheel"] +requires = ["jupyter_packaging~=0.7.0", "jupyterlab>=3.0.0b6,==3.*", "setuptools>=40.8.0", "wheel"] build-backend = "setuptools.build_meta" diff --git a/react/react-widget/setup.py b/react/react-widget/setup.py index 74ae2915..26bba2d2 100644 --- a/react/react-widget/setup.py +++ b/react/react-widget/setup.py @@ -43,7 +43,7 @@ ) cmdclass["jsdeps"] = combine_commands( - install_npm(HERE, build_cmd="build:all", npm=["jlpm"]), + install_npm(HERE, build_cmd="build", npm=["jlpm"]), ensure_targets(jstargets), ) @@ -61,7 +61,7 @@ cmdclass= cmdclass, packages=setuptools.find_packages(), install_requires=[ - "jupyterlab~=3.0.0b4", + "jupyterlab>=3.0.0b6,==3.*", ], zip_safe=False, include_package_data=True, diff --git a/settings/README.md b/settings/README.md index d4fa19b2..b0b27dbc 100644 --- a/settings/README.md +++ b/settings/README.md @@ -111,9 +111,9 @@ the `package.json` file in the `jupyterlab` section (here `schema`): ```json5 // package.json#L68-L70 +], "jupyterlab": { "extension": true, - "schemaDir": "schema", ``` diff --git a/settings/package.json b/settings/package.json index a7ff6be8..be8185b9 100644 --- a/settings/package.json +++ b/settings/package.json @@ -26,9 +26,10 @@ "url": "https://github.com/jupyterlab/extension-examples.git" }, "scripts": { - "build": "jlpm run build:lib", + "build": "jlpm run build:lib && jlpm run build:labextension", "build:all": "jlpm run build:lib && jlpm run build:labextension", "build:labextension": "jupyter labextension build .", + "build:labextension:dev": "jupyter labextension build --development True .", "build:lib": "tsc", "clean": "jlpm run clean:lib", "clean:all": "jlpm run clean:lib && jlpm run clean:labextension", @@ -43,13 +44,13 @@ "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "~3.0.0-beta.4", - "@jupyterlab/mainmenu": "~3.0.0-beta.4", - "@jupyterlab/settingregistry": "~3.0.0-beta.4", + "@jupyterlab/application": "~3.0.0-beta.6", + "@jupyterlab/mainmenu": "~3.0.0-beta.6", + "@jupyterlab/settingregistry": "~3.0.0-beta.6", "@lumino/widgets": "^1.14.0" }, "devDependencies": { - "@jupyterlab/builder": "^3.0.0-beta.4", + "@jupyterlab/builder": "^3.0.0-beta.6", "@typescript-eslint/eslint-plugin": "^2.27.0", "@typescript-eslint/parser": "^2.27.0", "eslint": "^7.5.0", diff --git a/settings/pyproject.toml b/settings/pyproject.toml index 63a68190..6aa9c052 100644 --- a/settings/pyproject.toml +++ b/settings/pyproject.toml @@ -1,3 +1,3 @@ [build-system] -requires = ["jupyter_packaging~=0.7.0", "jupyterlab~=3.0.0b4", "setuptools>=40.8.0", "wheel"] +requires = ["jupyter_packaging~=0.7.0", "jupyterlab>=3.0.0b6,==3.*", "setuptools>=40.8.0", "wheel"] build-backend = "setuptools.build_meta" diff --git a/settings/setup.py b/settings/setup.py index adc60f60..dfbdaebf 100644 --- a/settings/setup.py +++ b/settings/setup.py @@ -43,7 +43,7 @@ ) cmdclass["jsdeps"] = combine_commands( - install_npm(HERE, build_cmd="build:all", npm=["jlpm"]), + install_npm(HERE, build_cmd="build", npm=["jlpm"]), ensure_targets(jstargets), ) @@ -61,7 +61,7 @@ cmdclass= cmdclass, packages=setuptools.find_packages(), install_requires=[ - "jupyterlab~=3.0.0b4", + "jupyterlab>=3.0.0b6,==3.*", ], zip_safe=False, include_package_data=True, diff --git a/state/package.json b/state/package.json index 31a1fcfb..a8b4cd33 100644 --- a/state/package.json +++ b/state/package.json @@ -25,9 +25,10 @@ "url": "https://github.com/jupyterlab/extension-examples.git" }, "scripts": { - "build": "jlpm run build:lib", + "build": "jlpm run build:lib && jlpm run build:labextension", "build:all": "jlpm run build:lib && jlpm run build:labextension", "build:labextension": "jupyter labextension build .", + "build:labextension:dev": "jupyter labextension build --development True .", "build:lib": "tsc", "clean": "jlpm run clean:lib", "clean:all": "jlpm run clean:lib && jlpm run clean:labextension", @@ -42,13 +43,13 @@ "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "~3.0.0-beta.4", - "@jupyterlab/apputils": "~3.0.0-beta.4", - "@jupyterlab/statedb": "~3.0.0-beta.4", + "@jupyterlab/application": "~3.0.0-beta.6", + "@jupyterlab/apputils": "~3.0.0-beta.6", + "@jupyterlab/statedb": "~3.0.0-beta.6", "@lumino/coreutils": "^1.5.3" }, "devDependencies": { - "@jupyterlab/builder": "^3.0.0-beta.4", + "@jupyterlab/builder": "^3.0.0-beta.6", "@typescript-eslint/eslint-plugin": "^2.27.0", "@typescript-eslint/parser": "^2.27.0", "eslint": "^7.5.0", diff --git a/state/pyproject.toml b/state/pyproject.toml index 63a68190..6aa9c052 100644 --- a/state/pyproject.toml +++ b/state/pyproject.toml @@ -1,3 +1,3 @@ [build-system] -requires = ["jupyter_packaging~=0.7.0", "jupyterlab~=3.0.0b4", "setuptools>=40.8.0", "wheel"] +requires = ["jupyter_packaging~=0.7.0", "jupyterlab>=3.0.0b6,==3.*", "setuptools>=40.8.0", "wheel"] build-backend = "setuptools.build_meta" diff --git a/state/setup.py b/state/setup.py index 73371eb4..dcbab42d 100644 --- a/state/setup.py +++ b/state/setup.py @@ -43,7 +43,7 @@ ) cmdclass["jsdeps"] = combine_commands( - install_npm(HERE, build_cmd="build:all", npm=["jlpm"]), + install_npm(HERE, build_cmd="build", npm=["jlpm"]), ensure_targets(jstargets), ) @@ -61,7 +61,7 @@ cmdclass= cmdclass, packages=setuptools.find_packages(), install_requires=[ - "jupyterlab~=3.0.0b4", + "jupyterlab>=3.0.0b6,==3.*", ], zip_safe=False, include_package_data=True, diff --git a/widget-tracker/widgets/package.json b/widget-tracker/widgets/package.json index 6b8c32be..1a8c6f81 100644 --- a/widget-tracker/widgets/package.json +++ b/widget-tracker/widgets/package.json @@ -25,9 +25,10 @@ "url": "https://github.com/jupyterlab/extension-examples.git" }, "scripts": { - "build": "jlpm run build:lib", + "build": "jlpm run build:lib && jlpm run build:labextension", "build:all": "jlpm run build:lib && jlpm run build:labextension", "build:labextension": "jupyter labextension build .", + "build:labextension:dev": "jupyter labextension build --development True .", "build:lib": "tsc", "clean": "jlpm run clean:lib", "clean:all": "jlpm run clean:lib && jlpm run clean:labextension", @@ -42,14 +43,14 @@ "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "~3.0.0-beta.4", - "@jupyterlab/mainmenu": "~3.0.0-beta.4", + "@jupyterlab/application": "~3.0.0-beta.6", + "@jupyterlab/mainmenu": "~3.0.0-beta.6", "@lumino/algorithm": "^1.3.3", "@lumino/coreutils": "^1.5.3", "@lumino/disposable": "^1.4.3" }, "devDependencies": { - "@jupyterlab/builder": "^3.0.0-beta.4", + "@jupyterlab/builder": "^3.0.0-beta.6", "@typescript-eslint/eslint-plugin": "^2.27.0", "@typescript-eslint/parser": "^2.27.0", "eslint": "^7.5.0", diff --git a/widget-tracker/widgets/pyproject.toml b/widget-tracker/widgets/pyproject.toml index 63a68190..6aa9c052 100644 --- a/widget-tracker/widgets/pyproject.toml +++ b/widget-tracker/widgets/pyproject.toml @@ -1,3 +1,3 @@ [build-system] -requires = ["jupyter_packaging~=0.7.0", "jupyterlab~=3.0.0b4", "setuptools>=40.8.0", "wheel"] +requires = ["jupyter_packaging~=0.7.0", "jupyterlab>=3.0.0b6,==3.*", "setuptools>=40.8.0", "wheel"] build-backend = "setuptools.build_meta" diff --git a/widget-tracker/widgets/setup.py b/widget-tracker/widgets/setup.py index a0933efd..e43fc194 100644 --- a/widget-tracker/widgets/setup.py +++ b/widget-tracker/widgets/setup.py @@ -43,7 +43,7 @@ ) cmdclass["jsdeps"] = combine_commands( - install_npm(HERE, build_cmd="build:all", npm=["jlpm"]), + install_npm(HERE, build_cmd="build", npm=["jlpm"]), ensure_targets(jstargets), ) @@ -61,7 +61,7 @@ cmdclass= cmdclass, packages=setuptools.find_packages(), install_requires=[ - "jupyterlab~=3.0.0b4", + "jupyterlab>=3.0.0b6,==3.*", ], zip_safe=False, include_package_data=True, From f45433cca96cea18d75ff36f441800cc71eb149f Mon Sep 17 00:00:00 2001 From: Jeremy Tuloup Date: Thu, 24 Sep 2020 09:15:53 +0200 Subject: [PATCH 24/45] Update to rc0 --- advanced/kernel-messaging/package.json | 2 +- advanced/kernel-messaging/pyproject.toml | 2 +- advanced/kernel-messaging/setup.py | 4 ++-- advanced/kernel-output/package.json | 2 +- advanced/kernel-output/pyproject.toml | 2 +- advanced/kernel-output/setup.py | 4 ++-- advanced/server-extension/package.json | 2 +- advanced/server-extension/pyproject.toml | 2 +- advanced/server-extension/setup.py | 4 ++-- basics/datagrid/package.json | 2 +- basics/datagrid/pyproject.toml | 2 +- basics/datagrid/setup.py | 4 ++-- basics/hello-world/package.json | 2 +- basics/hello-world/pyproject.toml | 2 +- basics/hello-world/setup.py | 4 ++-- basics/signals/package.json | 2 +- basics/signals/pyproject.toml | 2 +- basics/signals/setup.py | 4 ++-- command-palette/package.json | 2 +- command-palette/pyproject.toml | 2 +- command-palette/setup.py | 4 ++-- commands/package.json | 2 +- commands/pyproject.toml | 2 +- commands/setup.py | 4 ++-- context-menu/package.json | 2 +- context-menu/pyproject.toml | 2 +- context-menu/setup.py | 4 ++-- launcher/package.json | 2 +- launcher/pyproject.toml | 2 +- launcher/setup.py | 4 ++-- log-console/custom-log-console/package.json | 2 +- log-console/custom-log-console/pyproject.toml | 2 +- log-console/custom-log-console/setup.py | 4 ++-- log-console/log-messages/package.json | 2 +- log-console/log-messages/pyproject.toml | 2 +- log-console/log-messages/setup.py | 4 ++-- main-menu/package.json | 2 +- main-menu/pyproject.toml | 2 +- main-menu/setup.py | 4 ++-- react/react-widget/package.json | 2 +- react/react-widget/pyproject.toml | 2 +- react/react-widget/setup.py | 4 ++-- settings/package.json | 2 +- settings/pyproject.toml | 2 +- settings/setup.py | 4 ++-- state/package.json | 2 +- state/pyproject.toml | 2 +- state/setup.py | 4 ++-- widget-tracker/widgets/package.json | 2 +- widget-tracker/widgets/pyproject.toml | 2 +- widget-tracker/widgets/setup.py | 4 ++-- 51 files changed, 68 insertions(+), 68 deletions(-) diff --git a/advanced/kernel-messaging/package.json b/advanced/kernel-messaging/package.json index cdc687e0..6eeadb95 100644 --- a/advanced/kernel-messaging/package.json +++ b/advanced/kernel-messaging/package.json @@ -55,7 +55,7 @@ "@lumino/widgets": "^1.14.0" }, "devDependencies": { - "@jupyterlab/builder": "^3.0.0-beta.6", + "@jupyterlab/builder": "^3.0.0-rc.0", "@typescript-eslint/eslint-plugin": "^2.27.0", "@typescript-eslint/parser": "^2.27.0", "eslint": "^7.5.0", diff --git a/advanced/kernel-messaging/pyproject.toml b/advanced/kernel-messaging/pyproject.toml index 6aa9c052..93ec5cf1 100644 --- a/advanced/kernel-messaging/pyproject.toml +++ b/advanced/kernel-messaging/pyproject.toml @@ -1,3 +1,3 @@ [build-system] -requires = ["jupyter_packaging~=0.7.0", "jupyterlab>=3.0.0b6,==3.*", "setuptools>=40.8.0", "wheel"] +requires = ["jupyter_packaging~=0.7.0", "jupyterlab>=3.0.0rc0,==3.*", "setuptools>=40.8.0", "wheel"] build-backend = "setuptools.build_meta" diff --git a/advanced/kernel-messaging/setup.py b/advanced/kernel-messaging/setup.py index 25c199ad..6f4555c2 100644 --- a/advanced/kernel-messaging/setup.py +++ b/advanced/kernel-messaging/setup.py @@ -37,7 +37,7 @@ ("share/jupyter/labextensions/%s" % labext_name, lab_path, "*.*"), ] -cmdclass = create_cmdclass("jsdeps", +cmdclass = create_cmdclass("jsdeps", package_data_spec=package_data_spec, data_files_spec=data_files_spec ) @@ -61,7 +61,7 @@ cmdclass= cmdclass, packages=setuptools.find_packages(), install_requires=[ - "jupyterlab>=3.0.0b6,==3.*", + "jupyterlab>=3.0.0rc0,==3.*", ], zip_safe=False, include_package_data=True, diff --git a/advanced/kernel-output/package.json b/advanced/kernel-output/package.json index 6fa1e654..59b1d598 100644 --- a/advanced/kernel-output/package.json +++ b/advanced/kernel-output/package.json @@ -54,7 +54,7 @@ "@lumino/disposable": "^1.4.3" }, "devDependencies": { - "@jupyterlab/builder": "^3.0.0-beta.6", + "@jupyterlab/builder": "^3.0.0-rc.0", "@typescript-eslint/eslint-plugin": "^2.27.0", "@typescript-eslint/parser": "^2.27.0", "eslint": "^7.5.0", diff --git a/advanced/kernel-output/pyproject.toml b/advanced/kernel-output/pyproject.toml index 6aa9c052..93ec5cf1 100644 --- a/advanced/kernel-output/pyproject.toml +++ b/advanced/kernel-output/pyproject.toml @@ -1,3 +1,3 @@ [build-system] -requires = ["jupyter_packaging~=0.7.0", "jupyterlab>=3.0.0b6,==3.*", "setuptools>=40.8.0", "wheel"] +requires = ["jupyter_packaging~=0.7.0", "jupyterlab>=3.0.0rc0,==3.*", "setuptools>=40.8.0", "wheel"] build-backend = "setuptools.build_meta" diff --git a/advanced/kernel-output/setup.py b/advanced/kernel-output/setup.py index ca06d0e3..f4ae05f9 100644 --- a/advanced/kernel-output/setup.py +++ b/advanced/kernel-output/setup.py @@ -37,7 +37,7 @@ ("share/jupyter/labextensions/%s" % labext_name, lab_path, "*.*"), ] -cmdclass = create_cmdclass("jsdeps", +cmdclass = create_cmdclass("jsdeps", package_data_spec=package_data_spec, data_files_spec=data_files_spec ) @@ -61,7 +61,7 @@ cmdclass= cmdclass, packages=setuptools.find_packages(), install_requires=[ - "jupyterlab>=3.0.0b6,==3.*", + "jupyterlab>=3.0.0rc0,==3.*", ], zip_safe=False, include_package_data=True, diff --git a/advanced/server-extension/package.json b/advanced/server-extension/package.json index 7b61b4d3..dd56085b 100644 --- a/advanced/server-extension/package.json +++ b/advanced/server-extension/package.json @@ -49,7 +49,7 @@ "@jupyterlab/services": "~6.0.0-beta.6" }, "devDependencies": { - "@jupyterlab/builder": "^3.0.0-beta.6", + "@jupyterlab/builder": "^3.0.0-rc.0", "@typescript-eslint/eslint-plugin": "^2.27.0", "@typescript-eslint/parser": "^2.27.0", "eslint": "^7.5.0", diff --git a/advanced/server-extension/pyproject.toml b/advanced/server-extension/pyproject.toml index 6aa9c052..93ec5cf1 100644 --- a/advanced/server-extension/pyproject.toml +++ b/advanced/server-extension/pyproject.toml @@ -1,3 +1,3 @@ [build-system] -requires = ["jupyter_packaging~=0.7.0", "jupyterlab>=3.0.0b6,==3.*", "setuptools>=40.8.0", "wheel"] +requires = ["jupyter_packaging~=0.7.0", "jupyterlab>=3.0.0rc0,==3.*", "setuptools>=40.8.0", "wheel"] build-backend = "setuptools.build_meta" diff --git a/advanced/server-extension/setup.py b/advanced/server-extension/setup.py index 2f6958f9..480fc206 100644 --- a/advanced/server-extension/setup.py +++ b/advanced/server-extension/setup.py @@ -39,7 +39,7 @@ ] -cmdclass = create_cmdclass("jsdeps", +cmdclass = create_cmdclass("jsdeps", package_data_spec=package_data_spec, data_files_spec=data_files_spec ) @@ -63,7 +63,7 @@ cmdclass= cmdclass, packages=setuptools.find_packages(), install_requires=[ - "jupyterlab>=3.0.0b6,==3.*", + "jupyterlab>=3.0.0rc0,==3.*", ], zip_safe=False, include_package_data=True, diff --git a/basics/datagrid/package.json b/basics/datagrid/package.json index e6a7000d..35546b99 100644 --- a/basics/datagrid/package.json +++ b/basics/datagrid/package.json @@ -52,7 +52,7 @@ "@lumino/disposable": "^1.4.3" }, "devDependencies": { - "@jupyterlab/builder": "^3.0.0-beta.6", + "@jupyterlab/builder": "^3.0.0-rc.0", "@typescript-eslint/eslint-plugin": "^2.27.0", "@typescript-eslint/parser": "^2.27.0", "eslint": "^7.5.0", diff --git a/basics/datagrid/pyproject.toml b/basics/datagrid/pyproject.toml index 6aa9c052..93ec5cf1 100644 --- a/basics/datagrid/pyproject.toml +++ b/basics/datagrid/pyproject.toml @@ -1,3 +1,3 @@ [build-system] -requires = ["jupyter_packaging~=0.7.0", "jupyterlab>=3.0.0b6,==3.*", "setuptools>=40.8.0", "wheel"] +requires = ["jupyter_packaging~=0.7.0", "jupyterlab>=3.0.0rc0,==3.*", "setuptools>=40.8.0", "wheel"] build-backend = "setuptools.build_meta" diff --git a/basics/datagrid/setup.py b/basics/datagrid/setup.py index b33eee7b..90497cea 100644 --- a/basics/datagrid/setup.py +++ b/basics/datagrid/setup.py @@ -37,7 +37,7 @@ ("share/jupyter/labextensions/%s" % labext_name, lab_path, "*.*"), ] -cmdclass = create_cmdclass("jsdeps", +cmdclass = create_cmdclass("jsdeps", package_data_spec=package_data_spec, data_files_spec=data_files_spec ) @@ -61,7 +61,7 @@ cmdclass= cmdclass, packages=setuptools.find_packages(), install_requires=[ - "jupyterlab>=3.0.0b6,==3.*", + "jupyterlab>=3.0.0rc0,==3.*", ], zip_safe=False, include_package_data=True, diff --git a/basics/hello-world/package.json b/basics/hello-world/package.json index a5636724..e6b6b0ff 100644 --- a/basics/hello-world/package.json +++ b/basics/hello-world/package.json @@ -46,7 +46,7 @@ "@jupyterlab/application": "~3.0.0-beta.6" }, "devDependencies": { - "@jupyterlab/builder": "^3.0.0-beta.6", + "@jupyterlab/builder": "^3.0.0-rc.0", "@typescript-eslint/eslint-plugin": "^2.27.0", "@typescript-eslint/parser": "^2.27.0", "eslint": "^7.5.0", diff --git a/basics/hello-world/pyproject.toml b/basics/hello-world/pyproject.toml index 6aa9c052..93ec5cf1 100644 --- a/basics/hello-world/pyproject.toml +++ b/basics/hello-world/pyproject.toml @@ -1,3 +1,3 @@ [build-system] -requires = ["jupyter_packaging~=0.7.0", "jupyterlab>=3.0.0b6,==3.*", "setuptools>=40.8.0", "wheel"] +requires = ["jupyter_packaging~=0.7.0", "jupyterlab>=3.0.0rc0,==3.*", "setuptools>=40.8.0", "wheel"] build-backend = "setuptools.build_meta" diff --git a/basics/hello-world/setup.py b/basics/hello-world/setup.py index 441c17d9..2e520849 100644 --- a/basics/hello-world/setup.py +++ b/basics/hello-world/setup.py @@ -37,7 +37,7 @@ ("share/jupyter/labextensions/%s" % labext_name, lab_path, "*.*"), ] -cmdclass = create_cmdclass("jsdeps", +cmdclass = create_cmdclass("jsdeps", package_data_spec=package_data_spec, data_files_spec=data_files_spec ) @@ -61,7 +61,7 @@ cmdclass= cmdclass, packages=setuptools.find_packages(), install_requires=[ - "jupyterlab>=3.0.0b6,==3.*", + "jupyterlab>=3.0.0rc0,==3.*", ], zip_safe=False, include_package_data=True, diff --git a/basics/signals/package.json b/basics/signals/package.json index 2f161f0c..a423128d 100644 --- a/basics/signals/package.json +++ b/basics/signals/package.json @@ -53,7 +53,7 @@ "@lumino/disposable": "^1.4.3" }, "devDependencies": { - "@jupyterlab/builder": "^3.0.0-beta.6", + "@jupyterlab/builder": "^3.0.0-rc.0", "@typescript-eslint/eslint-plugin": "^2.27.0", "@typescript-eslint/parser": "^2.27.0", "eslint": "^7.5.0", diff --git a/basics/signals/pyproject.toml b/basics/signals/pyproject.toml index 6aa9c052..93ec5cf1 100644 --- a/basics/signals/pyproject.toml +++ b/basics/signals/pyproject.toml @@ -1,3 +1,3 @@ [build-system] -requires = ["jupyter_packaging~=0.7.0", "jupyterlab>=3.0.0b6,==3.*", "setuptools>=40.8.0", "wheel"] +requires = ["jupyter_packaging~=0.7.0", "jupyterlab>=3.0.0rc0,==3.*", "setuptools>=40.8.0", "wheel"] build-backend = "setuptools.build_meta" diff --git a/basics/signals/setup.py b/basics/signals/setup.py index 1eb9b6a6..488b4a70 100644 --- a/basics/signals/setup.py +++ b/basics/signals/setup.py @@ -37,7 +37,7 @@ ("share/jupyter/labextensions/%s" % labext_name, lab_path, "*.*"), ] -cmdclass = create_cmdclass("jsdeps", +cmdclass = create_cmdclass("jsdeps", package_data_spec=package_data_spec, data_files_spec=data_files_spec ) @@ -61,7 +61,7 @@ cmdclass= cmdclass, packages=setuptools.find_packages(), install_requires=[ - "jupyterlab>=3.0.0b6,==3.*", + "jupyterlab>=3.0.0rc0,==3.*", ], zip_safe=False, include_package_data=True, diff --git a/command-palette/package.json b/command-palette/package.json index 57b7eb2e..ba944e84 100644 --- a/command-palette/package.json +++ b/command-palette/package.json @@ -46,7 +46,7 @@ "@jupyterlab/application": "~3.0.0-beta.6" }, "devDependencies": { - "@jupyterlab/builder": "^3.0.0-beta.6", + "@jupyterlab/builder": "^3.0.0-rc.0", "@typescript-eslint/eslint-plugin": "^2.27.0", "@typescript-eslint/parser": "^2.27.0", "eslint": "^7.5.0", diff --git a/command-palette/pyproject.toml b/command-palette/pyproject.toml index 6aa9c052..93ec5cf1 100644 --- a/command-palette/pyproject.toml +++ b/command-palette/pyproject.toml @@ -1,3 +1,3 @@ [build-system] -requires = ["jupyter_packaging~=0.7.0", "jupyterlab>=3.0.0b6,==3.*", "setuptools>=40.8.0", "wheel"] +requires = ["jupyter_packaging~=0.7.0", "jupyterlab>=3.0.0rc0,==3.*", "setuptools>=40.8.0", "wheel"] build-backend = "setuptools.build_meta" diff --git a/command-palette/setup.py b/command-palette/setup.py index dc9d4fa5..242979dd 100644 --- a/command-palette/setup.py +++ b/command-palette/setup.py @@ -37,7 +37,7 @@ ("share/jupyter/labextensions/%s" % labext_name, lab_path, "*.*"), ] -cmdclass = create_cmdclass("jsdeps", +cmdclass = create_cmdclass("jsdeps", package_data_spec=package_data_spec, data_files_spec=data_files_spec ) @@ -61,7 +61,7 @@ cmdclass= cmdclass, packages=setuptools.find_packages(), install_requires=[ - "jupyterlab>=3.0.0b6,==3.*", + "jupyterlab>=3.0.0rc0,==3.*", ], zip_safe=False, include_package_data=True, diff --git a/commands/package.json b/commands/package.json index 13347fa6..a955a81a 100644 --- a/commands/package.json +++ b/commands/package.json @@ -46,7 +46,7 @@ "@jupyterlab/application": "~3.0.0-beta.6" }, "devDependencies": { - "@jupyterlab/builder": "^3.0.0-beta.6", + "@jupyterlab/builder": "^3.0.0-rc.0", "@typescript-eslint/eslint-plugin": "^2.27.0", "@typescript-eslint/parser": "^2.27.0", "eslint": "^7.5.0", diff --git a/commands/pyproject.toml b/commands/pyproject.toml index 6aa9c052..93ec5cf1 100644 --- a/commands/pyproject.toml +++ b/commands/pyproject.toml @@ -1,3 +1,3 @@ [build-system] -requires = ["jupyter_packaging~=0.7.0", "jupyterlab>=3.0.0b6,==3.*", "setuptools>=40.8.0", "wheel"] +requires = ["jupyter_packaging~=0.7.0", "jupyterlab>=3.0.0rc0,==3.*", "setuptools>=40.8.0", "wheel"] build-backend = "setuptools.build_meta" diff --git a/commands/setup.py b/commands/setup.py index 15d9529a..f1d3ba19 100644 --- a/commands/setup.py +++ b/commands/setup.py @@ -37,7 +37,7 @@ ("share/jupyter/labextensions/%s" % labext_name, lab_path, "*.*"), ] -cmdclass = create_cmdclass("jsdeps", +cmdclass = create_cmdclass("jsdeps", package_data_spec=package_data_spec, data_files_spec=data_files_spec ) @@ -61,7 +61,7 @@ cmdclass= cmdclass, packages=setuptools.find_packages(), install_requires=[ - "jupyterlab>=3.0.0b6,==3.*", + "jupyterlab>=3.0.0rc0,==3.*", ], zip_safe=False, include_package_data=True, diff --git a/context-menu/package.json b/context-menu/package.json index 40bdca79..8da5c39a 100644 --- a/context-menu/package.json +++ b/context-menu/package.json @@ -49,7 +49,7 @@ "@jupyterlab/ui-components": "~3.0.0-beta.6" }, "devDependencies": { - "@jupyterlab/builder": "^3.0.0-beta.6", + "@jupyterlab/builder": "^3.0.0-rc.0", "@typescript-eslint/eslint-plugin": "^2.27.0", "@typescript-eslint/parser": "^2.27.0", "eslint": "^7.5.0", diff --git a/context-menu/pyproject.toml b/context-menu/pyproject.toml index 6aa9c052..93ec5cf1 100644 --- a/context-menu/pyproject.toml +++ b/context-menu/pyproject.toml @@ -1,3 +1,3 @@ [build-system] -requires = ["jupyter_packaging~=0.7.0", "jupyterlab>=3.0.0b6,==3.*", "setuptools>=40.8.0", "wheel"] +requires = ["jupyter_packaging~=0.7.0", "jupyterlab>=3.0.0rc0,==3.*", "setuptools>=40.8.0", "wheel"] build-backend = "setuptools.build_meta" diff --git a/context-menu/setup.py b/context-menu/setup.py index 15280fbf..78452824 100644 --- a/context-menu/setup.py +++ b/context-menu/setup.py @@ -37,7 +37,7 @@ ("share/jupyter/labextensions/%s" % labext_name, lab_path, "*.*"), ] -cmdclass = create_cmdclass("jsdeps", +cmdclass = create_cmdclass("jsdeps", package_data_spec=package_data_spec, data_files_spec=data_files_spec ) @@ -61,7 +61,7 @@ cmdclass= cmdclass, packages=setuptools.find_packages(), install_requires=[ - "jupyterlab>=3.0.0b6,==3.*", + "jupyterlab>=3.0.0rc0,==3.*", ], zip_safe=False, include_package_data=True, diff --git a/launcher/package.json b/launcher/package.json index 88c99cfb..035f2b44 100644 --- a/launcher/package.json +++ b/launcher/package.json @@ -49,7 +49,7 @@ "@jupyterlab/mainmenu": "~3.0.0-beta.6" }, "devDependencies": { - "@jupyterlab/builder": "^3.0.0-beta.6", + "@jupyterlab/builder": "^3.0.0-rc.0", "@typescript-eslint/eslint-plugin": "^2.27.0", "@typescript-eslint/parser": "^2.27.0", "eslint": "^7.5.0", diff --git a/launcher/pyproject.toml b/launcher/pyproject.toml index 6aa9c052..93ec5cf1 100644 --- a/launcher/pyproject.toml +++ b/launcher/pyproject.toml @@ -1,3 +1,3 @@ [build-system] -requires = ["jupyter_packaging~=0.7.0", "jupyterlab>=3.0.0b6,==3.*", "setuptools>=40.8.0", "wheel"] +requires = ["jupyter_packaging~=0.7.0", "jupyterlab>=3.0.0rc0,==3.*", "setuptools>=40.8.0", "wheel"] build-backend = "setuptools.build_meta" diff --git a/launcher/setup.py b/launcher/setup.py index 5f0cf598..7a714039 100644 --- a/launcher/setup.py +++ b/launcher/setup.py @@ -37,7 +37,7 @@ ("share/jupyter/labextensions/%s" % labext_name, lab_path, "*.*"), ] -cmdclass = create_cmdclass("jsdeps", +cmdclass = create_cmdclass("jsdeps", package_data_spec=package_data_spec, data_files_spec=data_files_spec ) @@ -61,7 +61,7 @@ cmdclass= cmdclass, packages=setuptools.find_packages(), install_requires=[ - "jupyterlab>=3.0.0b6,==3.*", + "jupyterlab>=3.0.0rc0,==3.*", ], zip_safe=False, include_package_data=True, diff --git a/log-console/custom-log-console/package.json b/log-console/custom-log-console/package.json index c52df2ce..96297442 100644 --- a/log-console/custom-log-console/package.json +++ b/log-console/custom-log-console/package.json @@ -55,7 +55,7 @@ "@lumino/widgets": "^1.14.0" }, "devDependencies": { - "@jupyterlab/builder": "^3.0.0-beta.6", + "@jupyterlab/builder": "^3.0.0-rc.0", "@typescript-eslint/eslint-plugin": "^2.27.0", "@typescript-eslint/parser": "^2.27.0", "eslint": "^7.5.0", diff --git a/log-console/custom-log-console/pyproject.toml b/log-console/custom-log-console/pyproject.toml index 6aa9c052..93ec5cf1 100644 --- a/log-console/custom-log-console/pyproject.toml +++ b/log-console/custom-log-console/pyproject.toml @@ -1,3 +1,3 @@ [build-system] -requires = ["jupyter_packaging~=0.7.0", "jupyterlab>=3.0.0b6,==3.*", "setuptools>=40.8.0", "wheel"] +requires = ["jupyter_packaging~=0.7.0", "jupyterlab>=3.0.0rc0,==3.*", "setuptools>=40.8.0", "wheel"] build-backend = "setuptools.build_meta" diff --git a/log-console/custom-log-console/setup.py b/log-console/custom-log-console/setup.py index e5e24282..1d3d223a 100644 --- a/log-console/custom-log-console/setup.py +++ b/log-console/custom-log-console/setup.py @@ -37,7 +37,7 @@ ("share/jupyter/labextensions/%s" % labext_name, lab_path, "*.*"), ] -cmdclass = create_cmdclass("jsdeps", +cmdclass = create_cmdclass("jsdeps", package_data_spec=package_data_spec, data_files_spec=data_files_spec ) @@ -61,7 +61,7 @@ cmdclass= cmdclass, packages=setuptools.find_packages(), install_requires=[ - "jupyterlab>=3.0.0b6,==3.*", + "jupyterlab>=3.0.0rc0,==3.*", ], zip_safe=False, include_package_data=True, diff --git a/log-console/log-messages/package.json b/log-console/log-messages/package.json index 86b5c8cf..cbe173dc 100644 --- a/log-console/log-messages/package.json +++ b/log-console/log-messages/package.json @@ -56,7 +56,7 @@ "@lumino/widgets": "^1.14.0" }, "devDependencies": { - "@jupyterlab/builder": "^3.0.0-beta.6", + "@jupyterlab/builder": "^3.0.0-rc.0", "@typescript-eslint/eslint-plugin": "^2.27.0", "@typescript-eslint/parser": "^2.27.0", "eslint": "^7.5.0", diff --git a/log-console/log-messages/pyproject.toml b/log-console/log-messages/pyproject.toml index 6aa9c052..93ec5cf1 100644 --- a/log-console/log-messages/pyproject.toml +++ b/log-console/log-messages/pyproject.toml @@ -1,3 +1,3 @@ [build-system] -requires = ["jupyter_packaging~=0.7.0", "jupyterlab>=3.0.0b6,==3.*", "setuptools>=40.8.0", "wheel"] +requires = ["jupyter_packaging~=0.7.0", "jupyterlab>=3.0.0rc0,==3.*", "setuptools>=40.8.0", "wheel"] build-backend = "setuptools.build_meta" diff --git a/log-console/log-messages/setup.py b/log-console/log-messages/setup.py index d2376009..f5e15ea1 100644 --- a/log-console/log-messages/setup.py +++ b/log-console/log-messages/setup.py @@ -37,7 +37,7 @@ ("share/jupyter/labextensions/%s" % labext_name, lab_path, "*.*"), ] -cmdclass = create_cmdclass("jsdeps", +cmdclass = create_cmdclass("jsdeps", package_data_spec=package_data_spec, data_files_spec=data_files_spec ) @@ -61,7 +61,7 @@ cmdclass= cmdclass, packages=setuptools.find_packages(), install_requires=[ - "jupyterlab>=3.0.0b6,==3.*", + "jupyterlab>=3.0.0rc0,==3.*", ], zip_safe=False, include_package_data=True, diff --git a/main-menu/package.json b/main-menu/package.json index 2586af32..7e270acc 100644 --- a/main-menu/package.json +++ b/main-menu/package.json @@ -48,7 +48,7 @@ "@lumino/widgets": "^1.14.0" }, "devDependencies": { - "@jupyterlab/builder": "^3.0.0-beta.6", + "@jupyterlab/builder": "^3.0.0-rc.0", "@typescript-eslint/eslint-plugin": "^2.27.0", "@typescript-eslint/parser": "^2.27.0", "eslint": "^7.5.0", diff --git a/main-menu/pyproject.toml b/main-menu/pyproject.toml index 6aa9c052..93ec5cf1 100644 --- a/main-menu/pyproject.toml +++ b/main-menu/pyproject.toml @@ -1,3 +1,3 @@ [build-system] -requires = ["jupyter_packaging~=0.7.0", "jupyterlab>=3.0.0b6,==3.*", "setuptools>=40.8.0", "wheel"] +requires = ["jupyter_packaging~=0.7.0", "jupyterlab>=3.0.0rc0,==3.*", "setuptools>=40.8.0", "wheel"] build-backend = "setuptools.build_meta" diff --git a/main-menu/setup.py b/main-menu/setup.py index 1df3b569..2ad02b21 100644 --- a/main-menu/setup.py +++ b/main-menu/setup.py @@ -37,7 +37,7 @@ ("share/jupyter/labextensions/%s" % labext_name, lab_path, "*.*"), ] -cmdclass = create_cmdclass("jsdeps", +cmdclass = create_cmdclass("jsdeps", package_data_spec=package_data_spec, data_files_spec=data_files_spec ) @@ -61,7 +61,7 @@ cmdclass= cmdclass, packages=setuptools.find_packages(), install_requires=[ - "jupyterlab>=3.0.0b6,==3.*", + "jupyterlab>=3.0.0rc0,==3.*", ], zip_safe=False, include_package_data=True, diff --git a/react/react-widget/package.json b/react/react-widget/package.json index 0157644d..0c33713f 100644 --- a/react/react-widget/package.json +++ b/react/react-widget/package.json @@ -48,7 +48,7 @@ "@jupyterlab/ui-components": "~3.0.0-beta.6" }, "devDependencies": { - "@jupyterlab/builder": "^3.0.0-beta.6", + "@jupyterlab/builder": "^3.0.0-rc.0", "@typescript-eslint/eslint-plugin": "^2.27.0", "@typescript-eslint/parser": "^2.27.0", "eslint": "^7.5.0", diff --git a/react/react-widget/pyproject.toml b/react/react-widget/pyproject.toml index 6aa9c052..93ec5cf1 100644 --- a/react/react-widget/pyproject.toml +++ b/react/react-widget/pyproject.toml @@ -1,3 +1,3 @@ [build-system] -requires = ["jupyter_packaging~=0.7.0", "jupyterlab>=3.0.0b6,==3.*", "setuptools>=40.8.0", "wheel"] +requires = ["jupyter_packaging~=0.7.0", "jupyterlab>=3.0.0rc0,==3.*", "setuptools>=40.8.0", "wheel"] build-backend = "setuptools.build_meta" diff --git a/react/react-widget/setup.py b/react/react-widget/setup.py index 26bba2d2..4583adf0 100644 --- a/react/react-widget/setup.py +++ b/react/react-widget/setup.py @@ -37,7 +37,7 @@ ("share/jupyter/labextensions/%s" % labext_name, lab_path, "*.*"), ] -cmdclass = create_cmdclass("jsdeps", +cmdclass = create_cmdclass("jsdeps", package_data_spec=package_data_spec, data_files_spec=data_files_spec ) @@ -61,7 +61,7 @@ cmdclass= cmdclass, packages=setuptools.find_packages(), install_requires=[ - "jupyterlab>=3.0.0b6,==3.*", + "jupyterlab>=3.0.0rc0,==3.*", ], zip_safe=False, include_package_data=True, diff --git a/settings/package.json b/settings/package.json index be8185b9..a27da662 100644 --- a/settings/package.json +++ b/settings/package.json @@ -50,7 +50,7 @@ "@lumino/widgets": "^1.14.0" }, "devDependencies": { - "@jupyterlab/builder": "^3.0.0-beta.6", + "@jupyterlab/builder": "^3.0.0-rc.0", "@typescript-eslint/eslint-plugin": "^2.27.0", "@typescript-eslint/parser": "^2.27.0", "eslint": "^7.5.0", diff --git a/settings/pyproject.toml b/settings/pyproject.toml index 6aa9c052..93ec5cf1 100644 --- a/settings/pyproject.toml +++ b/settings/pyproject.toml @@ -1,3 +1,3 @@ [build-system] -requires = ["jupyter_packaging~=0.7.0", "jupyterlab>=3.0.0b6,==3.*", "setuptools>=40.8.0", "wheel"] +requires = ["jupyter_packaging~=0.7.0", "jupyterlab>=3.0.0rc0,==3.*", "setuptools>=40.8.0", "wheel"] build-backend = "setuptools.build_meta" diff --git a/settings/setup.py b/settings/setup.py index dfbdaebf..17541821 100644 --- a/settings/setup.py +++ b/settings/setup.py @@ -37,7 +37,7 @@ ("share/jupyter/labextensions/%s" % labext_name, lab_path, "*.*"), ] -cmdclass = create_cmdclass("jsdeps", +cmdclass = create_cmdclass("jsdeps", package_data_spec=package_data_spec, data_files_spec=data_files_spec ) @@ -61,7 +61,7 @@ cmdclass= cmdclass, packages=setuptools.find_packages(), install_requires=[ - "jupyterlab>=3.0.0b6,==3.*", + "jupyterlab>=3.0.0rc0,==3.*", ], zip_safe=False, include_package_data=True, diff --git a/state/package.json b/state/package.json index a8b4cd33..c51b83d3 100644 --- a/state/package.json +++ b/state/package.json @@ -49,7 +49,7 @@ "@lumino/coreutils": "^1.5.3" }, "devDependencies": { - "@jupyterlab/builder": "^3.0.0-beta.6", + "@jupyterlab/builder": "^3.0.0-rc.0", "@typescript-eslint/eslint-plugin": "^2.27.0", "@typescript-eslint/parser": "^2.27.0", "eslint": "^7.5.0", diff --git a/state/pyproject.toml b/state/pyproject.toml index 6aa9c052..93ec5cf1 100644 --- a/state/pyproject.toml +++ b/state/pyproject.toml @@ -1,3 +1,3 @@ [build-system] -requires = ["jupyter_packaging~=0.7.0", "jupyterlab>=3.0.0b6,==3.*", "setuptools>=40.8.0", "wheel"] +requires = ["jupyter_packaging~=0.7.0", "jupyterlab>=3.0.0rc0,==3.*", "setuptools>=40.8.0", "wheel"] build-backend = "setuptools.build_meta" diff --git a/state/setup.py b/state/setup.py index dcbab42d..68bc800d 100644 --- a/state/setup.py +++ b/state/setup.py @@ -37,7 +37,7 @@ ("share/jupyter/labextensions/%s" % labext_name, lab_path, "*.*"), ] -cmdclass = create_cmdclass("jsdeps", +cmdclass = create_cmdclass("jsdeps", package_data_spec=package_data_spec, data_files_spec=data_files_spec ) @@ -61,7 +61,7 @@ cmdclass= cmdclass, packages=setuptools.find_packages(), install_requires=[ - "jupyterlab>=3.0.0b6,==3.*", + "jupyterlab>=3.0.0rc0,==3.*", ], zip_safe=False, include_package_data=True, diff --git a/widget-tracker/widgets/package.json b/widget-tracker/widgets/package.json index 1a8c6f81..ab43933a 100644 --- a/widget-tracker/widgets/package.json +++ b/widget-tracker/widgets/package.json @@ -50,7 +50,7 @@ "@lumino/disposable": "^1.4.3" }, "devDependencies": { - "@jupyterlab/builder": "^3.0.0-beta.6", + "@jupyterlab/builder": "^3.0.0-rc.0", "@typescript-eslint/eslint-plugin": "^2.27.0", "@typescript-eslint/parser": "^2.27.0", "eslint": "^7.5.0", diff --git a/widget-tracker/widgets/pyproject.toml b/widget-tracker/widgets/pyproject.toml index 6aa9c052..93ec5cf1 100644 --- a/widget-tracker/widgets/pyproject.toml +++ b/widget-tracker/widgets/pyproject.toml @@ -1,3 +1,3 @@ [build-system] -requires = ["jupyter_packaging~=0.7.0", "jupyterlab>=3.0.0b6,==3.*", "setuptools>=40.8.0", "wheel"] +requires = ["jupyter_packaging~=0.7.0", "jupyterlab>=3.0.0rc0,==3.*", "setuptools>=40.8.0", "wheel"] build-backend = "setuptools.build_meta" diff --git a/widget-tracker/widgets/setup.py b/widget-tracker/widgets/setup.py index e43fc194..95cdd333 100644 --- a/widget-tracker/widgets/setup.py +++ b/widget-tracker/widgets/setup.py @@ -37,7 +37,7 @@ ("share/jupyter/labextensions/%s" % labext_name, lab_path, "*.*"), ] -cmdclass = create_cmdclass("jsdeps", +cmdclass = create_cmdclass("jsdeps", package_data_spec=package_data_spec, data_files_spec=data_files_spec ) @@ -61,7 +61,7 @@ cmdclass= cmdclass, packages=setuptools.find_packages(), install_requires=[ - "jupyterlab>=3.0.0b6,==3.*", + "jupyterlab>=3.0.0rc0,==3.*", ], zip_safe=False, include_package_data=True, From 4567fac3e4d3c3307ffd52a7fcd0492f450ba2c3 Mon Sep 17 00:00:00 2001 From: Jeremy Tuloup Date: Thu, 24 Sep 2020 18:12:04 +0200 Subject: [PATCH 25/45] pip install server extension from local sdist --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5381e11c..ea74ef1d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -201,7 +201,7 @@ jobs: run: | cd advanced/server-extension python setup.py sdist - pip install jlab_ext_example --pre --find-links=dist --no-cache-dir + pip install ./dist/jlab_ext_example* --pre --find-links=dist --no-cache-dir python -m jupyterlab.browser_check - name: Check extension as dev if: steps.filter.outputs.extension == 'true' && ( startsWith(runner.os, 'Linux') || startsWith(runner.os, 'macOS') ) From 15f1f2cf25989a3119b73a4eced6510fd4faa73a Mon Sep 17 00:00:00 2001 From: Jeremy Tuloup Date: Thu, 24 Sep 2020 18:20:36 +0200 Subject: [PATCH 26/45] Update server extension README --- advanced/server-extension/README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/advanced/server-extension/README.md b/advanced/server-extension/README.md index 24168fca..1304f3cf 100644 --- a/advanced/server-extension/README.md +++ b/advanced/server-extension/README.md @@ -535,7 +535,7 @@ data_files_spec = [ ] -cmdclass = create_cmdclass("jsdeps", +cmdclass = create_cmdclass("jsdeps", package_data_spec=package_data_spec, data_files_spec=data_files_spec ) @@ -559,7 +559,7 @@ setup_args = dict( cmdclass= cmdclass, packages=setuptools.find_packages(), install_requires=[ - "jupyterlab>=3.0.0b6,==3.*", + "jupyterlab>=3.0.0rc0,==3.*", ], zip_safe=False, include_package_data=True, @@ -592,7 +592,7 @@ done using a special `cmdclass`: ```py # setup.py#L42-L50 -cmdclass = create_cmdclass("jsdeps", +cmdclass = create_cmdclass("jsdeps", package_data_spec=package_data_spec, data_files_spec=data_files_spec ) From 1d51b2df766ba841d7ee8fc4fb2cb7b99e532eab Mon Sep 17 00:00:00 2001 From: Jeremy Tuloup Date: Mon, 28 Sep 2020 20:43:31 +0200 Subject: [PATCH 27/45] Update package.json deps to rc0 --- advanced/kernel-messaging/package.json | 10 +++++----- advanced/kernel-output/package.json | 10 +++++----- advanced/server-extension/package.json | 8 ++++---- basics/datagrid/package.json | 6 +++--- basics/hello-world/README.md | 2 +- basics/hello-world/package.json | 2 +- basics/signals/package.json | 8 ++++---- command-palette/package.json | 2 +- commands/package.json | 2 +- context-menu/package.json | 8 ++++---- launcher/package.json | 8 ++++---- log-console/custom-log-console/package.json | 16 ++++++++-------- log-console/log-messages/package.json | 18 +++++++++--------- main-menu/README.md | 4 ++-- main-menu/package.json | 4 ++-- react/react-widget/package.json | 6 +++--- settings/package.json | 6 +++--- state/package.json | 6 +++--- widget-tracker/widgets/package.json | 4 ++-- 19 files changed, 65 insertions(+), 65 deletions(-) diff --git a/advanced/kernel-messaging/package.json b/advanced/kernel-messaging/package.json index 6eeadb95..0eab8a22 100644 --- a/advanced/kernel-messaging/package.json +++ b/advanced/kernel-messaging/package.json @@ -43,11 +43,11 @@ "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "~3.0.0-beta.6", - "@jupyterlab/launcher": "~3.0.0-beta.6", - "@jupyterlab/mainmenu": "~3.0.0-beta.6", - "@jupyterlab/nbformat": "~3.0.0-beta.6", - "@jupyterlab/translation": "~3.0.0-beta.6", + "@jupyterlab/application": "~3.0.0-rc.0", + "@jupyterlab/launcher": "~3.0.0-rc.0", + "@jupyterlab/mainmenu": "~3.0.0-rc.0", + "@jupyterlab/nbformat": "~3.0.0-rc.0", + "@jupyterlab/translation": "~3.0.0-rc.0", "@lumino/algorithm": "^1.3.3", "@lumino/coreutils": "^1.5.3", "@lumino/datagrid": "^0.5.2", diff --git a/advanced/kernel-output/package.json b/advanced/kernel-output/package.json index 59b1d598..eb2b9f80 100644 --- a/advanced/kernel-output/package.json +++ b/advanced/kernel-output/package.json @@ -43,11 +43,11 @@ "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "~3.0.0-beta.6", - "@jupyterlab/launcher": "~3.0.0-beta.6", - "@jupyterlab/mainmenu": "~3.0.0-beta.6", - "@jupyterlab/outputarea": "~3.0.0-beta.6", - "@jupyterlab/translation": "~3.0.0-beta.6", + "@jupyterlab/application": "~3.0.0-rc.0", + "@jupyterlab/launcher": "~3.0.0-rc.0", + "@jupyterlab/mainmenu": "~3.0.0-rc.0", + "@jupyterlab/outputarea": "~3.0.0-rc.0", + "@jupyterlab/translation": "~3.0.0-rc.0", "@lumino/algorithm": "^1.3.3", "@lumino/coreutils": "^1.5.3", "@lumino/datagrid": "^0.3.1", diff --git a/advanced/server-extension/package.json b/advanced/server-extension/package.json index dd56085b..dfca5486 100644 --- a/advanced/server-extension/package.json +++ b/advanced/server-extension/package.json @@ -43,10 +43,10 @@ "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "~3.0.0-beta.6", - "@jupyterlab/coreutils": "~5.0.0-beta.6", - "@jupyterlab/launcher": "~3.0.0-beta.6", - "@jupyterlab/services": "~6.0.0-beta.6" + "@jupyterlab/application": "~3.0.0-rc.0", + "@jupyterlab/coreutils": "~5.0.0-rc.0", + "@jupyterlab/launcher": "~3.0.0-rc.0", + "@jupyterlab/services": "~6.0.0-rc.0" }, "devDependencies": { "@jupyterlab/builder": "^3.0.0-rc.0", diff --git a/basics/datagrid/package.json b/basics/datagrid/package.json index 35546b99..511d37c7 100644 --- a/basics/datagrid/package.json +++ b/basics/datagrid/package.json @@ -43,9 +43,9 @@ "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "~3.0.0-beta.6", - "@jupyterlab/mainmenu": "~3.0.0-beta.6", - "@jupyterlab/translation": "~3.0.0-beta.6", + "@jupyterlab/application": "~3.0.0-rc.0", + "@jupyterlab/mainmenu": "~3.0.0-rc.0", + "@jupyterlab/translation": "~3.0.0-rc.0", "@lumino/algorithm": "^1.3.3", "@lumino/coreutils": "^1.5.3", "@lumino/datagrid": "^0.5.2", diff --git a/basics/hello-world/README.md b/basics/hello-world/README.md index 3d4747a9..3c448c82 100644 --- a/basics/hello-world/README.md +++ b/basics/hello-world/README.md @@ -95,7 +95,7 @@ package is declared in the file `package.json`: }, "dependencies": { - "@jupyterlab/application": "~3.0.0-beta.6" + "@jupyterlab/application": "~3.0.0-rc.0" ``` With this basic import setup, you can move on to construct a new instance diff --git a/basics/hello-world/package.json b/basics/hello-world/package.json index e6b6b0ff..f3e89d94 100644 --- a/basics/hello-world/package.json +++ b/basics/hello-world/package.json @@ -43,7 +43,7 @@ "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "~3.0.0-beta.6" + "@jupyterlab/application": "~3.0.0-rc.0" }, "devDependencies": { "@jupyterlab/builder": "^3.0.0-rc.0", diff --git a/basics/signals/package.json b/basics/signals/package.json index a423128d..3029be0d 100644 --- a/basics/signals/package.json +++ b/basics/signals/package.json @@ -43,10 +43,10 @@ "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "~3.0.0-beta.6", - "@jupyterlab/launcher": "~3.0.0-beta.6", - "@jupyterlab/mainmenu": "~3.0.0-beta.6", - "@jupyterlab/translation": "~3.0.0-beta.6", + "@jupyterlab/application": "~3.0.0-rc.0", + "@jupyterlab/launcher": "~3.0.0-rc.0", + "@jupyterlab/mainmenu": "~3.0.0-rc.0", + "@jupyterlab/translation": "~3.0.0-rc.0", "@lumino/algorithm": "^1.3.3", "@lumino/coreutils": "^1.5.3", "@lumino/datagrid": "^0.3.1", diff --git a/command-palette/package.json b/command-palette/package.json index ba944e84..7e38c520 100644 --- a/command-palette/package.json +++ b/command-palette/package.json @@ -43,7 +43,7 @@ "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "~3.0.0-beta.6" + "@jupyterlab/application": "~3.0.0-rc.0" }, "devDependencies": { "@jupyterlab/builder": "^3.0.0-rc.0", diff --git a/commands/package.json b/commands/package.json index a955a81a..f8678cb3 100644 --- a/commands/package.json +++ b/commands/package.json @@ -43,7 +43,7 @@ "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "~3.0.0-beta.6" + "@jupyterlab/application": "~3.0.0-rc.0" }, "devDependencies": { "@jupyterlab/builder": "^3.0.0-rc.0", diff --git a/context-menu/package.json b/context-menu/package.json index 8da5c39a..ea5ebd79 100644 --- a/context-menu/package.json +++ b/context-menu/package.json @@ -43,10 +43,10 @@ "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "~3.0.0-beta.6", - "@jupyterlab/apputils": "~3.0.0-beta.6", - "@jupyterlab/filebrowser": "~3.0.0-beta.6", - "@jupyterlab/ui-components": "~3.0.0-beta.6" + "@jupyterlab/application": "~3.0.0-rc.0", + "@jupyterlab/apputils": "~3.0.0-rc.0", + "@jupyterlab/filebrowser": "~3.0.0-rc.0", + "@jupyterlab/ui-components": "~3.0.0-rc.0" }, "devDependencies": { "@jupyterlab/builder": "^3.0.0-rc.0", diff --git a/launcher/package.json b/launcher/package.json index 035f2b44..596de4e8 100644 --- a/launcher/package.json +++ b/launcher/package.json @@ -43,10 +43,10 @@ "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "~3.0.0-beta.6", - "@jupyterlab/filebrowser": "~3.0.0-beta.6", - "@jupyterlab/launcher": "~3.0.0-beta.6", - "@jupyterlab/mainmenu": "~3.0.0-beta.6" + "@jupyterlab/application": "~3.0.0-rc.0", + "@jupyterlab/filebrowser": "~3.0.0-rc.0", + "@jupyterlab/launcher": "~3.0.0-rc.0", + "@jupyterlab/mainmenu": "~3.0.0-rc.0" }, "devDependencies": { "@jupyterlab/builder": "^3.0.0-rc.0", diff --git a/log-console/custom-log-console/package.json b/log-console/custom-log-console/package.json index 96297442..a2c8fdac 100644 --- a/log-console/custom-log-console/package.json +++ b/log-console/custom-log-console/package.json @@ -43,14 +43,14 @@ "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "~3.0.0-beta.6", - "@jupyterlab/apputils": "~3.0.0-beta.6", - "@jupyterlab/coreutils": "~5.0.0-beta.6", - "@jupyterlab/logconsole": "~3.0.0-beta.6", - "@jupyterlab/mainmenu": "~3.0.0-beta.6", - "@jupyterlab/nbformat": "~3.0.0-beta.6", - "@jupyterlab/rendermime": "~3.0.0-beta.6", - "@jupyterlab/ui-components": "~3.0.0-beta.6", + "@jupyterlab/application": "~3.0.0-rc.0", + "@jupyterlab/apputils": "~3.0.0-rc.0", + "@jupyterlab/coreutils": "~5.0.0-rc.0", + "@jupyterlab/logconsole": "~3.0.0-rc.0", + "@jupyterlab/mainmenu": "~3.0.0-rc.0", + "@jupyterlab/nbformat": "~3.0.0-rc.0", + "@jupyterlab/rendermime": "~3.0.0-rc.0", + "@jupyterlab/ui-components": "~3.0.0-rc.0", "@lumino/coreutils": "^1.5.3", "@lumino/widgets": "^1.14.0" }, diff --git a/log-console/log-messages/package.json b/log-console/log-messages/package.json index cbe173dc..970c1b16 100644 --- a/log-console/log-messages/package.json +++ b/log-console/log-messages/package.json @@ -43,15 +43,15 @@ "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "~3.0.0-beta.6", - "@jupyterlab/apputils": "~3.0.0-beta.6", - "@jupyterlab/coreutils": "~5.0.0-beta.6", - "@jupyterlab/logconsole": "~3.0.0-beta.6", - "@jupyterlab/mainmenu": "~3.0.0-beta.6", - "@jupyterlab/nbformat": "~3.0.0-beta.6", - "@jupyterlab/notebook": "~3.0.0-beta.6", - "@jupyterlab/rendermime": "~3.0.0-beta.6", - "@jupyterlab/ui-components": "~3.0.0-beta.6", + "@jupyterlab/application": "~3.0.0-rc.0", + "@jupyterlab/apputils": "~3.0.0-rc.0", + "@jupyterlab/coreutils": "~5.0.0-rc.0", + "@jupyterlab/logconsole": "~3.0.0-rc.0", + "@jupyterlab/mainmenu": "~3.0.0-rc.0", + "@jupyterlab/nbformat": "~3.0.0-rc.0", + "@jupyterlab/notebook": "~3.0.0-rc.0", + "@jupyterlab/rendermime": "~3.0.0-rc.0", + "@jupyterlab/ui-components": "~3.0.0-rc.0", "@lumino/coreutils": "^1.5.3", "@lumino/widgets": "^1.14.0" }, diff --git a/main-menu/README.md b/main-menu/README.md index 44e9d82f..e9b4cfd1 100644 --- a/main-menu/README.md +++ b/main-menu/README.md @@ -89,8 +89,8 @@ After the execution of that command, `package.json` should list them in the }, "dependencies": { - "@jupyterlab/application": "~3.0.0-beta.6", - "@jupyterlab/mainmenu": "~3.0.0-beta.6", + "@jupyterlab/application": "~3.0.0-rc.0", + "@jupyterlab/mainmenu": "~3.0.0-rc.0", "@lumino/widgets": "^1.14.0" ``` diff --git a/main-menu/package.json b/main-menu/package.json index 7e270acc..6667a6b5 100644 --- a/main-menu/package.json +++ b/main-menu/package.json @@ -43,8 +43,8 @@ "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "~3.0.0-beta.6", - "@jupyterlab/mainmenu": "~3.0.0-beta.6", + "@jupyterlab/application": "~3.0.0-rc.0", + "@jupyterlab/mainmenu": "~3.0.0-rc.0", "@lumino/widgets": "^1.14.0" }, "devDependencies": { diff --git a/react/react-widget/package.json b/react/react-widget/package.json index 0c33713f..4fcce9d6 100644 --- a/react/react-widget/package.json +++ b/react/react-widget/package.json @@ -43,9 +43,9 @@ "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "~3.0.0-beta.6", - "@jupyterlab/launcher": "~3.0.0-beta.6", - "@jupyterlab/ui-components": "~3.0.0-beta.6" + "@jupyterlab/application": "~3.0.0-rc.0", + "@jupyterlab/launcher": "~3.0.0-rc.0", + "@jupyterlab/ui-components": "~3.0.0-rc.0" }, "devDependencies": { "@jupyterlab/builder": "^3.0.0-rc.0", diff --git a/settings/package.json b/settings/package.json index a27da662..a129cb51 100644 --- a/settings/package.json +++ b/settings/package.json @@ -44,9 +44,9 @@ "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "~3.0.0-beta.6", - "@jupyterlab/mainmenu": "~3.0.0-beta.6", - "@jupyterlab/settingregistry": "~3.0.0-beta.6", + "@jupyterlab/application": "~3.0.0-rc.0", + "@jupyterlab/mainmenu": "~3.0.0-rc.0", + "@jupyterlab/settingregistry": "~3.0.0-rc.0", "@lumino/widgets": "^1.14.0" }, "devDependencies": { diff --git a/state/package.json b/state/package.json index c51b83d3..498e3ac4 100644 --- a/state/package.json +++ b/state/package.json @@ -43,9 +43,9 @@ "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "~3.0.0-beta.6", - "@jupyterlab/apputils": "~3.0.0-beta.6", - "@jupyterlab/statedb": "~3.0.0-beta.6", + "@jupyterlab/application": "~3.0.0-rc.0", + "@jupyterlab/apputils": "~3.0.0-rc.0", + "@jupyterlab/statedb": "~3.0.0-rc.0", "@lumino/coreutils": "^1.5.3" }, "devDependencies": { diff --git a/widget-tracker/widgets/package.json b/widget-tracker/widgets/package.json index ab43933a..ffa3291d 100644 --- a/widget-tracker/widgets/package.json +++ b/widget-tracker/widgets/package.json @@ -43,8 +43,8 @@ "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "~3.0.0-beta.6", - "@jupyterlab/mainmenu": "~3.0.0-beta.6", + "@jupyterlab/application": "~3.0.0-rc.0", + "@jupyterlab/mainmenu": "~3.0.0-rc.0", "@lumino/algorithm": "^1.3.3", "@lumino/coreutils": "^1.5.3", "@lumino/disposable": "^1.4.3" From 5e978b7fd12554685476f05878e9fff3795ed78d Mon Sep 17 00:00:00 2001 From: Jeremy Tuloup Date: Mon, 28 Sep 2020 20:46:30 +0200 Subject: [PATCH 28/45] Update to caret --- advanced/kernel-messaging/package.json | 10 +++++----- advanced/kernel-output/package.json | 10 +++++----- advanced/server-extension/package.json | 4 ++-- basics/datagrid/package.json | 6 +++--- basics/hello-world/README.md | 2 +- basics/hello-world/package.json | 2 +- basics/signals/package.json | 8 ++++---- command-palette/package.json | 2 +- commands/package.json | 2 +- context-menu/package.json | 8 ++++---- launcher/package.json | 8 ++++---- log-console/custom-log-console/package.json | 14 +++++++------- log-console/log-messages/package.json | 16 ++++++++-------- main-menu/README.md | 4 ++-- main-menu/package.json | 4 ++-- react/react-widget/package.json | 6 +++--- settings/package.json | 6 +++--- state/package.json | 6 +++--- widget-tracker/widgets/package.json | 4 ++-- 19 files changed, 61 insertions(+), 61 deletions(-) diff --git a/advanced/kernel-messaging/package.json b/advanced/kernel-messaging/package.json index 0eab8a22..aeb94e01 100644 --- a/advanced/kernel-messaging/package.json +++ b/advanced/kernel-messaging/package.json @@ -43,11 +43,11 @@ "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "~3.0.0-rc.0", - "@jupyterlab/launcher": "~3.0.0-rc.0", - "@jupyterlab/mainmenu": "~3.0.0-rc.0", - "@jupyterlab/nbformat": "~3.0.0-rc.0", - "@jupyterlab/translation": "~3.0.0-rc.0", + "@jupyterlab/application": "^3.0.0-rc.0", + "@jupyterlab/launcher": "^3.0.0-rc.0", + "@jupyterlab/mainmenu": "^3.0.0-rc.0", + "@jupyterlab/nbformat": "^3.0.0-rc.0", + "@jupyterlab/translation": "^3.0.0-rc.0", "@lumino/algorithm": "^1.3.3", "@lumino/coreutils": "^1.5.3", "@lumino/datagrid": "^0.5.2", diff --git a/advanced/kernel-output/package.json b/advanced/kernel-output/package.json index eb2b9f80..0aa5e870 100644 --- a/advanced/kernel-output/package.json +++ b/advanced/kernel-output/package.json @@ -43,11 +43,11 @@ "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "~3.0.0-rc.0", - "@jupyterlab/launcher": "~3.0.0-rc.0", - "@jupyterlab/mainmenu": "~3.0.0-rc.0", - "@jupyterlab/outputarea": "~3.0.0-rc.0", - "@jupyterlab/translation": "~3.0.0-rc.0", + "@jupyterlab/application": "^3.0.0-rc.0", + "@jupyterlab/launcher": "^3.0.0-rc.0", + "@jupyterlab/mainmenu": "^3.0.0-rc.0", + "@jupyterlab/outputarea": "^3.0.0-rc.0", + "@jupyterlab/translation": "^3.0.0-rc.0", "@lumino/algorithm": "^1.3.3", "@lumino/coreutils": "^1.5.3", "@lumino/datagrid": "^0.3.1", diff --git a/advanced/server-extension/package.json b/advanced/server-extension/package.json index dfca5486..91061862 100644 --- a/advanced/server-extension/package.json +++ b/advanced/server-extension/package.json @@ -43,9 +43,9 @@ "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "~3.0.0-rc.0", + "@jupyterlab/application": "^3.0.0-rc.0", "@jupyterlab/coreutils": "~5.0.0-rc.0", - "@jupyterlab/launcher": "~3.0.0-rc.0", + "@jupyterlab/launcher": "^3.0.0-rc.0", "@jupyterlab/services": "~6.0.0-rc.0" }, "devDependencies": { diff --git a/basics/datagrid/package.json b/basics/datagrid/package.json index 511d37c7..8b04ae1d 100644 --- a/basics/datagrid/package.json +++ b/basics/datagrid/package.json @@ -43,9 +43,9 @@ "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "~3.0.0-rc.0", - "@jupyterlab/mainmenu": "~3.0.0-rc.0", - "@jupyterlab/translation": "~3.0.0-rc.0", + "@jupyterlab/application": "^3.0.0-rc.0", + "@jupyterlab/mainmenu": "^3.0.0-rc.0", + "@jupyterlab/translation": "^3.0.0-rc.0", "@lumino/algorithm": "^1.3.3", "@lumino/coreutils": "^1.5.3", "@lumino/datagrid": "^0.5.2", diff --git a/basics/hello-world/README.md b/basics/hello-world/README.md index 3c448c82..e1e11abe 100644 --- a/basics/hello-world/README.md +++ b/basics/hello-world/README.md @@ -95,7 +95,7 @@ package is declared in the file `package.json`: }, "dependencies": { - "@jupyterlab/application": "~3.0.0-rc.0" + "@jupyterlab/application": "^3.0.0-rc.0" ``` With this basic import setup, you can move on to construct a new instance diff --git a/basics/hello-world/package.json b/basics/hello-world/package.json index f3e89d94..e35320a0 100644 --- a/basics/hello-world/package.json +++ b/basics/hello-world/package.json @@ -43,7 +43,7 @@ "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "~3.0.0-rc.0" + "@jupyterlab/application": "^3.0.0-rc.0" }, "devDependencies": { "@jupyterlab/builder": "^3.0.0-rc.0", diff --git a/basics/signals/package.json b/basics/signals/package.json index 3029be0d..2eea6f08 100644 --- a/basics/signals/package.json +++ b/basics/signals/package.json @@ -43,10 +43,10 @@ "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "~3.0.0-rc.0", - "@jupyterlab/launcher": "~3.0.0-rc.0", - "@jupyterlab/mainmenu": "~3.0.0-rc.0", - "@jupyterlab/translation": "~3.0.0-rc.0", + "@jupyterlab/application": "^3.0.0-rc.0", + "@jupyterlab/launcher": "^3.0.0-rc.0", + "@jupyterlab/mainmenu": "^3.0.0-rc.0", + "@jupyterlab/translation": "^3.0.0-rc.0", "@lumino/algorithm": "^1.3.3", "@lumino/coreutils": "^1.5.3", "@lumino/datagrid": "^0.3.1", diff --git a/command-palette/package.json b/command-palette/package.json index 7e38c520..59eac7ef 100644 --- a/command-palette/package.json +++ b/command-palette/package.json @@ -43,7 +43,7 @@ "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "~3.0.0-rc.0" + "@jupyterlab/application": "^3.0.0-rc.0" }, "devDependencies": { "@jupyterlab/builder": "^3.0.0-rc.0", diff --git a/commands/package.json b/commands/package.json index f8678cb3..6136fbe1 100644 --- a/commands/package.json +++ b/commands/package.json @@ -43,7 +43,7 @@ "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "~3.0.0-rc.0" + "@jupyterlab/application": "^3.0.0-rc.0" }, "devDependencies": { "@jupyterlab/builder": "^3.0.0-rc.0", diff --git a/context-menu/package.json b/context-menu/package.json index ea5ebd79..87d11988 100644 --- a/context-menu/package.json +++ b/context-menu/package.json @@ -43,10 +43,10 @@ "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "~3.0.0-rc.0", - "@jupyterlab/apputils": "~3.0.0-rc.0", - "@jupyterlab/filebrowser": "~3.0.0-rc.0", - "@jupyterlab/ui-components": "~3.0.0-rc.0" + "@jupyterlab/application": "^3.0.0-rc.0", + "@jupyterlab/apputils": "^3.0.0-rc.0", + "@jupyterlab/filebrowser": "^3.0.0-rc.0", + "@jupyterlab/ui-components": "^3.0.0-rc.0" }, "devDependencies": { "@jupyterlab/builder": "^3.0.0-rc.0", diff --git a/launcher/package.json b/launcher/package.json index 596de4e8..0296d37f 100644 --- a/launcher/package.json +++ b/launcher/package.json @@ -43,10 +43,10 @@ "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "~3.0.0-rc.0", - "@jupyterlab/filebrowser": "~3.0.0-rc.0", - "@jupyterlab/launcher": "~3.0.0-rc.0", - "@jupyterlab/mainmenu": "~3.0.0-rc.0" + "@jupyterlab/application": "^3.0.0-rc.0", + "@jupyterlab/filebrowser": "^3.0.0-rc.0", + "@jupyterlab/launcher": "^3.0.0-rc.0", + "@jupyterlab/mainmenu": "^3.0.0-rc.0" }, "devDependencies": { "@jupyterlab/builder": "^3.0.0-rc.0", diff --git a/log-console/custom-log-console/package.json b/log-console/custom-log-console/package.json index a2c8fdac..9a6b1494 100644 --- a/log-console/custom-log-console/package.json +++ b/log-console/custom-log-console/package.json @@ -43,14 +43,14 @@ "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "~3.0.0-rc.0", - "@jupyterlab/apputils": "~3.0.0-rc.0", + "@jupyterlab/application": "^3.0.0-rc.0", + "@jupyterlab/apputils": "^3.0.0-rc.0", "@jupyterlab/coreutils": "~5.0.0-rc.0", - "@jupyterlab/logconsole": "~3.0.0-rc.0", - "@jupyterlab/mainmenu": "~3.0.0-rc.0", - "@jupyterlab/nbformat": "~3.0.0-rc.0", - "@jupyterlab/rendermime": "~3.0.0-rc.0", - "@jupyterlab/ui-components": "~3.0.0-rc.0", + "@jupyterlab/logconsole": "^3.0.0-rc.0", + "@jupyterlab/mainmenu": "^3.0.0-rc.0", + "@jupyterlab/nbformat": "^3.0.0-rc.0", + "@jupyterlab/rendermime": "^3.0.0-rc.0", + "@jupyterlab/ui-components": "^3.0.0-rc.0", "@lumino/coreutils": "^1.5.3", "@lumino/widgets": "^1.14.0" }, diff --git a/log-console/log-messages/package.json b/log-console/log-messages/package.json index 970c1b16..12273579 100644 --- a/log-console/log-messages/package.json +++ b/log-console/log-messages/package.json @@ -43,15 +43,15 @@ "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "~3.0.0-rc.0", - "@jupyterlab/apputils": "~3.0.0-rc.0", + "@jupyterlab/application": "^3.0.0-rc.0", + "@jupyterlab/apputils": "^3.0.0-rc.0", "@jupyterlab/coreutils": "~5.0.0-rc.0", - "@jupyterlab/logconsole": "~3.0.0-rc.0", - "@jupyterlab/mainmenu": "~3.0.0-rc.0", - "@jupyterlab/nbformat": "~3.0.0-rc.0", - "@jupyterlab/notebook": "~3.0.0-rc.0", - "@jupyterlab/rendermime": "~3.0.0-rc.0", - "@jupyterlab/ui-components": "~3.0.0-rc.0", + "@jupyterlab/logconsole": "^3.0.0-rc.0", + "@jupyterlab/mainmenu": "^3.0.0-rc.0", + "@jupyterlab/nbformat": "^3.0.0-rc.0", + "@jupyterlab/notebook": "^3.0.0-rc.0", + "@jupyterlab/rendermime": "^3.0.0-rc.0", + "@jupyterlab/ui-components": "^3.0.0-rc.0", "@lumino/coreutils": "^1.5.3", "@lumino/widgets": "^1.14.0" }, diff --git a/main-menu/README.md b/main-menu/README.md index e9b4cfd1..cce61cee 100644 --- a/main-menu/README.md +++ b/main-menu/README.md @@ -89,8 +89,8 @@ After the execution of that command, `package.json` should list them in the }, "dependencies": { - "@jupyterlab/application": "~3.0.0-rc.0", - "@jupyterlab/mainmenu": "~3.0.0-rc.0", + "@jupyterlab/application": "^3.0.0-rc.0", + "@jupyterlab/mainmenu": "^3.0.0-rc.0", "@lumino/widgets": "^1.14.0" ``` diff --git a/main-menu/package.json b/main-menu/package.json index 6667a6b5..d0f108cd 100644 --- a/main-menu/package.json +++ b/main-menu/package.json @@ -43,8 +43,8 @@ "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "~3.0.0-rc.0", - "@jupyterlab/mainmenu": "~3.0.0-rc.0", + "@jupyterlab/application": "^3.0.0-rc.0", + "@jupyterlab/mainmenu": "^3.0.0-rc.0", "@lumino/widgets": "^1.14.0" }, "devDependencies": { diff --git a/react/react-widget/package.json b/react/react-widget/package.json index 4fcce9d6..dc8bdc83 100644 --- a/react/react-widget/package.json +++ b/react/react-widget/package.json @@ -43,9 +43,9 @@ "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "~3.0.0-rc.0", - "@jupyterlab/launcher": "~3.0.0-rc.0", - "@jupyterlab/ui-components": "~3.0.0-rc.0" + "@jupyterlab/application": "^3.0.0-rc.0", + "@jupyterlab/launcher": "^3.0.0-rc.0", + "@jupyterlab/ui-components": "^3.0.0-rc.0" }, "devDependencies": { "@jupyterlab/builder": "^3.0.0-rc.0", diff --git a/settings/package.json b/settings/package.json index a129cb51..622abc5f 100644 --- a/settings/package.json +++ b/settings/package.json @@ -44,9 +44,9 @@ "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "~3.0.0-rc.0", - "@jupyterlab/mainmenu": "~3.0.0-rc.0", - "@jupyterlab/settingregistry": "~3.0.0-rc.0", + "@jupyterlab/application": "^3.0.0-rc.0", + "@jupyterlab/mainmenu": "^3.0.0-rc.0", + "@jupyterlab/settingregistry": "^3.0.0-rc.0", "@lumino/widgets": "^1.14.0" }, "devDependencies": { diff --git a/state/package.json b/state/package.json index 498e3ac4..190f2413 100644 --- a/state/package.json +++ b/state/package.json @@ -43,9 +43,9 @@ "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "~3.0.0-rc.0", - "@jupyterlab/apputils": "~3.0.0-rc.0", - "@jupyterlab/statedb": "~3.0.0-rc.0", + "@jupyterlab/application": "^3.0.0-rc.0", + "@jupyterlab/apputils": "^3.0.0-rc.0", + "@jupyterlab/statedb": "^3.0.0-rc.0", "@lumino/coreutils": "^1.5.3" }, "devDependencies": { diff --git a/widget-tracker/widgets/package.json b/widget-tracker/widgets/package.json index ffa3291d..47e430b4 100644 --- a/widget-tracker/widgets/package.json +++ b/widget-tracker/widgets/package.json @@ -43,8 +43,8 @@ "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "~3.0.0-rc.0", - "@jupyterlab/mainmenu": "~3.0.0-rc.0", + "@jupyterlab/application": "^3.0.0-rc.0", + "@jupyterlab/mainmenu": "^3.0.0-rc.0", "@lumino/algorithm": "^1.3.3", "@lumino/coreutils": "^1.5.3", "@lumino/disposable": "^1.4.3" From 31d04b967e0cb86ef4bb114ef1da2f8938e4d580 Mon Sep 17 00:00:00 2001 From: Jeremy Tuloup Date: Tue, 29 Sep 2020 10:56:01 +0200 Subject: [PATCH 29/45] Add icon to the react widget --- react/react-widget/src/index.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/react/react-widget/src/index.ts b/react/react-widget/src/index.ts index 58e2f38d..efe11cee 100644 --- a/react/react-widget/src/index.ts +++ b/react/react-widget/src/index.ts @@ -37,6 +37,7 @@ const extension: JupyterFrontEndPlugin = { const content = new CounterWidget(); const widget = new MainAreaWidget({ content }); widget.title.label = 'React Widget'; + widget.title.icon = reactIcon; app.shell.add(widget, 'main'); } }); From 4119687fd6bff00c5aae880a03770a2e932bbebb Mon Sep 17 00:00:00 2001 From: Jeremy Tuloup Date: Wed, 30 Sep 2020 10:38:30 +0200 Subject: [PATCH 30/45] Update to rc2 using the script --- advanced/kernel-messaging/package.json | 14 ++++++------ advanced/kernel-messaging/pyproject.toml | 2 +- advanced/kernel-messaging/setup.py | 2 +- advanced/kernel-output/package.json | 14 ++++++------ advanced/kernel-output/pyproject.toml | 2 +- advanced/kernel-output/setup.py | 2 +- advanced/server-extension/package.json | 12 +++++----- advanced/server-extension/pyproject.toml | 2 +- advanced/server-extension/setup.py | 2 +- basics/datagrid/package.json | 10 ++++----- basics/datagrid/pyproject.toml | 2 +- basics/datagrid/setup.py | 2 +- basics/hello-world/package.json | 6 ++--- basics/hello-world/pyproject.toml | 2 +- basics/hello-world/setup.py | 2 +- basics/signals/package.json | 12 +++++----- basics/signals/pyproject.toml | 2 +- basics/signals/setup.py | 2 +- command-palette/package.json | 6 ++--- command-palette/pyproject.toml | 2 +- command-palette/setup.py | 2 +- commands/package.json | 6 ++--- commands/pyproject.toml | 2 +- commands/setup.py | 2 +- context-menu/package.json | 12 +++++----- context-menu/pyproject.toml | 2 +- context-menu/setup.py | 2 +- launcher/package.json | 12 +++++----- launcher/pyproject.toml | 2 +- launcher/setup.py | 2 +- log-console/custom-log-console/package.json | 20 ++++++++--------- log-console/custom-log-console/pyproject.toml | 2 +- log-console/custom-log-console/setup.py | 2 +- log-console/log-messages/package.json | 22 +++++++++---------- log-console/log-messages/pyproject.toml | 2 +- log-console/log-messages/setup.py | 2 +- main-menu/package.json | 8 +++---- main-menu/pyproject.toml | 2 +- main-menu/setup.py | 2 +- react/react-widget/package.json | 10 ++++----- react/react-widget/pyproject.toml | 2 +- react/react-widget/setup.py | 2 +- settings/package.json | 10 ++++----- settings/pyproject.toml | 2 +- settings/setup.py | 2 +- state/package.json | 10 ++++----- state/pyproject.toml | 2 +- state/setup.py | 2 +- widget-tracker/widgets/package.json | 8 +++---- widget-tracker/widgets/pyproject.toml | 2 +- widget-tracker/widgets/setup.py | 2 +- 51 files changed, 130 insertions(+), 130 deletions(-) diff --git a/advanced/kernel-messaging/package.json b/advanced/kernel-messaging/package.json index aeb94e01..72a984dd 100644 --- a/advanced/kernel-messaging/package.json +++ b/advanced/kernel-messaging/package.json @@ -43,11 +43,11 @@ "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "^3.0.0-rc.0", - "@jupyterlab/launcher": "^3.0.0-rc.0", - "@jupyterlab/mainmenu": "^3.0.0-rc.0", - "@jupyterlab/nbformat": "^3.0.0-rc.0", - "@jupyterlab/translation": "^3.0.0-rc.0", + "@jupyterlab/application": "^3.0.0-rc.2", + "@jupyterlab/launcher": "^3.0.0-rc.2", + "@jupyterlab/mainmenu": "^3.0.0-rc.2", + "@jupyterlab/nbformat": "^3.0.0-rc.2", + "@jupyterlab/translation": "^3.0.0-rc.2", "@lumino/algorithm": "^1.3.3", "@lumino/coreutils": "^1.5.3", "@lumino/datagrid": "^0.5.2", @@ -55,7 +55,7 @@ "@lumino/widgets": "^1.14.0" }, "devDependencies": { - "@jupyterlab/builder": "^3.0.0-rc.0", + "@jupyterlab/builder": "^3.0.0-rc.2", "@typescript-eslint/eslint-plugin": "^2.27.0", "@typescript-eslint/parser": "^2.27.0", "eslint": "^7.5.0", @@ -66,7 +66,7 @@ "npm-run-all": "^4.1.5", "prettier": "^1.19.0", "rimraf": "^3.0.2", - "typescript": "~3.9.0" + "typescript": "~4.0.3" }, "sideEffects": [ "style/*.css" diff --git a/advanced/kernel-messaging/pyproject.toml b/advanced/kernel-messaging/pyproject.toml index 93ec5cf1..ca305776 100644 --- a/advanced/kernel-messaging/pyproject.toml +++ b/advanced/kernel-messaging/pyproject.toml @@ -1,3 +1,3 @@ [build-system] -requires = ["jupyter_packaging~=0.7.0", "jupyterlab>=3.0.0rc0,==3.*", "setuptools>=40.8.0", "wheel"] +requires = ["jupyter_packaging~=0.7.0", "jupyterlab>=3.0.0rc2,==3.*", "setuptools>=40.8.0", "wheel"] build-backend = "setuptools.build_meta" diff --git a/advanced/kernel-messaging/setup.py b/advanced/kernel-messaging/setup.py index 6f4555c2..74f5d69b 100644 --- a/advanced/kernel-messaging/setup.py +++ b/advanced/kernel-messaging/setup.py @@ -61,7 +61,7 @@ cmdclass= cmdclass, packages=setuptools.find_packages(), install_requires=[ - "jupyterlab>=3.0.0rc0,==3.*", + "jupyterlab>=3.0.0rc2,==3.*", ], zip_safe=False, include_package_data=True, diff --git a/advanced/kernel-output/package.json b/advanced/kernel-output/package.json index 0aa5e870..51c833ef 100644 --- a/advanced/kernel-output/package.json +++ b/advanced/kernel-output/package.json @@ -43,18 +43,18 @@ "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "^3.0.0-rc.0", - "@jupyterlab/launcher": "^3.0.0-rc.0", - "@jupyterlab/mainmenu": "^3.0.0-rc.0", - "@jupyterlab/outputarea": "^3.0.0-rc.0", - "@jupyterlab/translation": "^3.0.0-rc.0", + "@jupyterlab/application": "^3.0.0-rc.2", + "@jupyterlab/launcher": "^3.0.0-rc.2", + "@jupyterlab/mainmenu": "^3.0.0-rc.2", + "@jupyterlab/outputarea": "^3.0.0-rc.2", + "@jupyterlab/translation": "^3.0.0-rc.2", "@lumino/algorithm": "^1.3.3", "@lumino/coreutils": "^1.5.3", "@lumino/datagrid": "^0.3.1", "@lumino/disposable": "^1.4.3" }, "devDependencies": { - "@jupyterlab/builder": "^3.0.0-rc.0", + "@jupyterlab/builder": "^3.0.0-rc.2", "@typescript-eslint/eslint-plugin": "^2.27.0", "@typescript-eslint/parser": "^2.27.0", "eslint": "^7.5.0", @@ -65,7 +65,7 @@ "npm-run-all": "^4.1.5", "prettier": "^1.19.0", "rimraf": "^3.0.2", - "typescript": "~3.9.0" + "typescript": "~4.0.3" }, "sideEffects": [ "style/*.css" diff --git a/advanced/kernel-output/pyproject.toml b/advanced/kernel-output/pyproject.toml index 93ec5cf1..ca305776 100644 --- a/advanced/kernel-output/pyproject.toml +++ b/advanced/kernel-output/pyproject.toml @@ -1,3 +1,3 @@ [build-system] -requires = ["jupyter_packaging~=0.7.0", "jupyterlab>=3.0.0rc0,==3.*", "setuptools>=40.8.0", "wheel"] +requires = ["jupyter_packaging~=0.7.0", "jupyterlab>=3.0.0rc2,==3.*", "setuptools>=40.8.0", "wheel"] build-backend = "setuptools.build_meta" diff --git a/advanced/kernel-output/setup.py b/advanced/kernel-output/setup.py index f4ae05f9..6882deef 100644 --- a/advanced/kernel-output/setup.py +++ b/advanced/kernel-output/setup.py @@ -61,7 +61,7 @@ cmdclass= cmdclass, packages=setuptools.find_packages(), install_requires=[ - "jupyterlab>=3.0.0rc0,==3.*", + "jupyterlab>=3.0.0rc2,==3.*", ], zip_safe=False, include_package_data=True, diff --git a/advanced/server-extension/package.json b/advanced/server-extension/package.json index 91061862..2c08b6d8 100644 --- a/advanced/server-extension/package.json +++ b/advanced/server-extension/package.json @@ -43,13 +43,13 @@ "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "^3.0.0-rc.0", - "@jupyterlab/coreutils": "~5.0.0-rc.0", - "@jupyterlab/launcher": "^3.0.0-rc.0", - "@jupyterlab/services": "~6.0.0-rc.0" + "@jupyterlab/application": "^3.0.0-rc.2", + "@jupyterlab/coreutils": "^5.0.0-rc.2", + "@jupyterlab/launcher": "^3.0.0-rc.2", + "@jupyterlab/services": "^6.0.0-rc.2" }, "devDependencies": { - "@jupyterlab/builder": "^3.0.0-rc.0", + "@jupyterlab/builder": "^3.0.0-rc.2", "@typescript-eslint/eslint-plugin": "^2.27.0", "@typescript-eslint/parser": "^2.27.0", "eslint": "^7.5.0", @@ -61,7 +61,7 @@ "npm-run-all": "^4.1.5", "prettier": "^1.19.0", "rimraf": "^3.0.2", - "typescript": "~3.9.0" + "typescript": "~4.0.3" }, "sideEffects": [ "style/*.css" diff --git a/advanced/server-extension/pyproject.toml b/advanced/server-extension/pyproject.toml index 93ec5cf1..ca305776 100644 --- a/advanced/server-extension/pyproject.toml +++ b/advanced/server-extension/pyproject.toml @@ -1,3 +1,3 @@ [build-system] -requires = ["jupyter_packaging~=0.7.0", "jupyterlab>=3.0.0rc0,==3.*", "setuptools>=40.8.0", "wheel"] +requires = ["jupyter_packaging~=0.7.0", "jupyterlab>=3.0.0rc2,==3.*", "setuptools>=40.8.0", "wheel"] build-backend = "setuptools.build_meta" diff --git a/advanced/server-extension/setup.py b/advanced/server-extension/setup.py index 480fc206..7ab40eb3 100644 --- a/advanced/server-extension/setup.py +++ b/advanced/server-extension/setup.py @@ -63,7 +63,7 @@ cmdclass= cmdclass, packages=setuptools.find_packages(), install_requires=[ - "jupyterlab>=3.0.0rc0,==3.*", + "jupyterlab>=3.0.0rc2,==3.*", ], zip_safe=False, include_package_data=True, diff --git a/basics/datagrid/package.json b/basics/datagrid/package.json index 8b04ae1d..41b0325c 100644 --- a/basics/datagrid/package.json +++ b/basics/datagrid/package.json @@ -43,16 +43,16 @@ "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "^3.0.0-rc.0", - "@jupyterlab/mainmenu": "^3.0.0-rc.0", - "@jupyterlab/translation": "^3.0.0-rc.0", + "@jupyterlab/application": "^3.0.0-rc.2", + "@jupyterlab/mainmenu": "^3.0.0-rc.2", + "@jupyterlab/translation": "^3.0.0-rc.2", "@lumino/algorithm": "^1.3.3", "@lumino/coreutils": "^1.5.3", "@lumino/datagrid": "^0.5.2", "@lumino/disposable": "^1.4.3" }, "devDependencies": { - "@jupyterlab/builder": "^3.0.0-rc.0", + "@jupyterlab/builder": "^3.0.0-rc.2", "@typescript-eslint/eslint-plugin": "^2.27.0", "@typescript-eslint/parser": "^2.27.0", "eslint": "^7.5.0", @@ -63,7 +63,7 @@ "npm-run-all": "^4.1.5", "prettier": "^1.19.0", "rimraf": "^3.0.2", - "typescript": "~3.9.0" + "typescript": "~4.0.3" }, "sideEffects": [ "style/*.css" diff --git a/basics/datagrid/pyproject.toml b/basics/datagrid/pyproject.toml index 93ec5cf1..ca305776 100644 --- a/basics/datagrid/pyproject.toml +++ b/basics/datagrid/pyproject.toml @@ -1,3 +1,3 @@ [build-system] -requires = ["jupyter_packaging~=0.7.0", "jupyterlab>=3.0.0rc0,==3.*", "setuptools>=40.8.0", "wheel"] +requires = ["jupyter_packaging~=0.7.0", "jupyterlab>=3.0.0rc2,==3.*", "setuptools>=40.8.0", "wheel"] build-backend = "setuptools.build_meta" diff --git a/basics/datagrid/setup.py b/basics/datagrid/setup.py index 90497cea..6b444e10 100644 --- a/basics/datagrid/setup.py +++ b/basics/datagrid/setup.py @@ -61,7 +61,7 @@ cmdclass= cmdclass, packages=setuptools.find_packages(), install_requires=[ - "jupyterlab>=3.0.0rc0,==3.*", + "jupyterlab>=3.0.0rc2,==3.*", ], zip_safe=False, include_package_data=True, diff --git a/basics/hello-world/package.json b/basics/hello-world/package.json index e35320a0..04c013cf 100644 --- a/basics/hello-world/package.json +++ b/basics/hello-world/package.json @@ -43,10 +43,10 @@ "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "^3.0.0-rc.0" + "@jupyterlab/application": "^3.0.0-rc.2" }, "devDependencies": { - "@jupyterlab/builder": "^3.0.0-rc.0", + "@jupyterlab/builder": "^3.0.0-rc.2", "@typescript-eslint/eslint-plugin": "^2.27.0", "@typescript-eslint/parser": "^2.27.0", "eslint": "^7.5.0", @@ -57,7 +57,7 @@ "npm-run-all": "^4.1.5", "prettier": "^1.19.0", "rimraf": "^3.0.2", - "typescript": "~3.9.0" + "typescript": "~4.0.3" }, "sideEffects": [ "style/*.css" diff --git a/basics/hello-world/pyproject.toml b/basics/hello-world/pyproject.toml index 93ec5cf1..ca305776 100644 --- a/basics/hello-world/pyproject.toml +++ b/basics/hello-world/pyproject.toml @@ -1,3 +1,3 @@ [build-system] -requires = ["jupyter_packaging~=0.7.0", "jupyterlab>=3.0.0rc0,==3.*", "setuptools>=40.8.0", "wheel"] +requires = ["jupyter_packaging~=0.7.0", "jupyterlab>=3.0.0rc2,==3.*", "setuptools>=40.8.0", "wheel"] build-backend = "setuptools.build_meta" diff --git a/basics/hello-world/setup.py b/basics/hello-world/setup.py index 2e520849..ee01a2bd 100644 --- a/basics/hello-world/setup.py +++ b/basics/hello-world/setup.py @@ -61,7 +61,7 @@ cmdclass= cmdclass, packages=setuptools.find_packages(), install_requires=[ - "jupyterlab>=3.0.0rc0,==3.*", + "jupyterlab>=3.0.0rc2,==3.*", ], zip_safe=False, include_package_data=True, diff --git a/basics/signals/package.json b/basics/signals/package.json index 2eea6f08..5b47fecf 100644 --- a/basics/signals/package.json +++ b/basics/signals/package.json @@ -43,17 +43,17 @@ "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "^3.0.0-rc.0", - "@jupyterlab/launcher": "^3.0.0-rc.0", - "@jupyterlab/mainmenu": "^3.0.0-rc.0", - "@jupyterlab/translation": "^3.0.0-rc.0", + "@jupyterlab/application": "^3.0.0-rc.2", + "@jupyterlab/launcher": "^3.0.0-rc.2", + "@jupyterlab/mainmenu": "^3.0.0-rc.2", + "@jupyterlab/translation": "^3.0.0-rc.2", "@lumino/algorithm": "^1.3.3", "@lumino/coreutils": "^1.5.3", "@lumino/datagrid": "^0.3.1", "@lumino/disposable": "^1.4.3" }, "devDependencies": { - "@jupyterlab/builder": "^3.0.0-rc.0", + "@jupyterlab/builder": "^3.0.0-rc.2", "@typescript-eslint/eslint-plugin": "^2.27.0", "@typescript-eslint/parser": "^2.27.0", "eslint": "^7.5.0", @@ -64,7 +64,7 @@ "npm-run-all": "^4.1.5", "prettier": "^1.19.0", "rimraf": "^3.0.2", - "typescript": "~3.9.0" + "typescript": "~4.0.3" }, "sideEffects": [ "style/*.css" diff --git a/basics/signals/pyproject.toml b/basics/signals/pyproject.toml index 93ec5cf1..ca305776 100644 --- a/basics/signals/pyproject.toml +++ b/basics/signals/pyproject.toml @@ -1,3 +1,3 @@ [build-system] -requires = ["jupyter_packaging~=0.7.0", "jupyterlab>=3.0.0rc0,==3.*", "setuptools>=40.8.0", "wheel"] +requires = ["jupyter_packaging~=0.7.0", "jupyterlab>=3.0.0rc2,==3.*", "setuptools>=40.8.0", "wheel"] build-backend = "setuptools.build_meta" diff --git a/basics/signals/setup.py b/basics/signals/setup.py index 488b4a70..0a33d3cf 100644 --- a/basics/signals/setup.py +++ b/basics/signals/setup.py @@ -61,7 +61,7 @@ cmdclass= cmdclass, packages=setuptools.find_packages(), install_requires=[ - "jupyterlab>=3.0.0rc0,==3.*", + "jupyterlab>=3.0.0rc2,==3.*", ], zip_safe=False, include_package_data=True, diff --git a/command-palette/package.json b/command-palette/package.json index 59eac7ef..c7f98c3e 100644 --- a/command-palette/package.json +++ b/command-palette/package.json @@ -43,10 +43,10 @@ "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "^3.0.0-rc.0" + "@jupyterlab/application": "^3.0.0-rc.2" }, "devDependencies": { - "@jupyterlab/builder": "^3.0.0-rc.0", + "@jupyterlab/builder": "^3.0.0-rc.2", "@typescript-eslint/eslint-plugin": "^2.27.0", "@typescript-eslint/parser": "^2.27.0", "eslint": "^7.5.0", @@ -57,7 +57,7 @@ "npm-run-all": "^4.1.5", "prettier": "^1.19.0", "rimraf": "^3.0.2", - "typescript": "~3.9.0" + "typescript": "~4.0.3" }, "sideEffects": [ "style/*.css" diff --git a/command-palette/pyproject.toml b/command-palette/pyproject.toml index 93ec5cf1..ca305776 100644 --- a/command-palette/pyproject.toml +++ b/command-palette/pyproject.toml @@ -1,3 +1,3 @@ [build-system] -requires = ["jupyter_packaging~=0.7.0", "jupyterlab>=3.0.0rc0,==3.*", "setuptools>=40.8.0", "wheel"] +requires = ["jupyter_packaging~=0.7.0", "jupyterlab>=3.0.0rc2,==3.*", "setuptools>=40.8.0", "wheel"] build-backend = "setuptools.build_meta" diff --git a/command-palette/setup.py b/command-palette/setup.py index 242979dd..b8831a51 100644 --- a/command-palette/setup.py +++ b/command-palette/setup.py @@ -61,7 +61,7 @@ cmdclass= cmdclass, packages=setuptools.find_packages(), install_requires=[ - "jupyterlab>=3.0.0rc0,==3.*", + "jupyterlab>=3.0.0rc2,==3.*", ], zip_safe=False, include_package_data=True, diff --git a/commands/package.json b/commands/package.json index 6136fbe1..d72495b2 100644 --- a/commands/package.json +++ b/commands/package.json @@ -43,10 +43,10 @@ "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "^3.0.0-rc.0" + "@jupyterlab/application": "^3.0.0-rc.2" }, "devDependencies": { - "@jupyterlab/builder": "^3.0.0-rc.0", + "@jupyterlab/builder": "^3.0.0-rc.2", "@typescript-eslint/eslint-plugin": "^2.27.0", "@typescript-eslint/parser": "^2.27.0", "eslint": "^7.5.0", @@ -57,7 +57,7 @@ "npm-run-all": "^4.1.5", "prettier": "^1.19.0", "rimraf": "^3.0.2", - "typescript": "~3.9.0" + "typescript": "~4.0.3" }, "sideEffects": [ "style/*.css" diff --git a/commands/pyproject.toml b/commands/pyproject.toml index 93ec5cf1..ca305776 100644 --- a/commands/pyproject.toml +++ b/commands/pyproject.toml @@ -1,3 +1,3 @@ [build-system] -requires = ["jupyter_packaging~=0.7.0", "jupyterlab>=3.0.0rc0,==3.*", "setuptools>=40.8.0", "wheel"] +requires = ["jupyter_packaging~=0.7.0", "jupyterlab>=3.0.0rc2,==3.*", "setuptools>=40.8.0", "wheel"] build-backend = "setuptools.build_meta" diff --git a/commands/setup.py b/commands/setup.py index f1d3ba19..b1ffd560 100644 --- a/commands/setup.py +++ b/commands/setup.py @@ -61,7 +61,7 @@ cmdclass= cmdclass, packages=setuptools.find_packages(), install_requires=[ - "jupyterlab>=3.0.0rc0,==3.*", + "jupyterlab>=3.0.0rc2,==3.*", ], zip_safe=False, include_package_data=True, diff --git a/context-menu/package.json b/context-menu/package.json index 87d11988..4960b14e 100644 --- a/context-menu/package.json +++ b/context-menu/package.json @@ -43,13 +43,13 @@ "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "^3.0.0-rc.0", - "@jupyterlab/apputils": "^3.0.0-rc.0", - "@jupyterlab/filebrowser": "^3.0.0-rc.0", - "@jupyterlab/ui-components": "^3.0.0-rc.0" + "@jupyterlab/application": "^3.0.0-rc.2", + "@jupyterlab/apputils": "^3.0.0-rc.2", + "@jupyterlab/filebrowser": "^3.0.0-rc.2", + "@jupyterlab/ui-components": "^3.0.0-rc.2" }, "devDependencies": { - "@jupyterlab/builder": "^3.0.0-rc.0", + "@jupyterlab/builder": "^3.0.0-rc.2", "@typescript-eslint/eslint-plugin": "^2.27.0", "@typescript-eslint/parser": "^2.27.0", "eslint": "^7.5.0", @@ -60,7 +60,7 @@ "npm-run-all": "^4.1.5", "prettier": "^1.19.0", "rimraf": "^3.0.2", - "typescript": "~3.9.0" + "typescript": "~4.0.3" }, "sideEffects": [ "style/*.css" diff --git a/context-menu/pyproject.toml b/context-menu/pyproject.toml index 93ec5cf1..ca305776 100644 --- a/context-menu/pyproject.toml +++ b/context-menu/pyproject.toml @@ -1,3 +1,3 @@ [build-system] -requires = ["jupyter_packaging~=0.7.0", "jupyterlab>=3.0.0rc0,==3.*", "setuptools>=40.8.0", "wheel"] +requires = ["jupyter_packaging~=0.7.0", "jupyterlab>=3.0.0rc2,==3.*", "setuptools>=40.8.0", "wheel"] build-backend = "setuptools.build_meta" diff --git a/context-menu/setup.py b/context-menu/setup.py index 78452824..21e5b00c 100644 --- a/context-menu/setup.py +++ b/context-menu/setup.py @@ -61,7 +61,7 @@ cmdclass= cmdclass, packages=setuptools.find_packages(), install_requires=[ - "jupyterlab>=3.0.0rc0,==3.*", + "jupyterlab>=3.0.0rc2,==3.*", ], zip_safe=False, include_package_data=True, diff --git a/launcher/package.json b/launcher/package.json index 0296d37f..a2563a78 100644 --- a/launcher/package.json +++ b/launcher/package.json @@ -43,13 +43,13 @@ "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "^3.0.0-rc.0", - "@jupyterlab/filebrowser": "^3.0.0-rc.0", - "@jupyterlab/launcher": "^3.0.0-rc.0", - "@jupyterlab/mainmenu": "^3.0.0-rc.0" + "@jupyterlab/application": "^3.0.0-rc.2", + "@jupyterlab/filebrowser": "^3.0.0-rc.2", + "@jupyterlab/launcher": "^3.0.0-rc.2", + "@jupyterlab/mainmenu": "^3.0.0-rc.2" }, "devDependencies": { - "@jupyterlab/builder": "^3.0.0-rc.0", + "@jupyterlab/builder": "^3.0.0-rc.2", "@typescript-eslint/eslint-plugin": "^2.27.0", "@typescript-eslint/parser": "^2.27.0", "eslint": "^7.5.0", @@ -60,7 +60,7 @@ "npm-run-all": "^4.1.5", "prettier": "^1.19.0", "rimraf": "^3.0.2", - "typescript": "~3.9.0" + "typescript": "~4.0.3" }, "sideEffects": [ "style/*.css", diff --git a/launcher/pyproject.toml b/launcher/pyproject.toml index 93ec5cf1..ca305776 100644 --- a/launcher/pyproject.toml +++ b/launcher/pyproject.toml @@ -1,3 +1,3 @@ [build-system] -requires = ["jupyter_packaging~=0.7.0", "jupyterlab>=3.0.0rc0,==3.*", "setuptools>=40.8.0", "wheel"] +requires = ["jupyter_packaging~=0.7.0", "jupyterlab>=3.0.0rc2,==3.*", "setuptools>=40.8.0", "wheel"] build-backend = "setuptools.build_meta" diff --git a/launcher/setup.py b/launcher/setup.py index 7a714039..e480e930 100644 --- a/launcher/setup.py +++ b/launcher/setup.py @@ -61,7 +61,7 @@ cmdclass= cmdclass, packages=setuptools.find_packages(), install_requires=[ - "jupyterlab>=3.0.0rc0,==3.*", + "jupyterlab>=3.0.0rc2,==3.*", ], zip_safe=False, include_package_data=True, diff --git a/log-console/custom-log-console/package.json b/log-console/custom-log-console/package.json index 9a6b1494..5b7a69f6 100644 --- a/log-console/custom-log-console/package.json +++ b/log-console/custom-log-console/package.json @@ -43,19 +43,19 @@ "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "^3.0.0-rc.0", - "@jupyterlab/apputils": "^3.0.0-rc.0", - "@jupyterlab/coreutils": "~5.0.0-rc.0", - "@jupyterlab/logconsole": "^3.0.0-rc.0", - "@jupyterlab/mainmenu": "^3.0.0-rc.0", - "@jupyterlab/nbformat": "^3.0.0-rc.0", - "@jupyterlab/rendermime": "^3.0.0-rc.0", - "@jupyterlab/ui-components": "^3.0.0-rc.0", + "@jupyterlab/application": "^3.0.0-rc.2", + "@jupyterlab/apputils": "^3.0.0-rc.2", + "@jupyterlab/coreutils": "^5.0.0-rc.2", + "@jupyterlab/logconsole": "^3.0.0-rc.2", + "@jupyterlab/mainmenu": "^3.0.0-rc.2", + "@jupyterlab/nbformat": "^3.0.0-rc.2", + "@jupyterlab/rendermime": "^3.0.0-rc.2", + "@jupyterlab/ui-components": "^3.0.0-rc.2", "@lumino/coreutils": "^1.5.3", "@lumino/widgets": "^1.14.0" }, "devDependencies": { - "@jupyterlab/builder": "^3.0.0-rc.0", + "@jupyterlab/builder": "^3.0.0-rc.2", "@typescript-eslint/eslint-plugin": "^2.27.0", "@typescript-eslint/parser": "^2.27.0", "eslint": "^7.5.0", @@ -66,7 +66,7 @@ "npm-run-all": "^4.1.5", "prettier": "^1.19.0", "rimraf": "^3.0.2", - "typescript": "~3.9.0" + "typescript": "~4.0.3" }, "sideEffects": [ "style/*.css" diff --git a/log-console/custom-log-console/pyproject.toml b/log-console/custom-log-console/pyproject.toml index 93ec5cf1..ca305776 100644 --- a/log-console/custom-log-console/pyproject.toml +++ b/log-console/custom-log-console/pyproject.toml @@ -1,3 +1,3 @@ [build-system] -requires = ["jupyter_packaging~=0.7.0", "jupyterlab>=3.0.0rc0,==3.*", "setuptools>=40.8.0", "wheel"] +requires = ["jupyter_packaging~=0.7.0", "jupyterlab>=3.0.0rc2,==3.*", "setuptools>=40.8.0", "wheel"] build-backend = "setuptools.build_meta" diff --git a/log-console/custom-log-console/setup.py b/log-console/custom-log-console/setup.py index 1d3d223a..aaccffd6 100644 --- a/log-console/custom-log-console/setup.py +++ b/log-console/custom-log-console/setup.py @@ -61,7 +61,7 @@ cmdclass= cmdclass, packages=setuptools.find_packages(), install_requires=[ - "jupyterlab>=3.0.0rc0,==3.*", + "jupyterlab>=3.0.0rc2,==3.*", ], zip_safe=False, include_package_data=True, diff --git a/log-console/log-messages/package.json b/log-console/log-messages/package.json index 12273579..733ae095 100644 --- a/log-console/log-messages/package.json +++ b/log-console/log-messages/package.json @@ -43,20 +43,20 @@ "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "^3.0.0-rc.0", - "@jupyterlab/apputils": "^3.0.0-rc.0", - "@jupyterlab/coreutils": "~5.0.0-rc.0", - "@jupyterlab/logconsole": "^3.0.0-rc.0", - "@jupyterlab/mainmenu": "^3.0.0-rc.0", - "@jupyterlab/nbformat": "^3.0.0-rc.0", - "@jupyterlab/notebook": "^3.0.0-rc.0", - "@jupyterlab/rendermime": "^3.0.0-rc.0", - "@jupyterlab/ui-components": "^3.0.0-rc.0", + "@jupyterlab/application": "^3.0.0-rc.2", + "@jupyterlab/apputils": "^3.0.0-rc.2", + "@jupyterlab/coreutils": "^5.0.0-rc.2", + "@jupyterlab/logconsole": "^3.0.0-rc.2", + "@jupyterlab/mainmenu": "^3.0.0-rc.2", + "@jupyterlab/nbformat": "^3.0.0-rc.2", + "@jupyterlab/notebook": "^3.0.0-rc.2", + "@jupyterlab/rendermime": "^3.0.0-rc.2", + "@jupyterlab/ui-components": "^3.0.0-rc.2", "@lumino/coreutils": "^1.5.3", "@lumino/widgets": "^1.14.0" }, "devDependencies": { - "@jupyterlab/builder": "^3.0.0-rc.0", + "@jupyterlab/builder": "^3.0.0-rc.2", "@typescript-eslint/eslint-plugin": "^2.27.0", "@typescript-eslint/parser": "^2.27.0", "eslint": "^7.5.0", @@ -67,7 +67,7 @@ "npm-run-all": "^4.1.5", "prettier": "^1.19.0", "rimraf": "^3.0.2", - "typescript": "~3.9.0" + "typescript": "~4.0.3" }, "sideEffects": [ "style/*.css" diff --git a/log-console/log-messages/pyproject.toml b/log-console/log-messages/pyproject.toml index 93ec5cf1..ca305776 100644 --- a/log-console/log-messages/pyproject.toml +++ b/log-console/log-messages/pyproject.toml @@ -1,3 +1,3 @@ [build-system] -requires = ["jupyter_packaging~=0.7.0", "jupyterlab>=3.0.0rc0,==3.*", "setuptools>=40.8.0", "wheel"] +requires = ["jupyter_packaging~=0.7.0", "jupyterlab>=3.0.0rc2,==3.*", "setuptools>=40.8.0", "wheel"] build-backend = "setuptools.build_meta" diff --git a/log-console/log-messages/setup.py b/log-console/log-messages/setup.py index f5e15ea1..c3126dc0 100644 --- a/log-console/log-messages/setup.py +++ b/log-console/log-messages/setup.py @@ -61,7 +61,7 @@ cmdclass= cmdclass, packages=setuptools.find_packages(), install_requires=[ - "jupyterlab>=3.0.0rc0,==3.*", + "jupyterlab>=3.0.0rc2,==3.*", ], zip_safe=False, include_package_data=True, diff --git a/main-menu/package.json b/main-menu/package.json index d0f108cd..ddd1d4aa 100644 --- a/main-menu/package.json +++ b/main-menu/package.json @@ -43,12 +43,12 @@ "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "^3.0.0-rc.0", - "@jupyterlab/mainmenu": "^3.0.0-rc.0", + "@jupyterlab/application": "^3.0.0-rc.2", + "@jupyterlab/mainmenu": "^3.0.0-rc.2", "@lumino/widgets": "^1.14.0" }, "devDependencies": { - "@jupyterlab/builder": "^3.0.0-rc.0", + "@jupyterlab/builder": "^3.0.0-rc.2", "@typescript-eslint/eslint-plugin": "^2.27.0", "@typescript-eslint/parser": "^2.27.0", "eslint": "^7.5.0", @@ -59,7 +59,7 @@ "npm-run-all": "^4.1.5", "prettier": "^1.19.0", "rimraf": "^3.0.2", - "typescript": "~3.9.0" + "typescript": "~4.0.3" }, "sideEffects": [ "style/*.css" diff --git a/main-menu/pyproject.toml b/main-menu/pyproject.toml index 93ec5cf1..ca305776 100644 --- a/main-menu/pyproject.toml +++ b/main-menu/pyproject.toml @@ -1,3 +1,3 @@ [build-system] -requires = ["jupyter_packaging~=0.7.0", "jupyterlab>=3.0.0rc0,==3.*", "setuptools>=40.8.0", "wheel"] +requires = ["jupyter_packaging~=0.7.0", "jupyterlab>=3.0.0rc2,==3.*", "setuptools>=40.8.0", "wheel"] build-backend = "setuptools.build_meta" diff --git a/main-menu/setup.py b/main-menu/setup.py index 2ad02b21..c05e19b0 100644 --- a/main-menu/setup.py +++ b/main-menu/setup.py @@ -61,7 +61,7 @@ cmdclass= cmdclass, packages=setuptools.find_packages(), install_requires=[ - "jupyterlab>=3.0.0rc0,==3.*", + "jupyterlab>=3.0.0rc2,==3.*", ], zip_safe=False, include_package_data=True, diff --git a/react/react-widget/package.json b/react/react-widget/package.json index dc8bdc83..f173083e 100644 --- a/react/react-widget/package.json +++ b/react/react-widget/package.json @@ -43,12 +43,12 @@ "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "^3.0.0-rc.0", - "@jupyterlab/launcher": "^3.0.0-rc.0", - "@jupyterlab/ui-components": "^3.0.0-rc.0" + "@jupyterlab/application": "^3.0.0-rc.2", + "@jupyterlab/launcher": "^3.0.0-rc.2", + "@jupyterlab/ui-components": "^3.0.0-rc.2" }, "devDependencies": { - "@jupyterlab/builder": "^3.0.0-rc.0", + "@jupyterlab/builder": "^3.0.0-rc.2", "@typescript-eslint/eslint-plugin": "^2.27.0", "@typescript-eslint/parser": "^2.27.0", "eslint": "^7.5.0", @@ -59,7 +59,7 @@ "npm-run-all": "^4.1.5", "prettier": "^1.19.0", "rimraf": "^3.0.2", - "typescript": "~3.9.0" + "typescript": "~4.0.3" }, "sideEffects": [ "style/*.css" diff --git a/react/react-widget/pyproject.toml b/react/react-widget/pyproject.toml index 93ec5cf1..ca305776 100644 --- a/react/react-widget/pyproject.toml +++ b/react/react-widget/pyproject.toml @@ -1,3 +1,3 @@ [build-system] -requires = ["jupyter_packaging~=0.7.0", "jupyterlab>=3.0.0rc0,==3.*", "setuptools>=40.8.0", "wheel"] +requires = ["jupyter_packaging~=0.7.0", "jupyterlab>=3.0.0rc2,==3.*", "setuptools>=40.8.0", "wheel"] build-backend = "setuptools.build_meta" diff --git a/react/react-widget/setup.py b/react/react-widget/setup.py index 4583adf0..773bf515 100644 --- a/react/react-widget/setup.py +++ b/react/react-widget/setup.py @@ -61,7 +61,7 @@ cmdclass= cmdclass, packages=setuptools.find_packages(), install_requires=[ - "jupyterlab>=3.0.0rc0,==3.*", + "jupyterlab>=3.0.0rc2,==3.*", ], zip_safe=False, include_package_data=True, diff --git a/settings/package.json b/settings/package.json index 622abc5f..fff20af3 100644 --- a/settings/package.json +++ b/settings/package.json @@ -44,13 +44,13 @@ "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "^3.0.0-rc.0", - "@jupyterlab/mainmenu": "^3.0.0-rc.0", - "@jupyterlab/settingregistry": "^3.0.0-rc.0", + "@jupyterlab/application": "^3.0.0-rc.2", + "@jupyterlab/mainmenu": "^3.0.0-rc.2", + "@jupyterlab/settingregistry": "^3.0.0-rc.2", "@lumino/widgets": "^1.14.0" }, "devDependencies": { - "@jupyterlab/builder": "^3.0.0-rc.0", + "@jupyterlab/builder": "^3.0.0-rc.2", "@typescript-eslint/eslint-plugin": "^2.27.0", "@typescript-eslint/parser": "^2.27.0", "eslint": "^7.5.0", @@ -61,7 +61,7 @@ "npm-run-all": "^4.1.5", "prettier": "^1.19.0", "rimraf": "^3.0.2", - "typescript": "~3.9.0" + "typescript": "~4.0.3" }, "sideEffects": [ "style/*.css" diff --git a/settings/pyproject.toml b/settings/pyproject.toml index 93ec5cf1..ca305776 100644 --- a/settings/pyproject.toml +++ b/settings/pyproject.toml @@ -1,3 +1,3 @@ [build-system] -requires = ["jupyter_packaging~=0.7.0", "jupyterlab>=3.0.0rc0,==3.*", "setuptools>=40.8.0", "wheel"] +requires = ["jupyter_packaging~=0.7.0", "jupyterlab>=3.0.0rc2,==3.*", "setuptools>=40.8.0", "wheel"] build-backend = "setuptools.build_meta" diff --git a/settings/setup.py b/settings/setup.py index 17541821..089c8447 100644 --- a/settings/setup.py +++ b/settings/setup.py @@ -61,7 +61,7 @@ cmdclass= cmdclass, packages=setuptools.find_packages(), install_requires=[ - "jupyterlab>=3.0.0rc0,==3.*", + "jupyterlab>=3.0.0rc2,==3.*", ], zip_safe=False, include_package_data=True, diff --git a/state/package.json b/state/package.json index 190f2413..13d14ec8 100644 --- a/state/package.json +++ b/state/package.json @@ -43,13 +43,13 @@ "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "^3.0.0-rc.0", - "@jupyterlab/apputils": "^3.0.0-rc.0", - "@jupyterlab/statedb": "^3.0.0-rc.0", + "@jupyterlab/application": "^3.0.0-rc.2", + "@jupyterlab/apputils": "^3.0.0-rc.2", + "@jupyterlab/statedb": "^3.0.0-rc.2", "@lumino/coreutils": "^1.5.3" }, "devDependencies": { - "@jupyterlab/builder": "^3.0.0-rc.0", + "@jupyterlab/builder": "^3.0.0-rc.2", "@typescript-eslint/eslint-plugin": "^2.27.0", "@typescript-eslint/parser": "^2.27.0", "eslint": "^7.5.0", @@ -60,7 +60,7 @@ "npm-run-all": "^4.1.5", "prettier": "^1.19.0", "rimraf": "^3.0.2", - "typescript": "~3.9.0" + "typescript": "~4.0.3" }, "sideEffects": [ "style/*.css" diff --git a/state/pyproject.toml b/state/pyproject.toml index 93ec5cf1..ca305776 100644 --- a/state/pyproject.toml +++ b/state/pyproject.toml @@ -1,3 +1,3 @@ [build-system] -requires = ["jupyter_packaging~=0.7.0", "jupyterlab>=3.0.0rc0,==3.*", "setuptools>=40.8.0", "wheel"] +requires = ["jupyter_packaging~=0.7.0", "jupyterlab>=3.0.0rc2,==3.*", "setuptools>=40.8.0", "wheel"] build-backend = "setuptools.build_meta" diff --git a/state/setup.py b/state/setup.py index 68bc800d..281ed5bd 100644 --- a/state/setup.py +++ b/state/setup.py @@ -61,7 +61,7 @@ cmdclass= cmdclass, packages=setuptools.find_packages(), install_requires=[ - "jupyterlab>=3.0.0rc0,==3.*", + "jupyterlab>=3.0.0rc2,==3.*", ], zip_safe=False, include_package_data=True, diff --git a/widget-tracker/widgets/package.json b/widget-tracker/widgets/package.json index 47e430b4..913884df 100644 --- a/widget-tracker/widgets/package.json +++ b/widget-tracker/widgets/package.json @@ -43,14 +43,14 @@ "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "^3.0.0-rc.0", - "@jupyterlab/mainmenu": "^3.0.0-rc.0", + "@jupyterlab/application": "^3.0.0-rc.2", + "@jupyterlab/mainmenu": "^3.0.0-rc.2", "@lumino/algorithm": "^1.3.3", "@lumino/coreutils": "^1.5.3", "@lumino/disposable": "^1.4.3" }, "devDependencies": { - "@jupyterlab/builder": "^3.0.0-rc.0", + "@jupyterlab/builder": "^3.0.0-rc.2", "@typescript-eslint/eslint-plugin": "^2.27.0", "@typescript-eslint/parser": "^2.27.0", "eslint": "^7.5.0", @@ -61,7 +61,7 @@ "npm-run-all": "^4.1.5", "prettier": "^1.19.0", "rimraf": "^3.0.2", - "typescript": "~3.9.0" + "typescript": "~4.0.3" }, "sideEffects": [ "style/*.css" diff --git a/widget-tracker/widgets/pyproject.toml b/widget-tracker/widgets/pyproject.toml index 93ec5cf1..ca305776 100644 --- a/widget-tracker/widgets/pyproject.toml +++ b/widget-tracker/widgets/pyproject.toml @@ -1,3 +1,3 @@ [build-system] -requires = ["jupyter_packaging~=0.7.0", "jupyterlab>=3.0.0rc0,==3.*", "setuptools>=40.8.0", "wheel"] +requires = ["jupyter_packaging~=0.7.0", "jupyterlab>=3.0.0rc2,==3.*", "setuptools>=40.8.0", "wheel"] build-backend = "setuptools.build_meta" diff --git a/widget-tracker/widgets/setup.py b/widget-tracker/widgets/setup.py index 95cdd333..e28251d0 100644 --- a/widget-tracker/widgets/setup.py +++ b/widget-tracker/widgets/setup.py @@ -61,7 +61,7 @@ cmdclass= cmdclass, packages=setuptools.find_packages(), install_requires=[ - "jupyterlab>=3.0.0rc0,==3.*", + "jupyterlab>=3.0.0rc2,==3.*", ], zip_safe=False, include_package_data=True, From 402e872a3635c9b922b61f08e1c5efde040d9aab Mon Sep 17 00:00:00 2001 From: Jeremy Tuloup Date: Wed, 30 Sep 2020 10:45:27 +0200 Subject: [PATCH 31/45] Update READMEs with embedme --- advanced/server-extension/README.md | 2 +- basics/hello-world/README.md | 2 +- main-menu/README.md | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/advanced/server-extension/README.md b/advanced/server-extension/README.md index 1304f3cf..6cef50f6 100644 --- a/advanced/server-extension/README.md +++ b/advanced/server-extension/README.md @@ -559,7 +559,7 @@ setup_args = dict( cmdclass= cmdclass, packages=setuptools.find_packages(), install_requires=[ - "jupyterlab>=3.0.0rc0,==3.*", + "jupyterlab>=3.0.0rc2,==3.*", ], zip_safe=False, include_package_data=True, diff --git a/basics/hello-world/README.md b/basics/hello-world/README.md index e1e11abe..ea946b4a 100644 --- a/basics/hello-world/README.md +++ b/basics/hello-world/README.md @@ -95,7 +95,7 @@ package is declared in the file `package.json`: }, "dependencies": { - "@jupyterlab/application": "^3.0.0-rc.0" + "@jupyterlab/application": "^3.0.0-rc.2" ``` With this basic import setup, you can move on to construct a new instance diff --git a/main-menu/README.md b/main-menu/README.md index cce61cee..3c765702 100644 --- a/main-menu/README.md +++ b/main-menu/README.md @@ -89,8 +89,8 @@ After the execution of that command, `package.json` should list them in the }, "dependencies": { - "@jupyterlab/application": "^3.0.0-rc.0", - "@jupyterlab/mainmenu": "^3.0.0-rc.0", + "@jupyterlab/application": "^3.0.0-rc.2", + "@jupyterlab/mainmenu": "^3.0.0-rc.2", "@lumino/widgets": "^1.14.0" ``` From ad6fac706fa9adc2250735a3105d693bb5f66b02 Mon Sep 17 00:00:00 2001 From: Jeremy Tuloup Date: Thu, 5 Nov 2020 20:08:14 +0100 Subject: [PATCH 32/45] Update to the latest rc --- advanced/kernel-messaging/install.json | 5 ++++ advanced/kernel-messaging/package.json | 19 ++++++++------- advanced/kernel-messaging/setup.py | 13 ++++++---- advanced/kernel-output/install.json | 5 ++++ advanced/kernel-output/package.json | 19 ++++++++------- advanced/kernel-output/setup.py | 13 ++++++---- advanced/server-extension/install.json | 5 ++++ advanced/server-extension/package.json | 17 +++++++------ advanced/server-extension/setup.py | 13 ++++++---- basics/datagrid/install.json | 5 ++++ basics/datagrid/package.json | 15 ++++++------ basics/datagrid/setup.py | 13 ++++++---- basics/hello-world/README.md | 2 +- basics/hello-world/install.json | 5 ++++ basics/hello-world/package.json | 11 +++++---- basics/hello-world/setup.py | 13 ++++++---- basics/signals/install.json | 5 ++++ basics/signals/package.json | 17 +++++++------ basics/signals/setup.py | 13 ++++++---- command-palette/install.json | 5 ++++ command-palette/package.json | 11 +++++---- command-palette/setup.py | 13 ++++++---- commands/install.json | 5 ++++ commands/package.json | 11 +++++---- commands/setup.py | 13 ++++++---- context-menu/install.json | 5 ++++ context-menu/package.json | 17 +++++++------ context-menu/setup.py | 13 ++++++---- launcher/install.json | 5 ++++ launcher/package.json | 17 +++++++------ launcher/setup.py | 13 ++++++---- log-console/custom-log-console/install.json | 5 ++++ log-console/custom-log-console/package.json | 25 ++++++++++--------- log-console/custom-log-console/setup.py | 13 ++++++---- log-console/log-messages/install.json | 5 ++++ log-console/log-messages/package.json | 27 +++++++++++---------- log-console/log-messages/setup.py | 13 ++++++---- main-menu/README.md | 4 +-- main-menu/install.json | 5 ++++ main-menu/package.json | 13 +++++----- main-menu/setup.py | 13 ++++++---- react/react-widget/install.json | 5 ++++ react/react-widget/package.json | 15 ++++++------ react/react-widget/setup.py | 13 ++++++---- settings/install.json | 5 ++++ settings/package.json | 15 ++++++------ settings/setup.py | 13 ++++++---- state/install.json | 5 ++++ state/package.json | 15 ++++++------ state/setup.py | 13 ++++++---- widget-tracker/widgets/install.json | 5 ++++ widget-tracker/widgets/package.json | 13 +++++----- widget-tracker/widgets/setup.py | 13 ++++++---- 53 files changed, 371 insertions(+), 218 deletions(-) create mode 100644 advanced/kernel-messaging/install.json create mode 100644 advanced/kernel-output/install.json create mode 100644 advanced/server-extension/install.json create mode 100644 basics/datagrid/install.json create mode 100644 basics/hello-world/install.json create mode 100644 basics/signals/install.json create mode 100644 command-palette/install.json create mode 100644 commands/install.json create mode 100644 context-menu/install.json create mode 100644 launcher/install.json create mode 100644 log-console/custom-log-console/install.json create mode 100644 log-console/log-messages/install.json create mode 100644 main-menu/install.json create mode 100644 react/react-widget/install.json create mode 100644 settings/install.json create mode 100644 state/install.json create mode 100644 widget-tracker/widgets/install.json diff --git a/advanced/kernel-messaging/install.json b/advanced/kernel-messaging/install.json new file mode 100644 index 00000000..97ae33da --- /dev/null +++ b/advanced/kernel-messaging/install.json @@ -0,0 +1,5 @@ +{ + "packageManager": "python", + "packageName": "jupyterlab_examples_kernel_messaging", + "uninstallInstructions": "Use your Python package manager (pip, conda, etc.) to uninstall the package jupyterlab_examples_kernel_messaging" +} diff --git a/advanced/kernel-messaging/package.json b/advanced/kernel-messaging/package.json index 72a984dd..d675eaf1 100644 --- a/advanced/kernel-messaging/package.json +++ b/advanced/kernel-messaging/package.json @@ -25,29 +25,30 @@ "url": "https://github.com/jupyterlab/extension-examples.git" }, "scripts": { - "build": "jlpm run build:lib && jlpm run build:labextension", + "build": "jlpm run build:lib && jlpm run build:labextension:dev", "build:all": "jlpm run build:lib && jlpm run build:labextension", "build:labextension": "jupyter labextension build .", "build:labextension:dev": "jupyter labextension build --development True .", "build:lib": "tsc", + "build:prod": "jlpm run build:lib && jlpm run build:labextension", "clean": "jlpm run clean:lib", "clean:all": "jlpm run clean:lib && jlpm run clean:labextension", - "clean:labextension": "rimraf jupyterlab_examples_kernel_messaging/static", + "clean:labextension": "rimraf jupyterlab_examples_kernel_messaging/labextension", "clean:lib": "rimraf lib tsconfig.tsbuildinfo", "eslint": "eslint . --ext .ts,.tsx --fix", "eslint:check": "eslint . --ext .ts,.tsx", "install:extension": "jupyter labextension develop --overwrite .", - "prepare": "jlpm run clean && jlpm run build", + "prepare": "jlpm run clean && jlpm run build:prod", "watch": "run-p watch:src watch:labextension", "watch:labextension": "jupyter labextension watch .", "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "^3.0.0-rc.2", - "@jupyterlab/launcher": "^3.0.0-rc.2", - "@jupyterlab/mainmenu": "^3.0.0-rc.2", - "@jupyterlab/nbformat": "^3.0.0-rc.2", - "@jupyterlab/translation": "^3.0.0-rc.2", + "@jupyterlab/application": "^3.0.0-rc.7", + "@jupyterlab/launcher": "^3.0.0-rc.7", + "@jupyterlab/mainmenu": "^3.0.0-rc.7", + "@jupyterlab/nbformat": "^3.0.0-rc.7", + "@jupyterlab/translation": "^3.0.0-rc.7", "@lumino/algorithm": "^1.3.3", "@lumino/coreutils": "^1.5.3", "@lumino/datagrid": "^0.5.2", @@ -55,7 +56,7 @@ "@lumino/widgets": "^1.14.0" }, "devDependencies": { - "@jupyterlab/builder": "^3.0.0-rc.2", + "@jupyterlab/builder": "^3.0.0-rc.7", "@typescript-eslint/eslint-plugin": "^2.27.0", "@typescript-eslint/parser": "^2.27.0", "eslint": "^7.5.0", diff --git a/advanced/kernel-messaging/setup.py b/advanced/kernel-messaging/setup.py index 74f5d69b..754f3005 100644 --- a/advanced/kernel-messaging/setup.py +++ b/advanced/kernel-messaging/setup.py @@ -1,6 +1,7 @@ """ jupyterlab_examples_kernel_messaging setup """ +import json import os from jupyter_packaging import ( @@ -15,14 +16,15 @@ name="jupyterlab_examples_kernel_messaging" # Get our version -version = get_version(os.path.join(name, "_version.py")) +with open(os.path.join(HERE, 'package.json')) as f: + version = json.load(f)['version'] -lab_path = os.path.join(HERE, name, "static") +lab_path = os.path.join(HERE, name, "labextension") # Representative files that should exist after a successful build jstargets = [ os.path.join(HERE, "lib", "index.js"), - os.path.join(HERE, name, "static", "package.json"), + os.path.join(lab_path, "package.json"), ] package_data_spec = { @@ -34,7 +36,8 @@ labext_name = "@jupyterlab-examples/kernel-messaging" data_files_spec = [ - ("share/jupyter/labextensions/%s" % labext_name, lab_path, "*.*"), + ("share/jupyter/labextensions/%s" % labext_name, lab_path, "**"), + ("share/jupyter/labextensions/%s" % labext_name, HERE, "install.json"), ] cmdclass = create_cmdclass("jsdeps", @@ -43,7 +46,7 @@ ) cmdclass["jsdeps"] = combine_commands( - install_npm(HERE, build_cmd="build", npm=["jlpm"]), + install_npm(HERE, build_cmd="build:prod", npm=["jlpm"]), ensure_targets(jstargets), ) diff --git a/advanced/kernel-output/install.json b/advanced/kernel-output/install.json new file mode 100644 index 00000000..4b8ad737 --- /dev/null +++ b/advanced/kernel-output/install.json @@ -0,0 +1,5 @@ +{ + "packageManager": "python", + "packageName": "jupyterlab_examples_kernel_output", + "uninstallInstructions": "Use your Python package manager (pip, conda, etc.) to uninstall the package jupyterlab_examples_kernel_output" +} diff --git a/advanced/kernel-output/package.json b/advanced/kernel-output/package.json index 51c833ef..e52dfbcd 100644 --- a/advanced/kernel-output/package.json +++ b/advanced/kernel-output/package.json @@ -25,36 +25,37 @@ "url": "https://github.com/jupyterlab/extension-examples.git" }, "scripts": { - "build": "jlpm run build:lib && jlpm run build:labextension", + "build": "jlpm run build:lib && jlpm run build:labextension:dev", "build:all": "jlpm run build:lib && jlpm run build:labextension", "build:labextension": "jupyter labextension build .", "build:labextension:dev": "jupyter labextension build --development True .", "build:lib": "tsc", + "build:prod": "jlpm run build:lib && jlpm run build:labextension", "clean": "jlpm run clean:lib", "clean:all": "jlpm run clean:lib && jlpm run clean:labextension", - "clean:labextension": "rimraf jupyterlab_examples_kernel_output/static", + "clean:labextension": "rimraf jupyterlab_examples_kernel_output/labextension", "clean:lib": "rimraf lib tsconfig.tsbuildinfo", "eslint": "eslint . --ext .ts,.tsx --fix", "eslint:check": "eslint . --ext .ts,.tsx", "install:extension": "jupyter labextension develop --overwrite .", - "prepare": "jlpm run clean && jlpm run build", + "prepare": "jlpm run clean && jlpm run build:prod", "watch": "run-p watch:src watch:labextension", "watch:labextension": "jupyter labextension watch .", "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "^3.0.0-rc.2", - "@jupyterlab/launcher": "^3.0.0-rc.2", - "@jupyterlab/mainmenu": "^3.0.0-rc.2", - "@jupyterlab/outputarea": "^3.0.0-rc.2", - "@jupyterlab/translation": "^3.0.0-rc.2", + "@jupyterlab/application": "^3.0.0-rc.7", + "@jupyterlab/launcher": "^3.0.0-rc.7", + "@jupyterlab/mainmenu": "^3.0.0-rc.7", + "@jupyterlab/outputarea": "^3.0.0-rc.7", + "@jupyterlab/translation": "^3.0.0-rc.7", "@lumino/algorithm": "^1.3.3", "@lumino/coreutils": "^1.5.3", "@lumino/datagrid": "^0.3.1", "@lumino/disposable": "^1.4.3" }, "devDependencies": { - "@jupyterlab/builder": "^3.0.0-rc.2", + "@jupyterlab/builder": "^3.0.0-rc.7", "@typescript-eslint/eslint-plugin": "^2.27.0", "@typescript-eslint/parser": "^2.27.0", "eslint": "^7.5.0", diff --git a/advanced/kernel-output/setup.py b/advanced/kernel-output/setup.py index 6882deef..246977cd 100644 --- a/advanced/kernel-output/setup.py +++ b/advanced/kernel-output/setup.py @@ -1,6 +1,7 @@ """ jupyterlab_examples_kernel_output setup """ +import json import os from jupyter_packaging import ( @@ -15,14 +16,15 @@ name="jupyterlab_examples_kernel_output" # Get our version -version = get_version(os.path.join(name, "_version.py")) +with open(os.path.join(HERE, 'package.json')) as f: + version = json.load(f)['version'] -lab_path = os.path.join(HERE, name, "static") +lab_path = os.path.join(HERE, name, "labextension") # Representative files that should exist after a successful build jstargets = [ os.path.join(HERE, "lib", "index.js"), - os.path.join(HERE, name, "static", "package.json"), + os.path.join(lab_path, "package.json"), ] package_data_spec = { @@ -34,7 +36,8 @@ labext_name = "@jupyterlab-examples/kernel-output" data_files_spec = [ - ("share/jupyter/labextensions/%s" % labext_name, lab_path, "*.*"), + ("share/jupyter/labextensions/%s" % labext_name, lab_path, "**"), + ("share/jupyter/labextensions/%s" % labext_name, HERE, "install.json"), ] cmdclass = create_cmdclass("jsdeps", @@ -43,7 +46,7 @@ ) cmdclass["jsdeps"] = combine_commands( - install_npm(HERE, build_cmd="build", npm=["jlpm"]), + install_npm(HERE, build_cmd="build:prod", npm=["jlpm"]), ensure_targets(jstargets), ) diff --git a/advanced/server-extension/install.json b/advanced/server-extension/install.json new file mode 100644 index 00000000..772fb6ad --- /dev/null +++ b/advanced/server-extension/install.json @@ -0,0 +1,5 @@ +{ + "packageManager": "python", + "packageName": "jlab_ext_example", + "uninstallInstructions": "Use your Python package manager (pip, conda, etc.) to uninstall the package jlab_ext_example" +} diff --git a/advanced/server-extension/package.json b/advanced/server-extension/package.json index 2c08b6d8..f6bf7f1c 100644 --- a/advanced/server-extension/package.json +++ b/advanced/server-extension/package.json @@ -25,31 +25,32 @@ "url": "https://github.com/jupyterlab/extension-examples.git" }, "scripts": { - "build": "jlpm run build:lib && jlpm run build:labextension", + "build": "jlpm run build:lib && jlpm run build:labextension:dev", "build:all": "jlpm run build:lib && jlpm run build:labextension", "build:labextension": "jupyter labextension build .", "build:labextension:dev": "jupyter labextension build --development True .", "build:lib": "tsc", + "build:prod": "jlpm run build:lib && jlpm run build:labextension", "clean": "jlpm run clean:lib", "clean:all": "jlpm run clean:lib && jlpm run clean:labextension", - "clean:labextension": "rimraf jlab_ext_example/static", + "clean:labextension": "rimraf jlab_ext_example/labextension", "clean:lib": "rimraf lib tsconfig.tsbuildinfo", "eslint": "eslint . --ext .ts,.tsx --fix", "eslint:check": "eslint . --ext .ts,.tsx", "install:extension": "jupyter labextension develop --overwrite .", - "prepare": "jlpm run clean && jlpm run build", + "prepare": "jlpm run clean && jlpm run build:prod", "watch": "run-p watch:src watch:labextension", "watch:labextension": "jupyter labextension watch .", "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "^3.0.0-rc.2", - "@jupyterlab/coreutils": "^5.0.0-rc.2", - "@jupyterlab/launcher": "^3.0.0-rc.2", - "@jupyterlab/services": "^6.0.0-rc.2" + "@jupyterlab/application": "^3.0.0-rc.7", + "@jupyterlab/coreutils": "^5.0.0-rc.7", + "@jupyterlab/launcher": "^3.0.0-rc.7", + "@jupyterlab/services": "^6.0.0-rc.7" }, "devDependencies": { - "@jupyterlab/builder": "^3.0.0-rc.2", + "@jupyterlab/builder": "^3.0.0-rc.7", "@typescript-eslint/eslint-plugin": "^2.27.0", "@typescript-eslint/parser": "^2.27.0", "eslint": "^7.5.0", diff --git a/advanced/server-extension/setup.py b/advanced/server-extension/setup.py index 7ab40eb3..88abcd2d 100644 --- a/advanced/server-extension/setup.py +++ b/advanced/server-extension/setup.py @@ -1,6 +1,7 @@ """ jlab_ext_example setup """ +import json import os from jupyter_packaging import ( @@ -15,14 +16,15 @@ name="jlab_ext_example" # Get our version -version = get_version(os.path.join(name, "_version.py")) +with open(os.path.join(HERE, 'package.json')) as f: + version = json.load(f)['version'] -lab_path = os.path.join(HERE, name, "static") +lab_path = os.path.join(HERE, name, "labextension") # Representative files that should exist after a successful build jstargets = [ os.path.join(HERE, "lib", "index.js"), - os.path.join(HERE, name, "static", "package.json"), + os.path.join(lab_path, "package.json"), ] package_data_spec = { @@ -34,7 +36,8 @@ labext_name = "@jupyterlab-examples/server-extension" data_files_spec = [ - ("share/jupyter/labextensions/%s" % labext_name, lab_path, "*.*"),("etc/jupyter/jupyter_server_config.d", + ("share/jupyter/labextensions/%s" % labext_name, lab_path, "**"), + ("share/jupyter/labextensions/%s" % labext_name, HERE, "install.json"),("etc/jupyter/jupyter_server_config.d", "jupyter-config", "jlab_ext_example.json"), ] @@ -45,7 +48,7 @@ ) cmdclass["jsdeps"] = combine_commands( - install_npm(HERE, build_cmd="build", npm=["jlpm"]), + install_npm(HERE, build_cmd="build:prod", npm=["jlpm"]), ensure_targets(jstargets), ) diff --git a/basics/datagrid/install.json b/basics/datagrid/install.json new file mode 100644 index 00000000..d35e2f7a --- /dev/null +++ b/basics/datagrid/install.json @@ -0,0 +1,5 @@ +{ + "packageManager": "python", + "packageName": "jupyterlab_examples_datagrid", + "uninstallInstructions": "Use your Python package manager (pip, conda, etc.) to uninstall the package jupyterlab_examples_datagrid" +} diff --git a/basics/datagrid/package.json b/basics/datagrid/package.json index 41b0325c..b74f0630 100644 --- a/basics/datagrid/package.json +++ b/basics/datagrid/package.json @@ -25,34 +25,35 @@ "url": "https://github.com/jupyterlab/extension-examples.git" }, "scripts": { - "build": "jlpm run build:lib && jlpm run build:labextension", + "build": "jlpm run build:lib && jlpm run build:labextension:dev", "build:all": "jlpm run build:lib && jlpm run build:labextension", "build:labextension": "jupyter labextension build .", "build:labextension:dev": "jupyter labextension build --development True .", "build:lib": "tsc", + "build:prod": "jlpm run build:lib && jlpm run build:labextension", "clean": "jlpm run clean:lib", "clean:all": "jlpm run clean:lib && jlpm run clean:labextension", - "clean:labextension": "rimraf jupyterlab_examples_datagrid/static", + "clean:labextension": "rimraf jupyterlab_examples_datagrid/labextension", "clean:lib": "rimraf lib tsconfig.tsbuildinfo", "eslint": "eslint . --ext .ts,.tsx --fix", "eslint:check": "eslint . --ext .ts,.tsx", "install:extension": "jupyter labextension develop --overwrite .", - "prepare": "jlpm run clean && jlpm run build", + "prepare": "jlpm run clean && jlpm run build:prod", "watch": "run-p watch:src watch:labextension", "watch:labextension": "jupyter labextension watch .", "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "^3.0.0-rc.2", - "@jupyterlab/mainmenu": "^3.0.0-rc.2", - "@jupyterlab/translation": "^3.0.0-rc.2", + "@jupyterlab/application": "^3.0.0-rc.7", + "@jupyterlab/mainmenu": "^3.0.0-rc.7", + "@jupyterlab/translation": "^3.0.0-rc.7", "@lumino/algorithm": "^1.3.3", "@lumino/coreutils": "^1.5.3", "@lumino/datagrid": "^0.5.2", "@lumino/disposable": "^1.4.3" }, "devDependencies": { - "@jupyterlab/builder": "^3.0.0-rc.2", + "@jupyterlab/builder": "^3.0.0-rc.7", "@typescript-eslint/eslint-plugin": "^2.27.0", "@typescript-eslint/parser": "^2.27.0", "eslint": "^7.5.0", diff --git a/basics/datagrid/setup.py b/basics/datagrid/setup.py index 6b444e10..0f69870b 100644 --- a/basics/datagrid/setup.py +++ b/basics/datagrid/setup.py @@ -1,6 +1,7 @@ """ jupyterlab_examples_datagrid setup """ +import json import os from jupyter_packaging import ( @@ -15,14 +16,15 @@ name="jupyterlab_examples_datagrid" # Get our version -version = get_version(os.path.join(name, "_version.py")) +with open(os.path.join(HERE, 'package.json')) as f: + version = json.load(f)['version'] -lab_path = os.path.join(HERE, name, "static") +lab_path = os.path.join(HERE, name, "labextension") # Representative files that should exist after a successful build jstargets = [ os.path.join(HERE, "lib", "index.js"), - os.path.join(HERE, name, "static", "package.json"), + os.path.join(lab_path, "package.json"), ] package_data_spec = { @@ -34,7 +36,8 @@ labext_name = "@jupyterlab-examples/datagrid" data_files_spec = [ - ("share/jupyter/labextensions/%s" % labext_name, lab_path, "*.*"), + ("share/jupyter/labextensions/%s" % labext_name, lab_path, "**"), + ("share/jupyter/labextensions/%s" % labext_name, HERE, "install.json"), ] cmdclass = create_cmdclass("jsdeps", @@ -43,7 +46,7 @@ ) cmdclass["jsdeps"] = combine_commands( - install_npm(HERE, build_cmd="build", npm=["jlpm"]), + install_npm(HERE, build_cmd="build:prod", npm=["jlpm"]), ensure_targets(jstargets), ) diff --git a/basics/hello-world/README.md b/basics/hello-world/README.md index ea946b4a..ac9cb828 100644 --- a/basics/hello-world/README.md +++ b/basics/hello-world/README.md @@ -95,7 +95,7 @@ package is declared in the file `package.json`: }, "dependencies": { - "@jupyterlab/application": "^3.0.0-rc.2" + "@jupyterlab/application": "^3.0.0-rc.7" ``` With this basic import setup, you can move on to construct a new instance diff --git a/basics/hello-world/install.json b/basics/hello-world/install.json new file mode 100644 index 00000000..c867999e --- /dev/null +++ b/basics/hello-world/install.json @@ -0,0 +1,5 @@ +{ + "packageManager": "python", + "packageName": "jupyterlab_examples_hello_world", + "uninstallInstructions": "Use your Python package manager (pip, conda, etc.) to uninstall the package jupyterlab_examples_hello_world" +} diff --git a/basics/hello-world/package.json b/basics/hello-world/package.json index 04c013cf..63c786fd 100644 --- a/basics/hello-world/package.json +++ b/basics/hello-world/package.json @@ -25,28 +25,29 @@ "url": "https://github.com/jupyterlab/extension-examples.git" }, "scripts": { - "build": "jlpm run build:lib && jlpm run build:labextension", + "build": "jlpm run build:lib && jlpm run build:labextension:dev", "build:all": "jlpm run build:lib && jlpm run build:labextension", "build:labextension": "jupyter labextension build .", "build:labextension:dev": "jupyter labextension build --development True .", "build:lib": "tsc", + "build:prod": "jlpm run build:lib && jlpm run build:labextension", "clean": "jlpm run clean:lib", "clean:all": "jlpm run clean:lib && jlpm run clean:labextension", - "clean:labextension": "rimraf jupyterlab_examples_hello_world/static", + "clean:labextension": "rimraf jupyterlab_examples_hello_world/labextension", "clean:lib": "rimraf lib tsconfig.tsbuildinfo", "eslint": "eslint . --ext .ts,.tsx --fix", "eslint:check": "eslint . --ext .ts,.tsx", "install:extension": "jupyter labextension develop --overwrite .", - "prepare": "jlpm run clean && jlpm run build", + "prepare": "jlpm run clean && jlpm run build:prod", "watch": "run-p watch:src watch:labextension", "watch:labextension": "jupyter labextension watch .", "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "^3.0.0-rc.2" + "@jupyterlab/application": "^3.0.0-rc.7" }, "devDependencies": { - "@jupyterlab/builder": "^3.0.0-rc.2", + "@jupyterlab/builder": "^3.0.0-rc.7", "@typescript-eslint/eslint-plugin": "^2.27.0", "@typescript-eslint/parser": "^2.27.0", "eslint": "^7.5.0", diff --git a/basics/hello-world/setup.py b/basics/hello-world/setup.py index ee01a2bd..ebe26d4f 100644 --- a/basics/hello-world/setup.py +++ b/basics/hello-world/setup.py @@ -1,6 +1,7 @@ """ jupyterlab_examples_hello_world setup """ +import json import os from jupyter_packaging import ( @@ -15,14 +16,15 @@ name="jupyterlab_examples_hello_world" # Get our version -version = get_version(os.path.join(name, "_version.py")) +with open(os.path.join(HERE, 'package.json')) as f: + version = json.load(f)['version'] -lab_path = os.path.join(HERE, name, "static") +lab_path = os.path.join(HERE, name, "labextension") # Representative files that should exist after a successful build jstargets = [ os.path.join(HERE, "lib", "index.js"), - os.path.join(HERE, name, "static", "package.json"), + os.path.join(lab_path, "package.json"), ] package_data_spec = { @@ -34,7 +36,8 @@ labext_name = "@jupyterlab-examples/hello-world" data_files_spec = [ - ("share/jupyter/labextensions/%s" % labext_name, lab_path, "*.*"), + ("share/jupyter/labextensions/%s" % labext_name, lab_path, "**"), + ("share/jupyter/labextensions/%s" % labext_name, HERE, "install.json"), ] cmdclass = create_cmdclass("jsdeps", @@ -43,7 +46,7 @@ ) cmdclass["jsdeps"] = combine_commands( - install_npm(HERE, build_cmd="build", npm=["jlpm"]), + install_npm(HERE, build_cmd="build:prod", npm=["jlpm"]), ensure_targets(jstargets), ) diff --git a/basics/signals/install.json b/basics/signals/install.json new file mode 100644 index 00000000..81d834da --- /dev/null +++ b/basics/signals/install.json @@ -0,0 +1,5 @@ +{ + "packageManager": "python", + "packageName": "jupyterlab_examples_signals", + "uninstallInstructions": "Use your Python package manager (pip, conda, etc.) to uninstall the package jupyterlab_examples_signals" +} diff --git a/basics/signals/package.json b/basics/signals/package.json index 5b47fecf..c00a7efd 100644 --- a/basics/signals/package.json +++ b/basics/signals/package.json @@ -25,35 +25,36 @@ "url": "https://github.com/jupyterlab/extension-examples.git" }, "scripts": { - "build": "jlpm run build:lib && jlpm run build:labextension", + "build": "jlpm run build:lib && jlpm run build:labextension:dev", "build:all": "jlpm run build:lib && jlpm run build:labextension", "build:labextension": "jupyter labextension build .", "build:labextension:dev": "jupyter labextension build --development True .", "build:lib": "tsc", + "build:prod": "jlpm run build:lib && jlpm run build:labextension", "clean": "jlpm run clean:lib", "clean:all": "jlpm run clean:lib && jlpm run clean:labextension", - "clean:labextension": "rimraf jupyterlab_examples_signals/static", + "clean:labextension": "rimraf jupyterlab_examples_signals/labextension", "clean:lib": "rimraf lib tsconfig.tsbuildinfo", "eslint": "eslint . --ext .ts,.tsx --fix", "eslint:check": "eslint . --ext .ts,.tsx", "install:extension": "jupyter labextension develop --overwrite .", - "prepare": "jlpm run clean && jlpm run build", + "prepare": "jlpm run clean && jlpm run build:prod", "watch": "run-p watch:src watch:labextension", "watch:labextension": "jupyter labextension watch .", "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "^3.0.0-rc.2", - "@jupyterlab/launcher": "^3.0.0-rc.2", - "@jupyterlab/mainmenu": "^3.0.0-rc.2", - "@jupyterlab/translation": "^3.0.0-rc.2", + "@jupyterlab/application": "^3.0.0-rc.7", + "@jupyterlab/launcher": "^3.0.0-rc.7", + "@jupyterlab/mainmenu": "^3.0.0-rc.7", + "@jupyterlab/translation": "^3.0.0-rc.7", "@lumino/algorithm": "^1.3.3", "@lumino/coreutils": "^1.5.3", "@lumino/datagrid": "^0.3.1", "@lumino/disposable": "^1.4.3" }, "devDependencies": { - "@jupyterlab/builder": "^3.0.0-rc.2", + "@jupyterlab/builder": "^3.0.0-rc.7", "@typescript-eslint/eslint-plugin": "^2.27.0", "@typescript-eslint/parser": "^2.27.0", "eslint": "^7.5.0", diff --git a/basics/signals/setup.py b/basics/signals/setup.py index 0a33d3cf..80747814 100644 --- a/basics/signals/setup.py +++ b/basics/signals/setup.py @@ -1,6 +1,7 @@ """ jupyterlab_examples_signals setup """ +import json import os from jupyter_packaging import ( @@ -15,14 +16,15 @@ name="jupyterlab_examples_signals" # Get our version -version = get_version(os.path.join(name, "_version.py")) +with open(os.path.join(HERE, 'package.json')) as f: + version = json.load(f)['version'] -lab_path = os.path.join(HERE, name, "static") +lab_path = os.path.join(HERE, name, "labextension") # Representative files that should exist after a successful build jstargets = [ os.path.join(HERE, "lib", "index.js"), - os.path.join(HERE, name, "static", "package.json"), + os.path.join(lab_path, "package.json"), ] package_data_spec = { @@ -34,7 +36,8 @@ labext_name = "@jupyterlab-examples/signals" data_files_spec = [ - ("share/jupyter/labextensions/%s" % labext_name, lab_path, "*.*"), + ("share/jupyter/labextensions/%s" % labext_name, lab_path, "**"), + ("share/jupyter/labextensions/%s" % labext_name, HERE, "install.json"), ] cmdclass = create_cmdclass("jsdeps", @@ -43,7 +46,7 @@ ) cmdclass["jsdeps"] = combine_commands( - install_npm(HERE, build_cmd="build", npm=["jlpm"]), + install_npm(HERE, build_cmd="build:prod", npm=["jlpm"]), ensure_targets(jstargets), ) diff --git a/command-palette/install.json b/command-palette/install.json new file mode 100644 index 00000000..c7c38a01 --- /dev/null +++ b/command-palette/install.json @@ -0,0 +1,5 @@ +{ + "packageManager": "python", + "packageName": "jupyterlab_examples_command_palette", + "uninstallInstructions": "Use your Python package manager (pip, conda, etc.) to uninstall the package jupyterlab_examples_command_palette" +} diff --git a/command-palette/package.json b/command-palette/package.json index c7f98c3e..fe78619f 100644 --- a/command-palette/package.json +++ b/command-palette/package.json @@ -25,28 +25,29 @@ "url": "https://github.com/jupyterlab/extension-examples.git" }, "scripts": { - "build": "jlpm run build:lib && jlpm run build:labextension", + "build": "jlpm run build:lib && jlpm run build:labextension:dev", "build:all": "jlpm run build:lib && jlpm run build:labextension", "build:labextension": "jupyter labextension build .", "build:labextension:dev": "jupyter labextension build --development True .", "build:lib": "tsc", + "build:prod": "jlpm run build:lib && jlpm run build:labextension", "clean": "jlpm run clean:lib", "clean:all": "jlpm run clean:lib && jlpm run clean:labextension", - "clean:labextension": "rimraf jupyterlab_examples_command_palette/static", + "clean:labextension": "rimraf jupyterlab_examples_command_palette/labextension", "clean:lib": "rimraf lib tsconfig.tsbuildinfo", "eslint": "eslint . --ext .ts,.tsx --fix", "eslint:check": "eslint . --ext .ts,.tsx", "install:extension": "jupyter labextension develop --overwrite .", - "prepare": "jlpm run clean && jlpm run build", + "prepare": "jlpm run clean && jlpm run build:prod", "watch": "run-p watch:src watch:labextension", "watch:labextension": "jupyter labextension watch .", "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "^3.0.0-rc.2" + "@jupyterlab/application": "^3.0.0-rc.7" }, "devDependencies": { - "@jupyterlab/builder": "^3.0.0-rc.2", + "@jupyterlab/builder": "^3.0.0-rc.7", "@typescript-eslint/eslint-plugin": "^2.27.0", "@typescript-eslint/parser": "^2.27.0", "eslint": "^7.5.0", diff --git a/command-palette/setup.py b/command-palette/setup.py index b8831a51..ff21cfb1 100644 --- a/command-palette/setup.py +++ b/command-palette/setup.py @@ -1,6 +1,7 @@ """ jupyterlab_examples_command_palette setup """ +import json import os from jupyter_packaging import ( @@ -15,14 +16,15 @@ name="jupyterlab_examples_command_palette" # Get our version -version = get_version(os.path.join(name, "_version.py")) +with open(os.path.join(HERE, 'package.json')) as f: + version = json.load(f)['version'] -lab_path = os.path.join(HERE, name, "static") +lab_path = os.path.join(HERE, name, "labextension") # Representative files that should exist after a successful build jstargets = [ os.path.join(HERE, "lib", "index.js"), - os.path.join(HERE, name, "static", "package.json"), + os.path.join(lab_path, "package.json"), ] package_data_spec = { @@ -34,7 +36,8 @@ labext_name = "@jupyterlab-examples/command-palette" data_files_spec = [ - ("share/jupyter/labextensions/%s" % labext_name, lab_path, "*.*"), + ("share/jupyter/labextensions/%s" % labext_name, lab_path, "**"), + ("share/jupyter/labextensions/%s" % labext_name, HERE, "install.json"), ] cmdclass = create_cmdclass("jsdeps", @@ -43,7 +46,7 @@ ) cmdclass["jsdeps"] = combine_commands( - install_npm(HERE, build_cmd="build", npm=["jlpm"]), + install_npm(HERE, build_cmd="build:prod", npm=["jlpm"]), ensure_targets(jstargets), ) diff --git a/commands/install.json b/commands/install.json new file mode 100644 index 00000000..ea862194 --- /dev/null +++ b/commands/install.json @@ -0,0 +1,5 @@ +{ + "packageManager": "python", + "packageName": "jupyterlab_examples_commands", + "uninstallInstructions": "Use your Python package manager (pip, conda, etc.) to uninstall the package jupyterlab_examples_commands" +} diff --git a/commands/package.json b/commands/package.json index d72495b2..8166c227 100644 --- a/commands/package.json +++ b/commands/package.json @@ -25,28 +25,29 @@ "url": "https://github.com/jupyterlab/extension-examples.git" }, "scripts": { - "build": "jlpm run build:lib && jlpm run build:labextension", + "build": "jlpm run build:lib && jlpm run build:labextension:dev", "build:all": "jlpm run build:lib && jlpm run build:labextension", "build:labextension": "jupyter labextension build .", "build:labextension:dev": "jupyter labextension build --development True .", "build:lib": "tsc", + "build:prod": "jlpm run build:lib && jlpm run build:labextension", "clean": "jlpm run clean:lib", "clean:all": "jlpm run clean:lib && jlpm run clean:labextension", - "clean:labextension": "rimraf jupyterlab_examples_commands/static", + "clean:labextension": "rimraf jupyterlab_examples_commands/labextension", "clean:lib": "rimraf lib tsconfig.tsbuildinfo", "eslint": "eslint . --ext .ts,.tsx --fix", "eslint:check": "eslint . --ext .ts,.tsx", "install:extension": "jupyter labextension develop --overwrite .", - "prepare": "jlpm run clean && jlpm run build", + "prepare": "jlpm run clean && jlpm run build:prod", "watch": "run-p watch:src watch:labextension", "watch:labextension": "jupyter labextension watch .", "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "^3.0.0-rc.2" + "@jupyterlab/application": "^3.0.0-rc.7" }, "devDependencies": { - "@jupyterlab/builder": "^3.0.0-rc.2", + "@jupyterlab/builder": "^3.0.0-rc.7", "@typescript-eslint/eslint-plugin": "^2.27.0", "@typescript-eslint/parser": "^2.27.0", "eslint": "^7.5.0", diff --git a/commands/setup.py b/commands/setup.py index b1ffd560..826e28c4 100644 --- a/commands/setup.py +++ b/commands/setup.py @@ -1,6 +1,7 @@ """ jupyterlab_examples_commands setup """ +import json import os from jupyter_packaging import ( @@ -15,14 +16,15 @@ name="jupyterlab_examples_commands" # Get our version -version = get_version(os.path.join(name, "_version.py")) +with open(os.path.join(HERE, 'package.json')) as f: + version = json.load(f)['version'] -lab_path = os.path.join(HERE, name, "static") +lab_path = os.path.join(HERE, name, "labextension") # Representative files that should exist after a successful build jstargets = [ os.path.join(HERE, "lib", "index.js"), - os.path.join(HERE, name, "static", "package.json"), + os.path.join(lab_path, "package.json"), ] package_data_spec = { @@ -34,7 +36,8 @@ labext_name = "@jupyterlab-examples/commands" data_files_spec = [ - ("share/jupyter/labextensions/%s" % labext_name, lab_path, "*.*"), + ("share/jupyter/labextensions/%s" % labext_name, lab_path, "**"), + ("share/jupyter/labextensions/%s" % labext_name, HERE, "install.json"), ] cmdclass = create_cmdclass("jsdeps", @@ -43,7 +46,7 @@ ) cmdclass["jsdeps"] = combine_commands( - install_npm(HERE, build_cmd="build", npm=["jlpm"]), + install_npm(HERE, build_cmd="build:prod", npm=["jlpm"]), ensure_targets(jstargets), ) diff --git a/context-menu/install.json b/context-menu/install.json new file mode 100644 index 00000000..db8ba8e6 --- /dev/null +++ b/context-menu/install.json @@ -0,0 +1,5 @@ +{ + "packageManager": "python", + "packageName": "jupyterlab_examples_context_menu", + "uninstallInstructions": "Use your Python package manager (pip, conda, etc.) to uninstall the package jupyterlab_examples_context_menu" +} diff --git a/context-menu/package.json b/context-menu/package.json index 4960b14e..1722325a 100644 --- a/context-menu/package.json +++ b/context-menu/package.json @@ -25,31 +25,32 @@ "url": "https://github.com/jupyterlab/extension-examples.git" }, "scripts": { - "build": "jlpm run build:lib && jlpm run build:labextension", + "build": "jlpm run build:lib && jlpm run build:labextension:dev", "build:all": "jlpm run build:lib && jlpm run build:labextension", "build:labextension": "jupyter labextension build .", "build:labextension:dev": "jupyter labextension build --development True .", "build:lib": "tsc", + "build:prod": "jlpm run build:lib && jlpm run build:labextension", "clean": "jlpm run clean:lib", "clean:all": "jlpm run clean:lib && jlpm run clean:labextension", - "clean:labextension": "rimraf jupyterlab_examples_context_menu/static", + "clean:labextension": "rimraf jupyterlab_examples_context_menu/labextension", "clean:lib": "rimraf lib tsconfig.tsbuildinfo", "eslint": "eslint . --ext .ts,.tsx --fix", "eslint:check": "eslint . --ext .ts,.tsx", "install:extension": "jupyter labextension develop --overwrite .", - "prepare": "jlpm run clean && jlpm run build", + "prepare": "jlpm run clean && jlpm run build:prod", "watch": "run-p watch:src watch:labextension", "watch:labextension": "jupyter labextension watch .", "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "^3.0.0-rc.2", - "@jupyterlab/apputils": "^3.0.0-rc.2", - "@jupyterlab/filebrowser": "^3.0.0-rc.2", - "@jupyterlab/ui-components": "^3.0.0-rc.2" + "@jupyterlab/application": "^3.0.0-rc.7", + "@jupyterlab/apputils": "^3.0.0-rc.7", + "@jupyterlab/filebrowser": "^3.0.0-rc.7", + "@jupyterlab/ui-components": "^3.0.0-rc.7" }, "devDependencies": { - "@jupyterlab/builder": "^3.0.0-rc.2", + "@jupyterlab/builder": "^3.0.0-rc.7", "@typescript-eslint/eslint-plugin": "^2.27.0", "@typescript-eslint/parser": "^2.27.0", "eslint": "^7.5.0", diff --git a/context-menu/setup.py b/context-menu/setup.py index 21e5b00c..f7420e5e 100644 --- a/context-menu/setup.py +++ b/context-menu/setup.py @@ -1,6 +1,7 @@ """ jupyterlab_examples_context_menu setup """ +import json import os from jupyter_packaging import ( @@ -15,14 +16,15 @@ name="jupyterlab_examples_context_menu" # Get our version -version = get_version(os.path.join(name, "_version.py")) +with open(os.path.join(HERE, 'package.json')) as f: + version = json.load(f)['version'] -lab_path = os.path.join(HERE, name, "static") +lab_path = os.path.join(HERE, name, "labextension") # Representative files that should exist after a successful build jstargets = [ os.path.join(HERE, "lib", "index.js"), - os.path.join(HERE, name, "static", "package.json"), + os.path.join(lab_path, "package.json"), ] package_data_spec = { @@ -34,7 +36,8 @@ labext_name = "@jupyterlab-examples/context-menu" data_files_spec = [ - ("share/jupyter/labextensions/%s" % labext_name, lab_path, "*.*"), + ("share/jupyter/labextensions/%s" % labext_name, lab_path, "**"), + ("share/jupyter/labextensions/%s" % labext_name, HERE, "install.json"), ] cmdclass = create_cmdclass("jsdeps", @@ -43,7 +46,7 @@ ) cmdclass["jsdeps"] = combine_commands( - install_npm(HERE, build_cmd="build", npm=["jlpm"]), + install_npm(HERE, build_cmd="build:prod", npm=["jlpm"]), ensure_targets(jstargets), ) diff --git a/launcher/install.json b/launcher/install.json new file mode 100644 index 00000000..26ec5ef7 --- /dev/null +++ b/launcher/install.json @@ -0,0 +1,5 @@ +{ + "packageManager": "python", + "packageName": "jupyterlab_examples_launcher", + "uninstallInstructions": "Use your Python package manager (pip, conda, etc.) to uninstall the package jupyterlab_examples_launcher" +} diff --git a/launcher/package.json b/launcher/package.json index a2563a78..aec22651 100644 --- a/launcher/package.json +++ b/launcher/package.json @@ -25,31 +25,32 @@ "url": "https://github.com/jupyterlab/extension-examples.git" }, "scripts": { - "build": "jlpm run build:lib && jlpm run build:labextension", + "build": "jlpm run build:lib && jlpm run build:labextension:dev", "build:all": "jlpm run build:lib && jlpm run build:labextension", "build:labextension": "jupyter labextension build .", "build:labextension:dev": "jupyter labextension build --development True .", "build:lib": "tsc", + "build:prod": "jlpm run build:lib && jlpm run build:labextension", "clean": "jlpm run clean:lib", "clean:all": "jlpm run clean:lib && jlpm run clean:labextension", - "clean:labextension": "rimraf jupyterlab_examples_launcher/static", + "clean:labextension": "rimraf jupyterlab_examples_launcher/labextension", "clean:lib": "rimraf lib tsconfig.tsbuildinfo", "eslint": "eslint . --ext .ts,.tsx --fix", "eslint:check": "eslint . --ext .ts,.tsx", "install:extension": "jupyter labextension develop --overwrite .", - "prepare": "jlpm run clean && jlpm run build", + "prepare": "jlpm run clean && jlpm run build:prod", "watch": "run-p watch:src watch:labextension", "watch:labextension": "jupyter labextension watch .", "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "^3.0.0-rc.2", - "@jupyterlab/filebrowser": "^3.0.0-rc.2", - "@jupyterlab/launcher": "^3.0.0-rc.2", - "@jupyterlab/mainmenu": "^3.0.0-rc.2" + "@jupyterlab/application": "^3.0.0-rc.7", + "@jupyterlab/filebrowser": "^3.0.0-rc.7", + "@jupyterlab/launcher": "^3.0.0-rc.7", + "@jupyterlab/mainmenu": "^3.0.0-rc.7" }, "devDependencies": { - "@jupyterlab/builder": "^3.0.0-rc.2", + "@jupyterlab/builder": "^3.0.0-rc.7", "@typescript-eslint/eslint-plugin": "^2.27.0", "@typescript-eslint/parser": "^2.27.0", "eslint": "^7.5.0", diff --git a/launcher/setup.py b/launcher/setup.py index e480e930..3e645018 100644 --- a/launcher/setup.py +++ b/launcher/setup.py @@ -1,6 +1,7 @@ """ jupyterlab_examples_launcher setup """ +import json import os from jupyter_packaging import ( @@ -15,14 +16,15 @@ name="jupyterlab_examples_launcher" # Get our version -version = get_version(os.path.join(name, "_version.py")) +with open(os.path.join(HERE, 'package.json')) as f: + version = json.load(f)['version'] -lab_path = os.path.join(HERE, name, "static") +lab_path = os.path.join(HERE, name, "labextension") # Representative files that should exist after a successful build jstargets = [ os.path.join(HERE, "lib", "index.js"), - os.path.join(HERE, name, "static", "package.json"), + os.path.join(lab_path, "package.json"), ] package_data_spec = { @@ -34,7 +36,8 @@ labext_name = "@jupyterlab-examples/launcher" data_files_spec = [ - ("share/jupyter/labextensions/%s" % labext_name, lab_path, "*.*"), + ("share/jupyter/labextensions/%s" % labext_name, lab_path, "**"), + ("share/jupyter/labextensions/%s" % labext_name, HERE, "install.json"), ] cmdclass = create_cmdclass("jsdeps", @@ -43,7 +46,7 @@ ) cmdclass["jsdeps"] = combine_commands( - install_npm(HERE, build_cmd="build", npm=["jlpm"]), + install_npm(HERE, build_cmd="build:prod", npm=["jlpm"]), ensure_targets(jstargets), ) diff --git a/log-console/custom-log-console/install.json b/log-console/custom-log-console/install.json new file mode 100644 index 00000000..5e894618 --- /dev/null +++ b/log-console/custom-log-console/install.json @@ -0,0 +1,5 @@ +{ + "packageManager": "python", + "packageName": "jupyterlab_examples_custom_log_console", + "uninstallInstructions": "Use your Python package manager (pip, conda, etc.) to uninstall the package jupyterlab_examples_custom_log_console" +} diff --git a/log-console/custom-log-console/package.json b/log-console/custom-log-console/package.json index 5b7a69f6..2bae4842 100644 --- a/log-console/custom-log-console/package.json +++ b/log-console/custom-log-console/package.json @@ -25,37 +25,38 @@ "url": "https://github.com/jupyterlab/extension-examples.git" }, "scripts": { - "build": "jlpm run build:lib && jlpm run build:labextension", + "build": "jlpm run build:lib && jlpm run build:labextension:dev", "build:all": "jlpm run build:lib && jlpm run build:labextension", "build:labextension": "jupyter labextension build .", "build:labextension:dev": "jupyter labextension build --development True .", "build:lib": "tsc", + "build:prod": "jlpm run build:lib && jlpm run build:labextension", "clean": "jlpm run clean:lib", "clean:all": "jlpm run clean:lib && jlpm run clean:labextension", - "clean:labextension": "rimraf jupyterlab_examples_custom_log_console/static", + "clean:labextension": "rimraf jupyterlab_examples_custom_log_console/labextension", "clean:lib": "rimraf lib tsconfig.tsbuildinfo", "eslint": "eslint . --ext .ts,.tsx --fix", "eslint:check": "eslint . --ext .ts,.tsx", "install:extension": "jupyter labextension develop --overwrite .", - "prepare": "jlpm run clean && jlpm run build", + "prepare": "jlpm run clean && jlpm run build:prod", "watch": "run-p watch:src watch:labextension", "watch:labextension": "jupyter labextension watch .", "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "^3.0.0-rc.2", - "@jupyterlab/apputils": "^3.0.0-rc.2", - "@jupyterlab/coreutils": "^5.0.0-rc.2", - "@jupyterlab/logconsole": "^3.0.0-rc.2", - "@jupyterlab/mainmenu": "^3.0.0-rc.2", - "@jupyterlab/nbformat": "^3.0.0-rc.2", - "@jupyterlab/rendermime": "^3.0.0-rc.2", - "@jupyterlab/ui-components": "^3.0.0-rc.2", + "@jupyterlab/application": "^3.0.0-rc.7", + "@jupyterlab/apputils": "^3.0.0-rc.7", + "@jupyterlab/coreutils": "^5.0.0-rc.7", + "@jupyterlab/logconsole": "^3.0.0-rc.7", + "@jupyterlab/mainmenu": "^3.0.0-rc.7", + "@jupyterlab/nbformat": "^3.0.0-rc.7", + "@jupyterlab/rendermime": "^3.0.0-rc.7", + "@jupyterlab/ui-components": "^3.0.0-rc.7", "@lumino/coreutils": "^1.5.3", "@lumino/widgets": "^1.14.0" }, "devDependencies": { - "@jupyterlab/builder": "^3.0.0-rc.2", + "@jupyterlab/builder": "^3.0.0-rc.7", "@typescript-eslint/eslint-plugin": "^2.27.0", "@typescript-eslint/parser": "^2.27.0", "eslint": "^7.5.0", diff --git a/log-console/custom-log-console/setup.py b/log-console/custom-log-console/setup.py index aaccffd6..d496aad8 100644 --- a/log-console/custom-log-console/setup.py +++ b/log-console/custom-log-console/setup.py @@ -1,6 +1,7 @@ """ jupyterlab_examples_custom_log_console setup """ +import json import os from jupyter_packaging import ( @@ -15,14 +16,15 @@ name="jupyterlab_examples_custom_log_console" # Get our version -version = get_version(os.path.join(name, "_version.py")) +with open(os.path.join(HERE, 'package.json')) as f: + version = json.load(f)['version'] -lab_path = os.path.join(HERE, name, "static") +lab_path = os.path.join(HERE, name, "labextension") # Representative files that should exist after a successful build jstargets = [ os.path.join(HERE, "lib", "index.js"), - os.path.join(HERE, name, "static", "package.json"), + os.path.join(lab_path, "package.json"), ] package_data_spec = { @@ -34,7 +36,8 @@ labext_name = "@jupyterlab-examples/custom-log-console" data_files_spec = [ - ("share/jupyter/labextensions/%s" % labext_name, lab_path, "*.*"), + ("share/jupyter/labextensions/%s" % labext_name, lab_path, "**"), + ("share/jupyter/labextensions/%s" % labext_name, HERE, "install.json"), ] cmdclass = create_cmdclass("jsdeps", @@ -43,7 +46,7 @@ ) cmdclass["jsdeps"] = combine_commands( - install_npm(HERE, build_cmd="build", npm=["jlpm"]), + install_npm(HERE, build_cmd="build:prod", npm=["jlpm"]), ensure_targets(jstargets), ) diff --git a/log-console/log-messages/install.json b/log-console/log-messages/install.json new file mode 100644 index 00000000..be850e33 --- /dev/null +++ b/log-console/log-messages/install.json @@ -0,0 +1,5 @@ +{ + "packageManager": "python", + "packageName": "jupyterlab_examples_log_messages", + "uninstallInstructions": "Use your Python package manager (pip, conda, etc.) to uninstall the package jupyterlab_examples_log_messages" +} diff --git a/log-console/log-messages/package.json b/log-console/log-messages/package.json index 733ae095..2eeace5e 100644 --- a/log-console/log-messages/package.json +++ b/log-console/log-messages/package.json @@ -25,38 +25,39 @@ "url": "https://github.com/jupyterlab/extension-examples.git" }, "scripts": { - "build": "jlpm run build:lib && jlpm run build:labextension", + "build": "jlpm run build:lib && jlpm run build:labextension:dev", "build:all": "jlpm run build:lib && jlpm run build:labextension", "build:labextension": "jupyter labextension build .", "build:labextension:dev": "jupyter labextension build --development True .", "build:lib": "tsc", + "build:prod": "jlpm run build:lib && jlpm run build:labextension", "clean": "jlpm run clean:lib", "clean:all": "jlpm run clean:lib && jlpm run clean:labextension", - "clean:labextension": "rimraf jupyterlab_examples_log_messages/static", + "clean:labextension": "rimraf jupyterlab_examples_log_messages/labextension", "clean:lib": "rimraf lib tsconfig.tsbuildinfo", "eslint": "eslint . --ext .ts,.tsx --fix", "eslint:check": "eslint . --ext .ts,.tsx", "install:extension": "jupyter labextension develop --overwrite .", - "prepare": "jlpm run clean && jlpm run build", + "prepare": "jlpm run clean && jlpm run build:prod", "watch": "run-p watch:src watch:labextension", "watch:labextension": "jupyter labextension watch .", "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "^3.0.0-rc.2", - "@jupyterlab/apputils": "^3.0.0-rc.2", - "@jupyterlab/coreutils": "^5.0.0-rc.2", - "@jupyterlab/logconsole": "^3.0.0-rc.2", - "@jupyterlab/mainmenu": "^3.0.0-rc.2", - "@jupyterlab/nbformat": "^3.0.0-rc.2", - "@jupyterlab/notebook": "^3.0.0-rc.2", - "@jupyterlab/rendermime": "^3.0.0-rc.2", - "@jupyterlab/ui-components": "^3.0.0-rc.2", + "@jupyterlab/application": "^3.0.0-rc.7", + "@jupyterlab/apputils": "^3.0.0-rc.7", + "@jupyterlab/coreutils": "^5.0.0-rc.7", + "@jupyterlab/logconsole": "^3.0.0-rc.7", + "@jupyterlab/mainmenu": "^3.0.0-rc.7", + "@jupyterlab/nbformat": "^3.0.0-rc.7", + "@jupyterlab/notebook": "^3.0.0-rc.7", + "@jupyterlab/rendermime": "^3.0.0-rc.7", + "@jupyterlab/ui-components": "^3.0.0-rc.7", "@lumino/coreutils": "^1.5.3", "@lumino/widgets": "^1.14.0" }, "devDependencies": { - "@jupyterlab/builder": "^3.0.0-rc.2", + "@jupyterlab/builder": "^3.0.0-rc.7", "@typescript-eslint/eslint-plugin": "^2.27.0", "@typescript-eslint/parser": "^2.27.0", "eslint": "^7.5.0", diff --git a/log-console/log-messages/setup.py b/log-console/log-messages/setup.py index c3126dc0..2fecb102 100644 --- a/log-console/log-messages/setup.py +++ b/log-console/log-messages/setup.py @@ -1,6 +1,7 @@ """ jupyterlab_examples_log_messages setup """ +import json import os from jupyter_packaging import ( @@ -15,14 +16,15 @@ name="jupyterlab_examples_log_messages" # Get our version -version = get_version(os.path.join(name, "_version.py")) +with open(os.path.join(HERE, 'package.json')) as f: + version = json.load(f)['version'] -lab_path = os.path.join(HERE, name, "static") +lab_path = os.path.join(HERE, name, "labextension") # Representative files that should exist after a successful build jstargets = [ os.path.join(HERE, "lib", "index.js"), - os.path.join(HERE, name, "static", "package.json"), + os.path.join(lab_path, "package.json"), ] package_data_spec = { @@ -34,7 +36,8 @@ labext_name = "@jupyterlab-examples/log-messages" data_files_spec = [ - ("share/jupyter/labextensions/%s" % labext_name, lab_path, "*.*"), + ("share/jupyter/labextensions/%s" % labext_name, lab_path, "**"), + ("share/jupyter/labextensions/%s" % labext_name, HERE, "install.json"), ] cmdclass = create_cmdclass("jsdeps", @@ -43,7 +46,7 @@ ) cmdclass["jsdeps"] = combine_commands( - install_npm(HERE, build_cmd="build", npm=["jlpm"]), + install_npm(HERE, build_cmd="build:prod", npm=["jlpm"]), ensure_targets(jstargets), ) diff --git a/main-menu/README.md b/main-menu/README.md index 3c765702..b5e2e881 100644 --- a/main-menu/README.md +++ b/main-menu/README.md @@ -89,8 +89,8 @@ After the execution of that command, `package.json` should list them in the }, "dependencies": { - "@jupyterlab/application": "^3.0.0-rc.2", - "@jupyterlab/mainmenu": "^3.0.0-rc.2", + "@jupyterlab/application": "^3.0.0-rc.7", + "@jupyterlab/mainmenu": "^3.0.0-rc.7", "@lumino/widgets": "^1.14.0" ``` diff --git a/main-menu/install.json b/main-menu/install.json new file mode 100644 index 00000000..0749265a --- /dev/null +++ b/main-menu/install.json @@ -0,0 +1,5 @@ +{ + "packageManager": "python", + "packageName": "jupyterlab_examples_main_menu", + "uninstallInstructions": "Use your Python package manager (pip, conda, etc.) to uninstall the package jupyterlab_examples_main_menu" +} diff --git a/main-menu/package.json b/main-menu/package.json index ddd1d4aa..a7b810ec 100644 --- a/main-menu/package.json +++ b/main-menu/package.json @@ -25,30 +25,31 @@ "url": "https://github.com/jupyterlab/extension-examples.git" }, "scripts": { - "build": "jlpm run build:lib && jlpm run build:labextension", + "build": "jlpm run build:lib && jlpm run build:labextension:dev", "build:all": "jlpm run build:lib && jlpm run build:labextension", "build:labextension": "jupyter labextension build .", "build:labextension:dev": "jupyter labextension build --development True .", "build:lib": "tsc", + "build:prod": "jlpm run build:lib && jlpm run build:labextension", "clean": "jlpm run clean:lib", "clean:all": "jlpm run clean:lib && jlpm run clean:labextension", - "clean:labextension": "rimraf jupyterlab_examples_main_menu/static", + "clean:labextension": "rimraf jupyterlab_examples_main_menu/labextension", "clean:lib": "rimraf lib tsconfig.tsbuildinfo", "eslint": "eslint . --ext .ts,.tsx --fix", "eslint:check": "eslint . --ext .ts,.tsx", "install:extension": "jupyter labextension develop --overwrite .", - "prepare": "jlpm run clean && jlpm run build", + "prepare": "jlpm run clean && jlpm run build:prod", "watch": "run-p watch:src watch:labextension", "watch:labextension": "jupyter labextension watch .", "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "^3.0.0-rc.2", - "@jupyterlab/mainmenu": "^3.0.0-rc.2", + "@jupyterlab/application": "^3.0.0-rc.7", + "@jupyterlab/mainmenu": "^3.0.0-rc.7", "@lumino/widgets": "^1.14.0" }, "devDependencies": { - "@jupyterlab/builder": "^3.0.0-rc.2", + "@jupyterlab/builder": "^3.0.0-rc.7", "@typescript-eslint/eslint-plugin": "^2.27.0", "@typescript-eslint/parser": "^2.27.0", "eslint": "^7.5.0", diff --git a/main-menu/setup.py b/main-menu/setup.py index c05e19b0..17fc7229 100644 --- a/main-menu/setup.py +++ b/main-menu/setup.py @@ -1,6 +1,7 @@ """ jupyterlab_examples_main_menu setup """ +import json import os from jupyter_packaging import ( @@ -15,14 +16,15 @@ name="jupyterlab_examples_main_menu" # Get our version -version = get_version(os.path.join(name, "_version.py")) +with open(os.path.join(HERE, 'package.json')) as f: + version = json.load(f)['version'] -lab_path = os.path.join(HERE, name, "static") +lab_path = os.path.join(HERE, name, "labextension") # Representative files that should exist after a successful build jstargets = [ os.path.join(HERE, "lib", "index.js"), - os.path.join(HERE, name, "static", "package.json"), + os.path.join(lab_path, "package.json"), ] package_data_spec = { @@ -34,7 +36,8 @@ labext_name = "@jupyterlab-examples/main-menu" data_files_spec = [ - ("share/jupyter/labextensions/%s" % labext_name, lab_path, "*.*"), + ("share/jupyter/labextensions/%s" % labext_name, lab_path, "**"), + ("share/jupyter/labextensions/%s" % labext_name, HERE, "install.json"), ] cmdclass = create_cmdclass("jsdeps", @@ -43,7 +46,7 @@ ) cmdclass["jsdeps"] = combine_commands( - install_npm(HERE, build_cmd="build", npm=["jlpm"]), + install_npm(HERE, build_cmd="build:prod", npm=["jlpm"]), ensure_targets(jstargets), ) diff --git a/react/react-widget/install.json b/react/react-widget/install.json new file mode 100644 index 00000000..add866c4 --- /dev/null +++ b/react/react-widget/install.json @@ -0,0 +1,5 @@ +{ + "packageManager": "python", + "packageName": "jupyterlab_examples_react_widget", + "uninstallInstructions": "Use your Python package manager (pip, conda, etc.) to uninstall the package jupyterlab_examples_react_widget" +} diff --git a/react/react-widget/package.json b/react/react-widget/package.json index f173083e..080060be 100644 --- a/react/react-widget/package.json +++ b/react/react-widget/package.json @@ -25,30 +25,31 @@ "url": "https://github.com/jupyterlab/extension-examples.git" }, "scripts": { - "build": "jlpm run build:lib && jlpm run build:labextension", + "build": "jlpm run build:lib && jlpm run build:labextension:dev", "build:all": "jlpm run build:lib && jlpm run build:labextension", "build:labextension": "jupyter labextension build .", "build:labextension:dev": "jupyter labextension build --development True .", "build:lib": "tsc", + "build:prod": "jlpm run build:lib && jlpm run build:labextension", "clean": "jlpm run clean:lib", "clean:all": "jlpm run clean:lib && jlpm run clean:labextension", - "clean:labextension": "rimraf jupyterlab_examples_react_widget/static", + "clean:labextension": "rimraf jupyterlab_examples_react_widget/labextension", "clean:lib": "rimraf lib tsconfig.tsbuildinfo", "eslint": "eslint . --ext .ts,.tsx --fix", "eslint:check": "eslint . --ext .ts,.tsx", "install:extension": "jupyter labextension develop --overwrite .", - "prepare": "jlpm run clean && jlpm run build", + "prepare": "jlpm run clean && jlpm run build:prod", "watch": "run-p watch:src watch:labextension", "watch:labextension": "jupyter labextension watch .", "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "^3.0.0-rc.2", - "@jupyterlab/launcher": "^3.0.0-rc.2", - "@jupyterlab/ui-components": "^3.0.0-rc.2" + "@jupyterlab/application": "^3.0.0-rc.7", + "@jupyterlab/launcher": "^3.0.0-rc.7", + "@jupyterlab/ui-components": "^3.0.0-rc.7" }, "devDependencies": { - "@jupyterlab/builder": "^3.0.0-rc.2", + "@jupyterlab/builder": "^3.0.0-rc.7", "@typescript-eslint/eslint-plugin": "^2.27.0", "@typescript-eslint/parser": "^2.27.0", "eslint": "^7.5.0", diff --git a/react/react-widget/setup.py b/react/react-widget/setup.py index 773bf515..be65051f 100644 --- a/react/react-widget/setup.py +++ b/react/react-widget/setup.py @@ -1,6 +1,7 @@ """ jupyterlab_examples_react_widget setup """ +import json import os from jupyter_packaging import ( @@ -15,14 +16,15 @@ name="jupyterlab_examples_react_widget" # Get our version -version = get_version(os.path.join(name, "_version.py")) +with open(os.path.join(HERE, 'package.json')) as f: + version = json.load(f)['version'] -lab_path = os.path.join(HERE, name, "static") +lab_path = os.path.join(HERE, name, "labextension") # Representative files that should exist after a successful build jstargets = [ os.path.join(HERE, "lib", "index.js"), - os.path.join(HERE, name, "static", "package.json"), + os.path.join(lab_path, "package.json"), ] package_data_spec = { @@ -34,7 +36,8 @@ labext_name = "@jupyterlab-examples/react-widget" data_files_spec = [ - ("share/jupyter/labextensions/%s" % labext_name, lab_path, "*.*"), + ("share/jupyter/labextensions/%s" % labext_name, lab_path, "**"), + ("share/jupyter/labextensions/%s" % labext_name, HERE, "install.json"), ] cmdclass = create_cmdclass("jsdeps", @@ -43,7 +46,7 @@ ) cmdclass["jsdeps"] = combine_commands( - install_npm(HERE, build_cmd="build", npm=["jlpm"]), + install_npm(HERE, build_cmd="build:prod", npm=["jlpm"]), ensure_targets(jstargets), ) diff --git a/settings/install.json b/settings/install.json new file mode 100644 index 00000000..2e20e5d1 --- /dev/null +++ b/settings/install.json @@ -0,0 +1,5 @@ +{ + "packageManager": "python", + "packageName": "jupyterlab_examples_settings", + "uninstallInstructions": "Use your Python package manager (pip, conda, etc.) to uninstall the package jupyterlab_examples_settings" +} diff --git a/settings/package.json b/settings/package.json index fff20af3..9dba12cd 100644 --- a/settings/package.json +++ b/settings/package.json @@ -26,31 +26,32 @@ "url": "https://github.com/jupyterlab/extension-examples.git" }, "scripts": { - "build": "jlpm run build:lib && jlpm run build:labextension", + "build": "jlpm run build:lib && jlpm run build:labextension:dev", "build:all": "jlpm run build:lib && jlpm run build:labextension", "build:labextension": "jupyter labextension build .", "build:labextension:dev": "jupyter labextension build --development True .", "build:lib": "tsc", + "build:prod": "jlpm run build:lib && jlpm run build:labextension", "clean": "jlpm run clean:lib", "clean:all": "jlpm run clean:lib && jlpm run clean:labextension", - "clean:labextension": "rimraf jupyterlab_examples_settings/static", + "clean:labextension": "rimraf jupyterlab_examples_settings/labextension", "clean:lib": "rimraf lib tsconfig.tsbuildinfo", "eslint": "eslint . --ext .ts,.tsx --fix", "eslint:check": "eslint . --ext .ts,.tsx", "install:extension": "jupyter labextension develop --overwrite .", - "prepare": "jlpm run clean && jlpm run build", + "prepare": "jlpm run clean && jlpm run build:prod", "watch": "run-p watch:src watch:labextension", "watch:labextension": "jupyter labextension watch .", "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "^3.0.0-rc.2", - "@jupyterlab/mainmenu": "^3.0.0-rc.2", - "@jupyterlab/settingregistry": "^3.0.0-rc.2", + "@jupyterlab/application": "^3.0.0-rc.7", + "@jupyterlab/mainmenu": "^3.0.0-rc.7", + "@jupyterlab/settingregistry": "^3.0.0-rc.7", "@lumino/widgets": "^1.14.0" }, "devDependencies": { - "@jupyterlab/builder": "^3.0.0-rc.2", + "@jupyterlab/builder": "^3.0.0-rc.7", "@typescript-eslint/eslint-plugin": "^2.27.0", "@typescript-eslint/parser": "^2.27.0", "eslint": "^7.5.0", diff --git a/settings/setup.py b/settings/setup.py index 089c8447..9e9a2d91 100644 --- a/settings/setup.py +++ b/settings/setup.py @@ -1,6 +1,7 @@ """ jupyterlab_examples_settings setup """ +import json import os from jupyter_packaging import ( @@ -15,14 +16,15 @@ name="jupyterlab_examples_settings" # Get our version -version = get_version(os.path.join(name, "_version.py")) +with open(os.path.join(HERE, 'package.json')) as f: + version = json.load(f)['version'] -lab_path = os.path.join(HERE, name, "static") +lab_path = os.path.join(HERE, name, "labextension") # Representative files that should exist after a successful build jstargets = [ os.path.join(HERE, "lib", "index.js"), - os.path.join(HERE, name, "static", "package.json"), + os.path.join(lab_path, "package.json"), ] package_data_spec = { @@ -34,7 +36,8 @@ labext_name = "@jupyterlab-examples/settings" data_files_spec = [ - ("share/jupyter/labextensions/%s" % labext_name, lab_path, "*.*"), + ("share/jupyter/labextensions/%s" % labext_name, lab_path, "**"), + ("share/jupyter/labextensions/%s" % labext_name, HERE, "install.json"), ] cmdclass = create_cmdclass("jsdeps", @@ -43,7 +46,7 @@ ) cmdclass["jsdeps"] = combine_commands( - install_npm(HERE, build_cmd="build", npm=["jlpm"]), + install_npm(HERE, build_cmd="build:prod", npm=["jlpm"]), ensure_targets(jstargets), ) diff --git a/state/install.json b/state/install.json new file mode 100644 index 00000000..e61b1e70 --- /dev/null +++ b/state/install.json @@ -0,0 +1,5 @@ +{ + "packageManager": "python", + "packageName": "jupyterlab_examples_state", + "uninstallInstructions": "Use your Python package manager (pip, conda, etc.) to uninstall the package jupyterlab_examples_state" +} diff --git a/state/package.json b/state/package.json index 13d14ec8..fab4ac53 100644 --- a/state/package.json +++ b/state/package.json @@ -25,31 +25,32 @@ "url": "https://github.com/jupyterlab/extension-examples.git" }, "scripts": { - "build": "jlpm run build:lib && jlpm run build:labextension", + "build": "jlpm run build:lib && jlpm run build:labextension:dev", "build:all": "jlpm run build:lib && jlpm run build:labextension", "build:labextension": "jupyter labextension build .", "build:labextension:dev": "jupyter labextension build --development True .", "build:lib": "tsc", + "build:prod": "jlpm run build:lib && jlpm run build:labextension", "clean": "jlpm run clean:lib", "clean:all": "jlpm run clean:lib && jlpm run clean:labextension", - "clean:labextension": "rimraf jupyterlab_examples_state/static", + "clean:labextension": "rimraf jupyterlab_examples_state/labextension", "clean:lib": "rimraf lib tsconfig.tsbuildinfo", "eslint": "eslint . --ext .ts,.tsx --fix", "eslint:check": "eslint . --ext .ts,.tsx", "install:extension": "jupyter labextension develop --overwrite .", - "prepare": "jlpm run clean && jlpm run build", + "prepare": "jlpm run clean && jlpm run build:prod", "watch": "run-p watch:src watch:labextension", "watch:labextension": "jupyter labextension watch .", "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "^3.0.0-rc.2", - "@jupyterlab/apputils": "^3.0.0-rc.2", - "@jupyterlab/statedb": "^3.0.0-rc.2", + "@jupyterlab/application": "^3.0.0-rc.7", + "@jupyterlab/apputils": "^3.0.0-rc.7", + "@jupyterlab/statedb": "^3.0.0-rc.7", "@lumino/coreutils": "^1.5.3" }, "devDependencies": { - "@jupyterlab/builder": "^3.0.0-rc.2", + "@jupyterlab/builder": "^3.0.0-rc.7", "@typescript-eslint/eslint-plugin": "^2.27.0", "@typescript-eslint/parser": "^2.27.0", "eslint": "^7.5.0", diff --git a/state/setup.py b/state/setup.py index 281ed5bd..6d9c10ed 100644 --- a/state/setup.py +++ b/state/setup.py @@ -1,6 +1,7 @@ """ jupyterlab_examples_state setup """ +import json import os from jupyter_packaging import ( @@ -15,14 +16,15 @@ name="jupyterlab_examples_state" # Get our version -version = get_version(os.path.join(name, "_version.py")) +with open(os.path.join(HERE, 'package.json')) as f: + version = json.load(f)['version'] -lab_path = os.path.join(HERE, name, "static") +lab_path = os.path.join(HERE, name, "labextension") # Representative files that should exist after a successful build jstargets = [ os.path.join(HERE, "lib", "index.js"), - os.path.join(HERE, name, "static", "package.json"), + os.path.join(lab_path, "package.json"), ] package_data_spec = { @@ -34,7 +36,8 @@ labext_name = "@jupyterlab-examples/state" data_files_spec = [ - ("share/jupyter/labextensions/%s" % labext_name, lab_path, "*.*"), + ("share/jupyter/labextensions/%s" % labext_name, lab_path, "**"), + ("share/jupyter/labextensions/%s" % labext_name, HERE, "install.json"), ] cmdclass = create_cmdclass("jsdeps", @@ -43,7 +46,7 @@ ) cmdclass["jsdeps"] = combine_commands( - install_npm(HERE, build_cmd="build", npm=["jlpm"]), + install_npm(HERE, build_cmd="build:prod", npm=["jlpm"]), ensure_targets(jstargets), ) diff --git a/widget-tracker/widgets/install.json b/widget-tracker/widgets/install.json new file mode 100644 index 00000000..947119e8 --- /dev/null +++ b/widget-tracker/widgets/install.json @@ -0,0 +1,5 @@ +{ + "packageManager": "python", + "packageName": "jupyterlab_examples_widgets", + "uninstallInstructions": "Use your Python package manager (pip, conda, etc.) to uninstall the package jupyterlab_examples_widgets" +} diff --git a/widget-tracker/widgets/package.json b/widget-tracker/widgets/package.json index 913884df..c9f9c963 100644 --- a/widget-tracker/widgets/package.json +++ b/widget-tracker/widgets/package.json @@ -25,32 +25,33 @@ "url": "https://github.com/jupyterlab/extension-examples.git" }, "scripts": { - "build": "jlpm run build:lib && jlpm run build:labextension", + "build": "jlpm run build:lib && jlpm run build:labextension:dev", "build:all": "jlpm run build:lib && jlpm run build:labextension", "build:labextension": "jupyter labextension build .", "build:labextension:dev": "jupyter labextension build --development True .", "build:lib": "tsc", + "build:prod": "jlpm run build:lib && jlpm run build:labextension", "clean": "jlpm run clean:lib", "clean:all": "jlpm run clean:lib && jlpm run clean:labextension", - "clean:labextension": "rimraf jupyterlab_examples_widgets/static", + "clean:labextension": "rimraf jupyterlab_examples_widgets/labextension", "clean:lib": "rimraf lib tsconfig.tsbuildinfo", "eslint": "eslint . --ext .ts,.tsx --fix", "eslint:check": "eslint . --ext .ts,.tsx", "install:extension": "jupyter labextension develop --overwrite .", - "prepare": "jlpm run clean && jlpm run build", + "prepare": "jlpm run clean && jlpm run build:prod", "watch": "run-p watch:src watch:labextension", "watch:labextension": "jupyter labextension watch .", "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "^3.0.0-rc.2", - "@jupyterlab/mainmenu": "^3.0.0-rc.2", + "@jupyterlab/application": "^3.0.0-rc.7", + "@jupyterlab/mainmenu": "^3.0.0-rc.7", "@lumino/algorithm": "^1.3.3", "@lumino/coreutils": "^1.5.3", "@lumino/disposable": "^1.4.3" }, "devDependencies": { - "@jupyterlab/builder": "^3.0.0-rc.2", + "@jupyterlab/builder": "^3.0.0-rc.7", "@typescript-eslint/eslint-plugin": "^2.27.0", "@typescript-eslint/parser": "^2.27.0", "eslint": "^7.5.0", diff --git a/widget-tracker/widgets/setup.py b/widget-tracker/widgets/setup.py index e28251d0..440090ee 100644 --- a/widget-tracker/widgets/setup.py +++ b/widget-tracker/widgets/setup.py @@ -1,6 +1,7 @@ """ jupyterlab_examples_widgets setup """ +import json import os from jupyter_packaging import ( @@ -15,14 +16,15 @@ name="jupyterlab_examples_widgets" # Get our version -version = get_version(os.path.join(name, "_version.py")) +with open(os.path.join(HERE, 'package.json')) as f: + version = json.load(f)['version'] -lab_path = os.path.join(HERE, name, "static") +lab_path = os.path.join(HERE, name, "labextension") # Representative files that should exist after a successful build jstargets = [ os.path.join(HERE, "lib", "index.js"), - os.path.join(HERE, name, "static", "package.json"), + os.path.join(lab_path, "package.json"), ] package_data_spec = { @@ -34,7 +36,8 @@ labext_name = "@jupyterlab-examples/widgets" data_files_spec = [ - ("share/jupyter/labextensions/%s" % labext_name, lab_path, "*.*"), + ("share/jupyter/labextensions/%s" % labext_name, lab_path, "**"), + ("share/jupyter/labextensions/%s" % labext_name, HERE, "install.json"), ] cmdclass = create_cmdclass("jsdeps", @@ -43,7 +46,7 @@ ) cmdclass["jsdeps"] = combine_commands( - install_npm(HERE, build_cmd="build", npm=["jlpm"]), + install_npm(HERE, build_cmd="build:prod", npm=["jlpm"]), ensure_targets(jstargets), ) From 169decf44dcd97091b18cc20068839e7ed9780b4 Mon Sep 17 00:00:00 2001 From: Jeremy Tuloup Date: Thu, 5 Nov 2020 20:28:16 +0100 Subject: [PATCH 33/45] Rename static to labextension in package.json --- .prettierignore | 2 +- advanced/kernel-messaging/MANIFEST.in | 2 +- advanced/kernel-messaging/package.json | 2 +- advanced/kernel-output/MANIFEST.in | 2 +- advanced/kernel-output/package.json | 2 +- advanced/server-extension/MANIFEST.in | 2 +- advanced/server-extension/package.json | 2 +- basics/datagrid/MANIFEST.in | 2 +- basics/datagrid/package.json | 2 +- basics/hello-world/MANIFEST.in | 2 +- basics/hello-world/package.json | 2 +- basics/signals/MANIFEST.in | 2 +- basics/signals/package.json | 2 +- command-palette/MANIFEST.in | 2 +- command-palette/package.json | 2 +- commands/MANIFEST.in | 2 +- commands/package.json | 2 +- context-menu/MANIFEST.in | 2 +- context-menu/package.json | 2 +- launcher/MANIFEST.in | 2 +- launcher/package.json | 2 +- log-console/custom-log-console/MANIFEST.in | 2 +- log-console/custom-log-console/package.json | 2 +- log-console/log-messages/MANIFEST.in | 2 +- log-console/log-messages/package.json | 2 +- main-menu/MANIFEST.in | 2 +- main-menu/package.json | 2 +- react/react-widget/MANIFEST.in | 2 +- react/react-widget/package.json | 2 +- settings/MANIFEST.in | 2 +- settings/package.json | 2 +- state/MANIFEST.in | 2 +- state/package.json | 2 +- widget-tracker/widgets/MANIFEST.in | 2 +- widget-tracker/widgets/package.json | 2 +- 35 files changed, 35 insertions(+), 35 deletions(-) diff --git a/.prettierignore b/.prettierignore index 3a5875d7..5c6e45ce 100644 --- a/.prettierignore +++ b/.prettierignore @@ -2,4 +2,4 @@ node_modules **/node_modules **/lib **/package.json -**/static +**/labextension diff --git a/advanced/kernel-messaging/MANIFEST.in b/advanced/kernel-messaging/MANIFEST.in index a192a4cc..1ffdbd62 100644 --- a/advanced/kernel-messaging/MANIFEST.in +++ b/advanced/kernel-messaging/MANIFEST.in @@ -6,7 +6,7 @@ include jupyter-config/jupyterlab_examples_kernel_messaging.json include package.json include ts*.json -graft jupyterlab_examples_kernel_messaging/static +graft jupyterlab_examples_kernel_messaging/labextension # Javascript files graft src diff --git a/advanced/kernel-messaging/package.json b/advanced/kernel-messaging/package.json index d675eaf1..0787719a 100644 --- a/advanced/kernel-messaging/package.json +++ b/advanced/kernel-messaging/package.json @@ -74,6 +74,6 @@ ], "jupyterlab": { "extension": true, - "outputDir": "jupyterlab_examples_kernel_messaging/static" + "outputDir": "jupyterlab_examples_kernel_messaging/labextension" } } \ No newline at end of file diff --git a/advanced/kernel-output/MANIFEST.in b/advanced/kernel-output/MANIFEST.in index fbb66f9d..d67f9240 100644 --- a/advanced/kernel-output/MANIFEST.in +++ b/advanced/kernel-output/MANIFEST.in @@ -6,7 +6,7 @@ include jupyter-config/jupyterlab_examples_kernel_output.json include package.json include ts*.json -graft jupyterlab_examples_kernel_output/static +graft jupyterlab_examples_kernel_output/labextension # Javascript files graft src diff --git a/advanced/kernel-output/package.json b/advanced/kernel-output/package.json index e52dfbcd..8f7a53d2 100644 --- a/advanced/kernel-output/package.json +++ b/advanced/kernel-output/package.json @@ -73,6 +73,6 @@ ], "jupyterlab": { "extension": true, - "outputDir": "jupyterlab_examples_kernel_output/static" + "outputDir": "jupyterlab_examples_kernel_output/labextension" } } \ No newline at end of file diff --git a/advanced/server-extension/MANIFEST.in b/advanced/server-extension/MANIFEST.in index 549e2d7f..dbff3582 100644 --- a/advanced/server-extension/MANIFEST.in +++ b/advanced/server-extension/MANIFEST.in @@ -7,7 +7,7 @@ include jupyter-config/jlab_ext_example.json include package.json include ts*.json include jlab_ext_example/labextension/*.tgz -graft jlab_ext_example/static +graft jlab_ext_example/labextension # Javascript files graft src diff --git a/advanced/server-extension/package.json b/advanced/server-extension/package.json index f6bf7f1c..0dc896d8 100644 --- a/advanced/server-extension/package.json +++ b/advanced/server-extension/package.json @@ -79,6 +79,6 @@ } }, "extension": true, - "outputDir": "jlab_ext_example/static" + "outputDir": "jlab_ext_example/labextension" } } \ No newline at end of file diff --git a/basics/datagrid/MANIFEST.in b/basics/datagrid/MANIFEST.in index ef85b8ba..a2f60e5c 100644 --- a/basics/datagrid/MANIFEST.in +++ b/basics/datagrid/MANIFEST.in @@ -6,7 +6,7 @@ include jupyter-config/jupyterlab_examples_datagrid.json include package.json include ts*.json -graft jupyterlab_examples_datagrid/static +graft jupyterlab_examples_datagrid/labextension # Javascript files graft src diff --git a/basics/datagrid/package.json b/basics/datagrid/package.json index b74f0630..885d633f 100644 --- a/basics/datagrid/package.json +++ b/basics/datagrid/package.json @@ -71,6 +71,6 @@ ], "jupyterlab": { "extension": true, - "outputDir": "jupyterlab_examples_datagrid/static" + "outputDir": "jupyterlab_examples_datagrid/labextension" } } \ No newline at end of file diff --git a/basics/hello-world/MANIFEST.in b/basics/hello-world/MANIFEST.in index a766c6f4..041b2fd7 100644 --- a/basics/hello-world/MANIFEST.in +++ b/basics/hello-world/MANIFEST.in @@ -6,7 +6,7 @@ include jupyter-config/jupyterlab_examples_hello_world.json include package.json include ts*.json -graft jupyterlab_examples_hello_world/static +graft jupyterlab_examples_hello_world/labextension # Javascript files graft src diff --git a/basics/hello-world/package.json b/basics/hello-world/package.json index 63c786fd..63abe87d 100644 --- a/basics/hello-world/package.json +++ b/basics/hello-world/package.json @@ -65,6 +65,6 @@ ], "jupyterlab": { "extension": true, - "outputDir": "jupyterlab_examples_hello_world/static" + "outputDir": "jupyterlab_examples_hello_world/labextension" } } \ No newline at end of file diff --git a/basics/signals/MANIFEST.in b/basics/signals/MANIFEST.in index 01de20c5..d65867cc 100644 --- a/basics/signals/MANIFEST.in +++ b/basics/signals/MANIFEST.in @@ -6,7 +6,7 @@ include jupyter-config/jupyterlab_examples_signals.json include package.json include ts*.json -graft jupyterlab_examples_signals/static +graft jupyterlab_examples_signals/labextension # Javascript files graft src diff --git a/basics/signals/package.json b/basics/signals/package.json index c00a7efd..ca64321a 100644 --- a/basics/signals/package.json +++ b/basics/signals/package.json @@ -72,6 +72,6 @@ ], "jupyterlab": { "extension": true, - "outputDir": "jupyterlab_examples_signals/static" + "outputDir": "jupyterlab_examples_signals/labextension" } } \ No newline at end of file diff --git a/command-palette/MANIFEST.in b/command-palette/MANIFEST.in index cabb5aa7..31fb6283 100644 --- a/command-palette/MANIFEST.in +++ b/command-palette/MANIFEST.in @@ -6,7 +6,7 @@ include jupyter-config/jupyterlab_examples_command_palette.json include package.json include ts*.json -graft jupyterlab_examples_command_palette/static +graft jupyterlab_examples_command_palette/labextension # Javascript files graft src diff --git a/command-palette/package.json b/command-palette/package.json index fe78619f..10106f82 100644 --- a/command-palette/package.json +++ b/command-palette/package.json @@ -65,6 +65,6 @@ ], "jupyterlab": { "extension": true, - "outputDir": "jupyterlab_examples_command_palette/static" + "outputDir": "jupyterlab_examples_command_palette/labextension" } } \ No newline at end of file diff --git a/commands/MANIFEST.in b/commands/MANIFEST.in index c27952a3..88b2f920 100644 --- a/commands/MANIFEST.in +++ b/commands/MANIFEST.in @@ -6,7 +6,7 @@ include jupyter-config/jupyterlab_examples_commands.json include package.json include ts*.json -graft jupyterlab_examples_commands/static +graft jupyterlab_examples_commands/labextension # Javascript files graft src diff --git a/commands/package.json b/commands/package.json index 8166c227..0eae889d 100644 --- a/commands/package.json +++ b/commands/package.json @@ -65,6 +65,6 @@ ], "jupyterlab": { "extension": true, - "outputDir": "jupyterlab_examples_commands/static" + "outputDir": "jupyterlab_examples_commands/labextension" } } \ No newline at end of file diff --git a/context-menu/MANIFEST.in b/context-menu/MANIFEST.in index 64369514..84b5924d 100644 --- a/context-menu/MANIFEST.in +++ b/context-menu/MANIFEST.in @@ -6,7 +6,7 @@ include jupyter-config/jupyterlab_examples_context_menu.json include package.json include ts*.json -graft jupyterlab_examples_context_menu/static +graft jupyterlab_examples_context_menu/labextension # Javascript files graft src diff --git a/context-menu/package.json b/context-menu/package.json index 1722325a..297371db 100644 --- a/context-menu/package.json +++ b/context-menu/package.json @@ -68,6 +68,6 @@ ], "jupyterlab": { "extension": true, - "outputDir": "jupyterlab_examples_context_menu/static" + "outputDir": "jupyterlab_examples_context_menu/labextension" } } \ No newline at end of file diff --git a/launcher/MANIFEST.in b/launcher/MANIFEST.in index f95674be..0551ee1f 100644 --- a/launcher/MANIFEST.in +++ b/launcher/MANIFEST.in @@ -6,7 +6,7 @@ include jupyter-config/jupyterlab_examples_launcher.json include package.json include ts*.json -graft jupyterlab_examples_launcher/static +graft jupyterlab_examples_launcher/labextension # Javascript files graft src diff --git a/launcher/package.json b/launcher/package.json index aec22651..f67c680e 100644 --- a/launcher/package.json +++ b/launcher/package.json @@ -69,6 +69,6 @@ ], "jupyterlab": { "extension": true, - "outputDir": "jupyterlab_examples_launcher/static" + "outputDir": "jupyterlab_examples_launcher/labextension" } } \ No newline at end of file diff --git a/log-console/custom-log-console/MANIFEST.in b/log-console/custom-log-console/MANIFEST.in index 2f4f46ff..2133e4ee 100644 --- a/log-console/custom-log-console/MANIFEST.in +++ b/log-console/custom-log-console/MANIFEST.in @@ -6,7 +6,7 @@ include jupyter-config/jupyterlab_examples_custom_log_console.json include package.json include ts*.json -graft jupyterlab_examples_custom_log_console/static +graft jupyterlab_examples_custom_log_console/labextension # Javascript files graft src diff --git a/log-console/custom-log-console/package.json b/log-console/custom-log-console/package.json index 2bae4842..1ca19094 100644 --- a/log-console/custom-log-console/package.json +++ b/log-console/custom-log-console/package.json @@ -74,6 +74,6 @@ ], "jupyterlab": { "extension": true, - "outputDir": "jupyterlab_examples_custom_log_console/static" + "outputDir": "jupyterlab_examples_custom_log_console/labextension" } } \ No newline at end of file diff --git a/log-console/log-messages/MANIFEST.in b/log-console/log-messages/MANIFEST.in index d3382d09..37ebc43a 100644 --- a/log-console/log-messages/MANIFEST.in +++ b/log-console/log-messages/MANIFEST.in @@ -6,7 +6,7 @@ include jupyter-config/jupyterlab_examples_log_messages.json include package.json include ts*.json -graft jupyterlab_examples_log_messages/static +graft jupyterlab_examples_log_messages/labextension # Javascript files graft src diff --git a/log-console/log-messages/package.json b/log-console/log-messages/package.json index 2eeace5e..a5800d6c 100644 --- a/log-console/log-messages/package.json +++ b/log-console/log-messages/package.json @@ -75,6 +75,6 @@ ], "jupyterlab": { "extension": true, - "outputDir": "jupyterlab_examples_log_messages/static" + "outputDir": "jupyterlab_examples_log_messages/labextension" } } \ No newline at end of file diff --git a/main-menu/MANIFEST.in b/main-menu/MANIFEST.in index 31c840a3..1a2c9e9a 100644 --- a/main-menu/MANIFEST.in +++ b/main-menu/MANIFEST.in @@ -6,7 +6,7 @@ include jupyter-config/jupyterlab_examples_main_menu.json include package.json include ts*.json -graft jupyterlab_examples_main_menu/static +graft jupyterlab_examples_main_menu/labextension # Javascript files graft src diff --git a/main-menu/package.json b/main-menu/package.json index a7b810ec..1d137409 100644 --- a/main-menu/package.json +++ b/main-menu/package.json @@ -67,6 +67,6 @@ ], "jupyterlab": { "extension": true, - "outputDir": "jupyterlab_examples_main_menu/static" + "outputDir": "jupyterlab_examples_main_menu/labextension" } } \ No newline at end of file diff --git a/react/react-widget/MANIFEST.in b/react/react-widget/MANIFEST.in index 558067e8..6444b9ab 100644 --- a/react/react-widget/MANIFEST.in +++ b/react/react-widget/MANIFEST.in @@ -6,7 +6,7 @@ include jupyter-config/jupyterlab_examples_react_widget.json include package.json include ts*.json -graft jupyterlab_examples_react_widget/static +graft jupyterlab_examples_react_widget/labextension # Javascript files graft src diff --git a/react/react-widget/package.json b/react/react-widget/package.json index 080060be..43906051 100644 --- a/react/react-widget/package.json +++ b/react/react-widget/package.json @@ -67,6 +67,6 @@ ], "jupyterlab": { "extension": true, - "outputDir": "jupyterlab_examples_react_widget/static" + "outputDir": "jupyterlab_examples_react_widget/labextension" } } \ No newline at end of file diff --git a/settings/MANIFEST.in b/settings/MANIFEST.in index 72283e74..be45817b 100644 --- a/settings/MANIFEST.in +++ b/settings/MANIFEST.in @@ -6,7 +6,7 @@ include jupyter-config/jupyterlab_examples_settings.json include package.json include ts*.json -graft jupyterlab_examples_settings/static +graft jupyterlab_examples_settings/labextension # Javascript files graft src diff --git a/settings/package.json b/settings/package.json index 9dba12cd..380f5294 100644 --- a/settings/package.json +++ b/settings/package.json @@ -70,6 +70,6 @@ "jupyterlab": { "extension": true, "schemaDir": "schema", - "outputDir": "jupyterlab_examples_settings/static" + "outputDir": "jupyterlab_examples_settings/labextension" } } \ No newline at end of file diff --git a/state/MANIFEST.in b/state/MANIFEST.in index 5f1c8b43..2faf7778 100644 --- a/state/MANIFEST.in +++ b/state/MANIFEST.in @@ -6,7 +6,7 @@ include jupyter-config/jupyterlab_examples_state.json include package.json include ts*.json -graft jupyterlab_examples_state/static +graft jupyterlab_examples_state/labextension # Javascript files graft src diff --git a/state/package.json b/state/package.json index fab4ac53..bec7960b 100644 --- a/state/package.json +++ b/state/package.json @@ -68,6 +68,6 @@ ], "jupyterlab": { "extension": true, - "outputDir": "jupyterlab_examples_state/static" + "outputDir": "jupyterlab_examples_state/labextension" } } \ No newline at end of file diff --git a/widget-tracker/widgets/MANIFEST.in b/widget-tracker/widgets/MANIFEST.in index 216005e6..04b6c5db 100644 --- a/widget-tracker/widgets/MANIFEST.in +++ b/widget-tracker/widgets/MANIFEST.in @@ -6,7 +6,7 @@ include jupyter-config/jupyterlab_examples_widgets.json include package.json include ts*.json -graft jupyterlab_examples_widgets/static +graft jupyterlab_examples_widgets/labextension # Javascript files graft src diff --git a/widget-tracker/widgets/package.json b/widget-tracker/widgets/package.json index c9f9c963..13fada03 100644 --- a/widget-tracker/widgets/package.json +++ b/widget-tracker/widgets/package.json @@ -69,6 +69,6 @@ ], "jupyterlab": { "extension": true, - "outputDir": "jupyterlab_examples_widgets/static" + "outputDir": "jupyterlab_examples_widgets/labextension" } } \ No newline at end of file From bfcc2da2544dbdc7ce2466c0f5e53d527c3f9fe6 Mon Sep 17 00:00:00 2001 From: Jeremy Tuloup Date: Fri, 6 Nov 2020 17:40:42 +0100 Subject: [PATCH 34/45] embedme --- advanced/server-extension/README.md | 43 +++++++++++++++-------------- basics/hello-world/README.md | 2 +- main-menu/README.md | 2 +- settings/README.md | 2 +- 4 files changed, 26 insertions(+), 23 deletions(-) diff --git a/advanced/server-extension/README.md b/advanced/server-extension/README.md index 6cef50f6..e01c9bda 100644 --- a/advanced/server-extension/README.md +++ b/advanced/server-extension/README.md @@ -296,7 +296,7 @@ if (launcher) { } ``` -Invoking the command (via the command palette or the launcher) will open a new tab with +Invoking the command (via the command palette or the launcher) will open a new tab with an `IFrame` that will display static content fetched from the server extension. **Note** @@ -312,14 +312,14 @@ an `IFrame` that will display static content fetched from the server extension. The server part of the extension is going to be presented in this section. -You first need to install the python source code. The following will install +You first need to install the python source code. The following will install the `jlab_ext_example` package in dev mode: ```bash pip install -e . ``` -Then you need to enable the package at the Jupyter level +Then you need to enable the package at the Jupyter level so that it becomes a server extension. ```bash @@ -450,7 +450,7 @@ input_data = self.get_json_body() data = {"greetings": "Hello {}, enjoy JupyterLab!".format(input_data["name"])} ``` -The part responsible to serve static content with a `StaticFileHandler` handler +The part responsible to serve static content with a `StaticFileHandler` handler is the following: ```py @@ -486,7 +486,7 @@ through package managers like `pip`. > Note: In particular, [`jupyter-packaging`](https://github.com/jupyter/jupyter-packaging) provides helpers to package and install JS files > with a Python package for Jupyter frontends (classical notebook, -> JupyterLab,...). +> JupyterLab,...). > As this package is a setup requirement, it needs to be specified in the `pyproject.toml` to be installed by `pip`. The `setup.py` file is the entry point to describe package metadata: @@ -497,6 +497,7 @@ The `setup.py` file is the entry point to describe package metadata: """ jlab_ext_example setup """ +import json import os from jupyter_packaging import ( @@ -511,14 +512,15 @@ HERE = os.path.abspath(os.path.dirname(__file__)) name="jlab_ext_example" # Get our version -version = get_version(os.path.join(name, "_version.py")) +with open(os.path.join(HERE, 'package.json')) as f: + version = json.load(f)['version'] -lab_path = os.path.join(HERE, name, "static") +lab_path = os.path.join(HERE, name, "labextension") # Representative files that should exist after a successful build jstargets = [ os.path.join(HERE, "lib", "index.js"), - os.path.join(HERE, name, "static", "package.json"), + os.path.join(lab_path, "package.json"), ] package_data_spec = { @@ -530,7 +532,8 @@ package_data_spec = { labext_name = "@jupyterlab-examples/server-extension" data_files_spec = [ - ("share/jupyter/labextensions/%s" % labext_name, lab_path, "*.*"),("etc/jupyter/jupyter_server_config.d", + ("share/jupyter/labextensions/%s" % labext_name, lab_path, "**"), + ("share/jupyter/labextensions/%s" % labext_name, HERE, "install.json"),("etc/jupyter/jupyter_server_config.d", "jupyter-config", "jlab_ext_example.json"), ] @@ -541,7 +544,7 @@ cmdclass = create_cmdclass("jsdeps", ) cmdclass["jsdeps"] = combine_commands( - install_npm(HERE, build_cmd="build", npm=["jlpm"]), + install_npm(HERE, build_cmd="build:prod", npm=["jlpm"]), ensure_targets(jstargets), ) @@ -590,7 +593,7 @@ the frontend NPM package needs to be built and inserted in the Python package. T done using a special `cmdclass`: ```py -# setup.py#L42-L50 +# setup.py#L45-L53 cmdclass = create_cmdclass("jsdeps", package_data_spec=package_data_spec, @@ -598,7 +601,7 @@ cmdclass = create_cmdclass("jsdeps", ) cmdclass["jsdeps"] = combine_commands( - install_npm(HERE, build_cmd="build", npm=["jlpm"]), + install_npm(HERE, build_cmd="build:prod", npm=["jlpm"]), ensure_targets(jstargets), ) ``` @@ -606,19 +609,19 @@ cmdclass["jsdeps"] = combine_commands( Basically it will build the frontend NPM package: ```py -# setup.py#L48-L48 +# setup.py#L51-L51 -install_npm(HERE, build_cmd="build", npm=["jlpm"]), +install_npm(HERE, build_cmd="build:prod", npm=["jlpm"]), ``` It will ensure one of the generated JS files is `lib/jlabextexample.js`: ```py -# setup.py#L23-L26 +# setup.py#L25-L28 jstargets = [ os.path.join(HERE, "lib", "index.js"), - os.path.join(HERE, name, "static", "package.json"), + os.path.join(lab_path, "package.json"), ] ``` @@ -663,9 +666,8 @@ user about that dependency by adding the `discovery` metadata to your `package.j file: ```json5 -// package.json#L68-L78 +// package.json#L70-L80 -], "jupyterlab": { "discovery": { "server": { @@ -676,12 +678,13 @@ file: "name": "jlab_ext_example" } } + }, ``` In this example, the extension requires a `server` extension: ```json5 -// package.json#L70-L70 +// package.json#L71-L71 "discovery": { ``` @@ -689,7 +692,7 @@ In this example, the extension requires a `server` extension: And that server extension is available through `pip`: ```json5 -// package.json#L71-L73 +// package.json#L72-L74 "server": { "managers": [ diff --git a/basics/hello-world/README.md b/basics/hello-world/README.md index ac9cb828..5f5b3969 100644 --- a/basics/hello-world/README.md +++ b/basics/hello-world/README.md @@ -93,9 +93,9 @@ package is declared in the file `package.json`: ```json5 // package.json#L44-L46 + "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "^3.0.0-rc.7" ``` With this basic import setup, you can move on to construct a new instance diff --git a/main-menu/README.md b/main-menu/README.md index b5e2e881..4fc7e3df 100644 --- a/main-menu/README.md +++ b/main-menu/README.md @@ -87,11 +87,11 @@ After the execution of that command, `package.json` should list them in the ```json5 // package.json#L44-L48 + "watch:src": "tsc -w" }, "dependencies": { "@jupyterlab/application": "^3.0.0-rc.7", "@jupyterlab/mainmenu": "^3.0.0-rc.7", - "@lumino/widgets": "^1.14.0" ``` With this extension installed, a new menu _Main Menu Example_ should be present. And when diff --git a/settings/README.md b/settings/README.md index b0b27dbc..f4ad6939 100644 --- a/settings/README.md +++ b/settings/README.md @@ -111,9 +111,9 @@ the `package.json` file in the `jupyterlab` section (here `schema`): ```json5 // package.json#L68-L70 + "style/*.css" ], "jupyterlab": { - "extension": true, ``` From 00bab6338b7a1bdef273d209333d94f5f4da214b Mon Sep 17 00:00:00 2001 From: Jeremy Tuloup Date: Fri, 6 Nov 2020 20:44:29 +0100 Subject: [PATCH 35/45] Update static to labextension in __init__.py --- .gitignore | 1 + .../jupyterlab_examples_kernel_messaging/__init__.py | 4 ++-- .../jupyterlab_examples_kernel_output/__init__.py | 4 ++-- advanced/server-extension/README.md | 4 ++-- advanced/server-extension/jlab_ext_example/__init__.py | 4 ++-- basics/datagrid/jupyterlab_examples_datagrid/__init__.py | 4 ++-- .../hello-world/jupyterlab_examples_hello_world/__init__.py | 4 ++-- basics/signals/jupyterlab_examples_signals/__init__.py | 4 ++-- .../jupyterlab_examples_command_palette/__init__.py | 4 ++-- commands/jupyterlab_examples_commands/__init__.py | 4 ++-- context-menu/jupyterlab_examples_context_menu/__init__.py | 4 ++-- launcher/jupyterlab_examples_launcher/__init__.py | 4 ++-- .../jupyterlab_examples_custom_log_console/__init__.py | 4 ++-- .../log-messages/jupyterlab_examples_log_messages/__init__.py | 4 ++-- main-menu/jupyterlab_examples_main_menu/__init__.py | 4 ++-- .../react-widget/jupyterlab_examples_react_widget/__init__.py | 4 ++-- settings/jupyterlab_examples_settings/__init__.py | 4 ++-- state/jupyterlab_examples_state/__init__.py | 4 ++-- .../widgets/jupyterlab_examples_widgets/__init__.py | 4 ++-- 19 files changed, 37 insertions(+), 36 deletions(-) diff --git a/.gitignore b/.gitignore index 806685a5..35cfbab0 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ node_modules/ **/node_modules/**/README.md static +labextension diff --git a/advanced/kernel-messaging/jupyterlab_examples_kernel_messaging/__init__.py b/advanced/kernel-messaging/jupyterlab_examples_kernel_messaging/__init__.py index 819e43e0..353ab522 100644 --- a/advanced/kernel-messaging/jupyterlab_examples_kernel_messaging/__init__.py +++ b/advanced/kernel-messaging/jupyterlab_examples_kernel_messaging/__init__.py @@ -6,12 +6,12 @@ HERE = osp.abspath(osp.dirname(__file__)) -with open(osp.join(HERE, 'static', 'package.json')) as fid: +with open(osp.join(HERE, 'labextension', 'package.json')) as fid: data = json.load(fid) def _jupyter_labextension_paths(): return [{ - 'src': 'static', + 'src': 'labextension', 'dest': data['name'] }] diff --git a/advanced/kernel-output/jupyterlab_examples_kernel_output/__init__.py b/advanced/kernel-output/jupyterlab_examples_kernel_output/__init__.py index 819e43e0..353ab522 100644 --- a/advanced/kernel-output/jupyterlab_examples_kernel_output/__init__.py +++ b/advanced/kernel-output/jupyterlab_examples_kernel_output/__init__.py @@ -6,12 +6,12 @@ HERE = osp.abspath(osp.dirname(__file__)) -with open(osp.join(HERE, 'static', 'package.json')) as fid: +with open(osp.join(HERE, 'labextension', 'package.json')) as fid: data = json.load(fid) def _jupyter_labextension_paths(): return [{ - 'src': 'static', + 'src': 'labextension', 'dest': data['name'] }] diff --git a/advanced/server-extension/README.md b/advanced/server-extension/README.md index e01c9bda..39b2e20c 100644 --- a/advanced/server-extension/README.md +++ b/advanced/server-extension/README.md @@ -340,12 +340,12 @@ from ._version import __version__ HERE = osp.abspath(osp.dirname(__file__)) -with open(osp.join(HERE, 'static', 'package.json')) as fid: +with open(osp.join(HERE, 'labextension', 'package.json')) as fid: data = json.load(fid) def _jupyter_labextension_paths(): return [{ - 'src': 'static', + 'src': 'labextension', 'dest': data['name'] }] diff --git a/advanced/server-extension/jlab_ext_example/__init__.py b/advanced/server-extension/jlab_ext_example/__init__.py index bee278f8..c6bf4615 100644 --- a/advanced/server-extension/jlab_ext_example/__init__.py +++ b/advanced/server-extension/jlab_ext_example/__init__.py @@ -6,12 +6,12 @@ HERE = osp.abspath(osp.dirname(__file__)) -with open(osp.join(HERE, 'static', 'package.json')) as fid: +with open(osp.join(HERE, 'labextension', 'package.json')) as fid: data = json.load(fid) def _jupyter_labextension_paths(): return [{ - 'src': 'static', + 'src': 'labextension', 'dest': data['name'] }] diff --git a/basics/datagrid/jupyterlab_examples_datagrid/__init__.py b/basics/datagrid/jupyterlab_examples_datagrid/__init__.py index 819e43e0..353ab522 100644 --- a/basics/datagrid/jupyterlab_examples_datagrid/__init__.py +++ b/basics/datagrid/jupyterlab_examples_datagrid/__init__.py @@ -6,12 +6,12 @@ HERE = osp.abspath(osp.dirname(__file__)) -with open(osp.join(HERE, 'static', 'package.json')) as fid: +with open(osp.join(HERE, 'labextension', 'package.json')) as fid: data = json.load(fid) def _jupyter_labextension_paths(): return [{ - 'src': 'static', + 'src': 'labextension', 'dest': data['name'] }] diff --git a/basics/hello-world/jupyterlab_examples_hello_world/__init__.py b/basics/hello-world/jupyterlab_examples_hello_world/__init__.py index 819e43e0..353ab522 100644 --- a/basics/hello-world/jupyterlab_examples_hello_world/__init__.py +++ b/basics/hello-world/jupyterlab_examples_hello_world/__init__.py @@ -6,12 +6,12 @@ HERE = osp.abspath(osp.dirname(__file__)) -with open(osp.join(HERE, 'static', 'package.json')) as fid: +with open(osp.join(HERE, 'labextension', 'package.json')) as fid: data = json.load(fid) def _jupyter_labextension_paths(): return [{ - 'src': 'static', + 'src': 'labextension', 'dest': data['name'] }] diff --git a/basics/signals/jupyterlab_examples_signals/__init__.py b/basics/signals/jupyterlab_examples_signals/__init__.py index 819e43e0..353ab522 100644 --- a/basics/signals/jupyterlab_examples_signals/__init__.py +++ b/basics/signals/jupyterlab_examples_signals/__init__.py @@ -6,12 +6,12 @@ HERE = osp.abspath(osp.dirname(__file__)) -with open(osp.join(HERE, 'static', 'package.json')) as fid: +with open(osp.join(HERE, 'labextension', 'package.json')) as fid: data = json.load(fid) def _jupyter_labextension_paths(): return [{ - 'src': 'static', + 'src': 'labextension', 'dest': data['name'] }] diff --git a/command-palette/jupyterlab_examples_command_palette/__init__.py b/command-palette/jupyterlab_examples_command_palette/__init__.py index 819e43e0..353ab522 100644 --- a/command-palette/jupyterlab_examples_command_palette/__init__.py +++ b/command-palette/jupyterlab_examples_command_palette/__init__.py @@ -6,12 +6,12 @@ HERE = osp.abspath(osp.dirname(__file__)) -with open(osp.join(HERE, 'static', 'package.json')) as fid: +with open(osp.join(HERE, 'labextension', 'package.json')) as fid: data = json.load(fid) def _jupyter_labextension_paths(): return [{ - 'src': 'static', + 'src': 'labextension', 'dest': data['name'] }] diff --git a/commands/jupyterlab_examples_commands/__init__.py b/commands/jupyterlab_examples_commands/__init__.py index 819e43e0..353ab522 100644 --- a/commands/jupyterlab_examples_commands/__init__.py +++ b/commands/jupyterlab_examples_commands/__init__.py @@ -6,12 +6,12 @@ HERE = osp.abspath(osp.dirname(__file__)) -with open(osp.join(HERE, 'static', 'package.json')) as fid: +with open(osp.join(HERE, 'labextension', 'package.json')) as fid: data = json.load(fid) def _jupyter_labextension_paths(): return [{ - 'src': 'static', + 'src': 'labextension', 'dest': data['name'] }] diff --git a/context-menu/jupyterlab_examples_context_menu/__init__.py b/context-menu/jupyterlab_examples_context_menu/__init__.py index 819e43e0..353ab522 100644 --- a/context-menu/jupyterlab_examples_context_menu/__init__.py +++ b/context-menu/jupyterlab_examples_context_menu/__init__.py @@ -6,12 +6,12 @@ HERE = osp.abspath(osp.dirname(__file__)) -with open(osp.join(HERE, 'static', 'package.json')) as fid: +with open(osp.join(HERE, 'labextension', 'package.json')) as fid: data = json.load(fid) def _jupyter_labextension_paths(): return [{ - 'src': 'static', + 'src': 'labextension', 'dest': data['name'] }] diff --git a/launcher/jupyterlab_examples_launcher/__init__.py b/launcher/jupyterlab_examples_launcher/__init__.py index 819e43e0..353ab522 100644 --- a/launcher/jupyterlab_examples_launcher/__init__.py +++ b/launcher/jupyterlab_examples_launcher/__init__.py @@ -6,12 +6,12 @@ HERE = osp.abspath(osp.dirname(__file__)) -with open(osp.join(HERE, 'static', 'package.json')) as fid: +with open(osp.join(HERE, 'labextension', 'package.json')) as fid: data = json.load(fid) def _jupyter_labextension_paths(): return [{ - 'src': 'static', + 'src': 'labextension', 'dest': data['name'] }] diff --git a/log-console/custom-log-console/jupyterlab_examples_custom_log_console/__init__.py b/log-console/custom-log-console/jupyterlab_examples_custom_log_console/__init__.py index 819e43e0..353ab522 100644 --- a/log-console/custom-log-console/jupyterlab_examples_custom_log_console/__init__.py +++ b/log-console/custom-log-console/jupyterlab_examples_custom_log_console/__init__.py @@ -6,12 +6,12 @@ HERE = osp.abspath(osp.dirname(__file__)) -with open(osp.join(HERE, 'static', 'package.json')) as fid: +with open(osp.join(HERE, 'labextension', 'package.json')) as fid: data = json.load(fid) def _jupyter_labextension_paths(): return [{ - 'src': 'static', + 'src': 'labextension', 'dest': data['name'] }] diff --git a/log-console/log-messages/jupyterlab_examples_log_messages/__init__.py b/log-console/log-messages/jupyterlab_examples_log_messages/__init__.py index 819e43e0..353ab522 100644 --- a/log-console/log-messages/jupyterlab_examples_log_messages/__init__.py +++ b/log-console/log-messages/jupyterlab_examples_log_messages/__init__.py @@ -6,12 +6,12 @@ HERE = osp.abspath(osp.dirname(__file__)) -with open(osp.join(HERE, 'static', 'package.json')) as fid: +with open(osp.join(HERE, 'labextension', 'package.json')) as fid: data = json.load(fid) def _jupyter_labextension_paths(): return [{ - 'src': 'static', + 'src': 'labextension', 'dest': data['name'] }] diff --git a/main-menu/jupyterlab_examples_main_menu/__init__.py b/main-menu/jupyterlab_examples_main_menu/__init__.py index 819e43e0..353ab522 100644 --- a/main-menu/jupyterlab_examples_main_menu/__init__.py +++ b/main-menu/jupyterlab_examples_main_menu/__init__.py @@ -6,12 +6,12 @@ HERE = osp.abspath(osp.dirname(__file__)) -with open(osp.join(HERE, 'static', 'package.json')) as fid: +with open(osp.join(HERE, 'labextension', 'package.json')) as fid: data = json.load(fid) def _jupyter_labextension_paths(): return [{ - 'src': 'static', + 'src': 'labextension', 'dest': data['name'] }] diff --git a/react/react-widget/jupyterlab_examples_react_widget/__init__.py b/react/react-widget/jupyterlab_examples_react_widget/__init__.py index 819e43e0..353ab522 100644 --- a/react/react-widget/jupyterlab_examples_react_widget/__init__.py +++ b/react/react-widget/jupyterlab_examples_react_widget/__init__.py @@ -6,12 +6,12 @@ HERE = osp.abspath(osp.dirname(__file__)) -with open(osp.join(HERE, 'static', 'package.json')) as fid: +with open(osp.join(HERE, 'labextension', 'package.json')) as fid: data = json.load(fid) def _jupyter_labextension_paths(): return [{ - 'src': 'static', + 'src': 'labextension', 'dest': data['name'] }] diff --git a/settings/jupyterlab_examples_settings/__init__.py b/settings/jupyterlab_examples_settings/__init__.py index 819e43e0..353ab522 100644 --- a/settings/jupyterlab_examples_settings/__init__.py +++ b/settings/jupyterlab_examples_settings/__init__.py @@ -6,12 +6,12 @@ HERE = osp.abspath(osp.dirname(__file__)) -with open(osp.join(HERE, 'static', 'package.json')) as fid: +with open(osp.join(HERE, 'labextension', 'package.json')) as fid: data = json.load(fid) def _jupyter_labextension_paths(): return [{ - 'src': 'static', + 'src': 'labextension', 'dest': data['name'] }] diff --git a/state/jupyterlab_examples_state/__init__.py b/state/jupyterlab_examples_state/__init__.py index 819e43e0..353ab522 100644 --- a/state/jupyterlab_examples_state/__init__.py +++ b/state/jupyterlab_examples_state/__init__.py @@ -6,12 +6,12 @@ HERE = osp.abspath(osp.dirname(__file__)) -with open(osp.join(HERE, 'static', 'package.json')) as fid: +with open(osp.join(HERE, 'labextension', 'package.json')) as fid: data = json.load(fid) def _jupyter_labextension_paths(): return [{ - 'src': 'static', + 'src': 'labextension', 'dest': data['name'] }] diff --git a/widget-tracker/widgets/jupyterlab_examples_widgets/__init__.py b/widget-tracker/widgets/jupyterlab_examples_widgets/__init__.py index 819e43e0..353ab522 100644 --- a/widget-tracker/widgets/jupyterlab_examples_widgets/__init__.py +++ b/widget-tracker/widgets/jupyterlab_examples_widgets/__init__.py @@ -6,12 +6,12 @@ HERE = osp.abspath(osp.dirname(__file__)) -with open(osp.join(HERE, 'static', 'package.json')) as fid: +with open(osp.join(HERE, 'labextension', 'package.json')) as fid: data = json.load(fid) def _jupyter_labextension_paths(): return [{ - 'src': 'static', + 'src': 'labextension', 'dest': data['name'] }] From cf613268209cb9a9f4a0f428c462906712a0f21d Mon Sep 17 00:00:00 2001 From: Jeremy Tuloup Date: Wed, 23 Dec 2020 16:15:23 +0100 Subject: [PATCH 36/45] Update to the latest RC --- advanced/kernel-messaging/package.json | 16 ++++++------- advanced/kernel-messaging/pyproject.toml | 2 +- advanced/kernel-messaging/setup.py | 15 ++++++++---- advanced/kernel-messaging/style/base.css | 0 advanced/kernel-messaging/style/index.js | 1 + advanced/kernel-output/package.json | 14 +++++------ advanced/kernel-output/pyproject.toml | 2 +- advanced/kernel-output/setup.py | 15 ++++++++---- advanced/kernel-output/style/base.css | 0 advanced/kernel-output/style/index.js | 1 + advanced/server-extension/package.json | 12 +++++----- advanced/server-extension/pyproject.toml | 2 +- advanced/server-extension/setup.py | 17 ++++++++----- advanced/server-extension/style/base.css | 0 advanced/server-extension/style/index.js | 1 + basics/datagrid/package.json | 10 ++++---- basics/datagrid/pyproject.toml | 2 +- basics/datagrid/setup.py | 15 ++++++++---- basics/datagrid/style/base.css | 0 basics/datagrid/style/index.js | 1 + basics/hello-world/package.json | 6 ++--- basics/hello-world/pyproject.toml | 2 +- basics/hello-world/setup.py | 15 ++++++++---- basics/hello-world/style/base.css | 0 basics/hello-world/style/index.js | 1 + basics/signals/package.json | 12 +++++----- basics/signals/pyproject.toml | 2 +- basics/signals/setup.py | 15 ++++++++---- basics/signals/style/base.css | 0 basics/signals/style/index.js | 1 + command-palette/package.json | 6 ++--- command-palette/pyproject.toml | 2 +- command-palette/setup.py | 15 ++++++++---- command-palette/style/base.css | 0 command-palette/style/index.js | 1 + commands/package.json | 6 ++--- commands/pyproject.toml | 2 +- commands/setup.py | 15 ++++++++---- commands/style/base.css | 0 commands/style/index.js | 1 + context-menu/package.json | 12 +++++----- context-menu/pyproject.toml | 2 +- context-menu/setup.py | 15 ++++++++---- context-menu/style/base.css | 0 context-menu/style/index.js | 1 + environment.yml | 2 +- launcher/package.json | 12 +++++----- launcher/pyproject.toml | 2 +- launcher/setup.py | 15 ++++++++---- launcher/style/base.css | 0 launcher/style/index.js | 1 + log-console/custom-log-console/package.json | 22 ++++++++--------- log-console/custom-log-console/pyproject.toml | 2 +- log-console/custom-log-console/setup.py | 15 ++++++++---- log-console/custom-log-console/style/base.css | 0 log-console/custom-log-console/style/index.js | 1 + log-console/log-messages/package.json | 24 +++++++++---------- log-console/log-messages/pyproject.toml | 2 +- log-console/log-messages/setup.py | 15 ++++++++---- log-console/log-messages/style/base.css | 0 log-console/log-messages/style/index.js | 1 + main-menu/package.json | 10 ++++---- main-menu/pyproject.toml | 2 +- main-menu/setup.py | 15 ++++++++---- main-menu/style/base.css | 0 main-menu/style/index.js | 1 + react/react-widget/package.json | 10 ++++---- react/react-widget/pyproject.toml | 2 +- react/react-widget/setup.py | 15 ++++++++---- react/react-widget/style/base.css | 0 react/react-widget/style/index.js | 1 + settings/package.json | 12 +++++----- settings/pyproject.toml | 2 +- settings/setup.py | 15 ++++++++---- settings/style/base.css | 0 settings/style/index.js | 1 + state/package.json | 10 ++++---- state/pyproject.toml | 2 +- state/setup.py | 15 ++++++++---- state/style/base.css | 0 state/style/index.js | 1 + widget-tracker/widgets/package.json | 8 +++---- widget-tracker/widgets/pyproject.toml | 2 +- widget-tracker/widgets/setup.py | 15 ++++++++---- widget-tracker/widgets/style/base.css | 0 widget-tracker/widgets/style/index.js | 1 + 86 files changed, 307 insertions(+), 205 deletions(-) create mode 100644 advanced/kernel-messaging/style/base.css create mode 100644 advanced/kernel-messaging/style/index.js create mode 100644 advanced/kernel-output/style/base.css create mode 100644 advanced/kernel-output/style/index.js create mode 100644 advanced/server-extension/style/base.css create mode 100644 advanced/server-extension/style/index.js create mode 100644 basics/datagrid/style/base.css create mode 100644 basics/datagrid/style/index.js create mode 100644 basics/hello-world/style/base.css create mode 100644 basics/hello-world/style/index.js create mode 100644 basics/signals/style/base.css create mode 100644 basics/signals/style/index.js create mode 100644 command-palette/style/base.css create mode 100644 command-palette/style/index.js create mode 100644 commands/style/base.css create mode 100644 commands/style/index.js create mode 100644 context-menu/style/base.css create mode 100644 context-menu/style/index.js create mode 100644 launcher/style/base.css create mode 100644 launcher/style/index.js create mode 100644 log-console/custom-log-console/style/base.css create mode 100644 log-console/custom-log-console/style/index.js create mode 100644 log-console/log-messages/style/base.css create mode 100644 log-console/log-messages/style/index.js create mode 100644 main-menu/style/base.css create mode 100644 main-menu/style/index.js create mode 100644 react/react-widget/style/base.css create mode 100644 react/react-widget/style/index.js create mode 100644 settings/style/base.css create mode 100644 settings/style/index.js create mode 100644 state/style/base.css create mode 100644 state/style/index.js create mode 100644 widget-tracker/widgets/style/base.css create mode 100644 widget-tracker/widgets/style/index.js diff --git a/advanced/kernel-messaging/package.json b/advanced/kernel-messaging/package.json index 0787719a..6f10debc 100644 --- a/advanced/kernel-messaging/package.json +++ b/advanced/kernel-messaging/package.json @@ -44,19 +44,19 @@ "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "^3.0.0-rc.7", - "@jupyterlab/launcher": "^3.0.0-rc.7", - "@jupyterlab/mainmenu": "^3.0.0-rc.7", - "@jupyterlab/nbformat": "^3.0.0-rc.7", - "@jupyterlab/translation": "^3.0.0-rc.7", + "@jupyterlab/application": "^3.0.0-rc.15", + "@jupyterlab/launcher": "^3.0.0-rc.15", + "@jupyterlab/mainmenu": "^3.0.0-rc.15", + "@jupyterlab/nbformat": "^3.0.0-rc.15", + "@jupyterlab/translation": "^3.0.0-rc.15", "@lumino/algorithm": "^1.3.3", "@lumino/coreutils": "^1.5.3", "@lumino/datagrid": "^0.5.2", "@lumino/disposable": "^1.4.3", - "@lumino/widgets": "^1.14.0" + "@lumino/widgets": "^1.16.1" }, "devDependencies": { - "@jupyterlab/builder": "^3.0.0-rc.7", + "@jupyterlab/builder": "^3.0.0-rc.15", "@typescript-eslint/eslint-plugin": "^2.27.0", "@typescript-eslint/parser": "^2.27.0", "eslint": "^7.5.0", @@ -67,7 +67,7 @@ "npm-run-all": "^4.1.5", "prettier": "^1.19.0", "rimraf": "^3.0.2", - "typescript": "~4.0.3" + "typescript": "~4.1.3" }, "sideEffects": [ "style/*.css" diff --git a/advanced/kernel-messaging/pyproject.toml b/advanced/kernel-messaging/pyproject.toml index ca305776..c40f3629 100644 --- a/advanced/kernel-messaging/pyproject.toml +++ b/advanced/kernel-messaging/pyproject.toml @@ -1,3 +1,3 @@ [build-system] -requires = ["jupyter_packaging~=0.7.0", "jupyterlab>=3.0.0rc2,==3.*", "setuptools>=40.8.0", "wheel"] +requires = ["jupyter_packaging~=0.7.9", "jupyterlab>=3.0.0rc15,==3.*", "setuptools>=40.8.0", "wheel"] build-backend = "setuptools.build_meta" diff --git a/advanced/kernel-messaging/setup.py b/advanced/kernel-messaging/setup.py index 754f3005..6592ff5d 100644 --- a/advanced/kernel-messaging/setup.py +++ b/advanced/kernel-messaging/setup.py @@ -6,7 +6,7 @@ from jupyter_packaging import ( create_cmdclass, install_npm, ensure_targets, - combine_commands, get_version, + combine_commands, skip_if_exists ) import setuptools @@ -23,7 +23,6 @@ # Representative files that should exist after a successful build jstargets = [ - os.path.join(HERE, "lib", "index.js"), os.path.join(lab_path, "package.json"), ] @@ -45,11 +44,17 @@ data_files_spec=data_files_spec ) -cmdclass["jsdeps"] = combine_commands( +js_command = combine_commands( install_npm(HERE, build_cmd="build:prod", npm=["jlpm"]), ensure_targets(jstargets), ) +is_repo = os.path.exists(os.path.join(HERE, ".git")) +if is_repo: + cmdclass["jsdeps"] = js_command +else: + cmdclass["jsdeps"] = skip_if_exists(jstargets, js_command) + with open("README.md", "r") as fh: long_description = fh.read() @@ -64,14 +69,14 @@ cmdclass= cmdclass, packages=setuptools.find_packages(), install_requires=[ - "jupyterlab>=3.0.0rc2,==3.*", + "jupyterlab>=3.0.0rc15,==3.*", ], zip_safe=False, include_package_data=True, python_requires=">=3.6", license="BSD-3-Clause", platforms="Linux, Mac OS X, Windows", - keywords=["Jupyter", "JupyterLab"], + keywords=["Jupyter", "JupyterLab", "JupyterLab3"], classifiers=[ "License :: OSI Approved :: BSD License", "Programming Language :: Python", diff --git a/advanced/kernel-messaging/style/base.css b/advanced/kernel-messaging/style/base.css new file mode 100644 index 00000000..e69de29b diff --git a/advanced/kernel-messaging/style/index.js b/advanced/kernel-messaging/style/index.js new file mode 100644 index 00000000..a028a764 --- /dev/null +++ b/advanced/kernel-messaging/style/index.js @@ -0,0 +1 @@ +import './base.css'; diff --git a/advanced/kernel-output/package.json b/advanced/kernel-output/package.json index 8f7a53d2..73e6f93a 100644 --- a/advanced/kernel-output/package.json +++ b/advanced/kernel-output/package.json @@ -44,18 +44,18 @@ "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "^3.0.0-rc.7", - "@jupyterlab/launcher": "^3.0.0-rc.7", - "@jupyterlab/mainmenu": "^3.0.0-rc.7", - "@jupyterlab/outputarea": "^3.0.0-rc.7", - "@jupyterlab/translation": "^3.0.0-rc.7", + "@jupyterlab/application": "^3.0.0-rc.15", + "@jupyterlab/launcher": "^3.0.0-rc.15", + "@jupyterlab/mainmenu": "^3.0.0-rc.15", + "@jupyterlab/outputarea": "^3.0.0-rc.15", + "@jupyterlab/translation": "^3.0.0-rc.15", "@lumino/algorithm": "^1.3.3", "@lumino/coreutils": "^1.5.3", "@lumino/datagrid": "^0.3.1", "@lumino/disposable": "^1.4.3" }, "devDependencies": { - "@jupyterlab/builder": "^3.0.0-rc.7", + "@jupyterlab/builder": "^3.0.0-rc.15", "@typescript-eslint/eslint-plugin": "^2.27.0", "@typescript-eslint/parser": "^2.27.0", "eslint": "^7.5.0", @@ -66,7 +66,7 @@ "npm-run-all": "^4.1.5", "prettier": "^1.19.0", "rimraf": "^3.0.2", - "typescript": "~4.0.3" + "typescript": "~4.1.3" }, "sideEffects": [ "style/*.css" diff --git a/advanced/kernel-output/pyproject.toml b/advanced/kernel-output/pyproject.toml index ca305776..c40f3629 100644 --- a/advanced/kernel-output/pyproject.toml +++ b/advanced/kernel-output/pyproject.toml @@ -1,3 +1,3 @@ [build-system] -requires = ["jupyter_packaging~=0.7.0", "jupyterlab>=3.0.0rc2,==3.*", "setuptools>=40.8.0", "wheel"] +requires = ["jupyter_packaging~=0.7.9", "jupyterlab>=3.0.0rc15,==3.*", "setuptools>=40.8.0", "wheel"] build-backend = "setuptools.build_meta" diff --git a/advanced/kernel-output/setup.py b/advanced/kernel-output/setup.py index 246977cd..4fb31193 100644 --- a/advanced/kernel-output/setup.py +++ b/advanced/kernel-output/setup.py @@ -6,7 +6,7 @@ from jupyter_packaging import ( create_cmdclass, install_npm, ensure_targets, - combine_commands, get_version, + combine_commands, skip_if_exists ) import setuptools @@ -23,7 +23,6 @@ # Representative files that should exist after a successful build jstargets = [ - os.path.join(HERE, "lib", "index.js"), os.path.join(lab_path, "package.json"), ] @@ -45,11 +44,17 @@ data_files_spec=data_files_spec ) -cmdclass["jsdeps"] = combine_commands( +js_command = combine_commands( install_npm(HERE, build_cmd="build:prod", npm=["jlpm"]), ensure_targets(jstargets), ) +is_repo = os.path.exists(os.path.join(HERE, ".git")) +if is_repo: + cmdclass["jsdeps"] = js_command +else: + cmdclass["jsdeps"] = skip_if_exists(jstargets, js_command) + with open("README.md", "r") as fh: long_description = fh.read() @@ -64,14 +69,14 @@ cmdclass= cmdclass, packages=setuptools.find_packages(), install_requires=[ - "jupyterlab>=3.0.0rc2,==3.*", + "jupyterlab>=3.0.0rc15,==3.*", ], zip_safe=False, include_package_data=True, python_requires=">=3.6", license="BSD-3-Clause", platforms="Linux, Mac OS X, Windows", - keywords=["Jupyter", "JupyterLab"], + keywords=["Jupyter", "JupyterLab", "JupyterLab3"], classifiers=[ "License :: OSI Approved :: BSD License", "Programming Language :: Python", diff --git a/advanced/kernel-output/style/base.css b/advanced/kernel-output/style/base.css new file mode 100644 index 00000000..e69de29b diff --git a/advanced/kernel-output/style/index.js b/advanced/kernel-output/style/index.js new file mode 100644 index 00000000..a028a764 --- /dev/null +++ b/advanced/kernel-output/style/index.js @@ -0,0 +1 @@ +import './base.css'; diff --git a/advanced/server-extension/package.json b/advanced/server-extension/package.json index 0dc896d8..776ec173 100644 --- a/advanced/server-extension/package.json +++ b/advanced/server-extension/package.json @@ -44,13 +44,13 @@ "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "^3.0.0-rc.7", - "@jupyterlab/coreutils": "^5.0.0-rc.7", - "@jupyterlab/launcher": "^3.0.0-rc.7", - "@jupyterlab/services": "^6.0.0-rc.7" + "@jupyterlab/application": "^3.0.0-rc.15", + "@jupyterlab/coreutils": "^5.0.0-rc.15", + "@jupyterlab/launcher": "^3.0.0-rc.15", + "@jupyterlab/services": "^6.0.0-rc.15" }, "devDependencies": { - "@jupyterlab/builder": "^3.0.0-rc.7", + "@jupyterlab/builder": "^3.0.0-rc.15", "@typescript-eslint/eslint-plugin": "^2.27.0", "@typescript-eslint/parser": "^2.27.0", "eslint": "^7.5.0", @@ -62,7 +62,7 @@ "npm-run-all": "^4.1.5", "prettier": "^1.19.0", "rimraf": "^3.0.2", - "typescript": "~4.0.3" + "typescript": "~4.1.3" }, "sideEffects": [ "style/*.css" diff --git a/advanced/server-extension/pyproject.toml b/advanced/server-extension/pyproject.toml index ca305776..c40f3629 100644 --- a/advanced/server-extension/pyproject.toml +++ b/advanced/server-extension/pyproject.toml @@ -1,3 +1,3 @@ [build-system] -requires = ["jupyter_packaging~=0.7.0", "jupyterlab>=3.0.0rc2,==3.*", "setuptools>=40.8.0", "wheel"] +requires = ["jupyter_packaging~=0.7.9", "jupyterlab>=3.0.0rc15,==3.*", "setuptools>=40.8.0", "wheel"] build-backend = "setuptools.build_meta" diff --git a/advanced/server-extension/setup.py b/advanced/server-extension/setup.py index 88abcd2d..c59b9ae7 100644 --- a/advanced/server-extension/setup.py +++ b/advanced/server-extension/setup.py @@ -6,7 +6,7 @@ from jupyter_packaging import ( create_cmdclass, install_npm, ensure_targets, - combine_commands, get_version, + combine_commands, skip_if_exists ) import setuptools @@ -23,7 +23,6 @@ # Representative files that should exist after a successful build jstargets = [ - os.path.join(HERE, "lib", "index.js"), os.path.join(lab_path, "package.json"), ] @@ -39,7 +38,7 @@ ("share/jupyter/labextensions/%s" % labext_name, lab_path, "**"), ("share/jupyter/labextensions/%s" % labext_name, HERE, "install.json"),("etc/jupyter/jupyter_server_config.d", "jupyter-config", "jlab_ext_example.json"), - + ] cmdclass = create_cmdclass("jsdeps", @@ -47,11 +46,17 @@ data_files_spec=data_files_spec ) -cmdclass["jsdeps"] = combine_commands( +js_command = combine_commands( install_npm(HERE, build_cmd="build:prod", npm=["jlpm"]), ensure_targets(jstargets), ) +is_repo = os.path.exists(os.path.join(HERE, ".git")) +if is_repo: + cmdclass["jsdeps"] = js_command +else: + cmdclass["jsdeps"] = skip_if_exists(jstargets, js_command) + with open("README.md", "r") as fh: long_description = fh.read() @@ -66,14 +71,14 @@ cmdclass= cmdclass, packages=setuptools.find_packages(), install_requires=[ - "jupyterlab>=3.0.0rc2,==3.*", + "jupyterlab>=3.0.0rc15,==3.*", ], zip_safe=False, include_package_data=True, python_requires=">=3.6", license="BSD-3-Clause", platforms="Linux, Mac OS X, Windows", - keywords=["Jupyter", "JupyterLab"], + keywords=["Jupyter", "JupyterLab", "JupyterLab3"], classifiers=[ "License :: OSI Approved :: BSD License", "Programming Language :: Python", diff --git a/advanced/server-extension/style/base.css b/advanced/server-extension/style/base.css new file mode 100644 index 00000000..e69de29b diff --git a/advanced/server-extension/style/index.js b/advanced/server-extension/style/index.js new file mode 100644 index 00000000..a028a764 --- /dev/null +++ b/advanced/server-extension/style/index.js @@ -0,0 +1 @@ +import './base.css'; diff --git a/basics/datagrid/package.json b/basics/datagrid/package.json index 885d633f..664887f2 100644 --- a/basics/datagrid/package.json +++ b/basics/datagrid/package.json @@ -44,16 +44,16 @@ "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "^3.0.0-rc.7", - "@jupyterlab/mainmenu": "^3.0.0-rc.7", - "@jupyterlab/translation": "^3.0.0-rc.7", + "@jupyterlab/application": "^3.0.0-rc.15", + "@jupyterlab/mainmenu": "^3.0.0-rc.15", + "@jupyterlab/translation": "^3.0.0-rc.15", "@lumino/algorithm": "^1.3.3", "@lumino/coreutils": "^1.5.3", "@lumino/datagrid": "^0.5.2", "@lumino/disposable": "^1.4.3" }, "devDependencies": { - "@jupyterlab/builder": "^3.0.0-rc.7", + "@jupyterlab/builder": "^3.0.0-rc.15", "@typescript-eslint/eslint-plugin": "^2.27.0", "@typescript-eslint/parser": "^2.27.0", "eslint": "^7.5.0", @@ -64,7 +64,7 @@ "npm-run-all": "^4.1.5", "prettier": "^1.19.0", "rimraf": "^3.0.2", - "typescript": "~4.0.3" + "typescript": "~4.1.3" }, "sideEffects": [ "style/*.css" diff --git a/basics/datagrid/pyproject.toml b/basics/datagrid/pyproject.toml index ca305776..c40f3629 100644 --- a/basics/datagrid/pyproject.toml +++ b/basics/datagrid/pyproject.toml @@ -1,3 +1,3 @@ [build-system] -requires = ["jupyter_packaging~=0.7.0", "jupyterlab>=3.0.0rc2,==3.*", "setuptools>=40.8.0", "wheel"] +requires = ["jupyter_packaging~=0.7.9", "jupyterlab>=3.0.0rc15,==3.*", "setuptools>=40.8.0", "wheel"] build-backend = "setuptools.build_meta" diff --git a/basics/datagrid/setup.py b/basics/datagrid/setup.py index 0f69870b..47b028ff 100644 --- a/basics/datagrid/setup.py +++ b/basics/datagrid/setup.py @@ -6,7 +6,7 @@ from jupyter_packaging import ( create_cmdclass, install_npm, ensure_targets, - combine_commands, get_version, + combine_commands, skip_if_exists ) import setuptools @@ -23,7 +23,6 @@ # Representative files that should exist after a successful build jstargets = [ - os.path.join(HERE, "lib", "index.js"), os.path.join(lab_path, "package.json"), ] @@ -45,11 +44,17 @@ data_files_spec=data_files_spec ) -cmdclass["jsdeps"] = combine_commands( +js_command = combine_commands( install_npm(HERE, build_cmd="build:prod", npm=["jlpm"]), ensure_targets(jstargets), ) +is_repo = os.path.exists(os.path.join(HERE, ".git")) +if is_repo: + cmdclass["jsdeps"] = js_command +else: + cmdclass["jsdeps"] = skip_if_exists(jstargets, js_command) + with open("README.md", "r") as fh: long_description = fh.read() @@ -64,14 +69,14 @@ cmdclass= cmdclass, packages=setuptools.find_packages(), install_requires=[ - "jupyterlab>=3.0.0rc2,==3.*", + "jupyterlab>=3.0.0rc15,==3.*", ], zip_safe=False, include_package_data=True, python_requires=">=3.6", license="BSD-3-Clause", platforms="Linux, Mac OS X, Windows", - keywords=["Jupyter", "JupyterLab"], + keywords=["Jupyter", "JupyterLab", "JupyterLab3"], classifiers=[ "License :: OSI Approved :: BSD License", "Programming Language :: Python", diff --git a/basics/datagrid/style/base.css b/basics/datagrid/style/base.css new file mode 100644 index 00000000..e69de29b diff --git a/basics/datagrid/style/index.js b/basics/datagrid/style/index.js new file mode 100644 index 00000000..a028a764 --- /dev/null +++ b/basics/datagrid/style/index.js @@ -0,0 +1 @@ +import './base.css'; diff --git a/basics/hello-world/package.json b/basics/hello-world/package.json index 63abe87d..73200c65 100644 --- a/basics/hello-world/package.json +++ b/basics/hello-world/package.json @@ -44,10 +44,10 @@ "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "^3.0.0-rc.7" + "@jupyterlab/application": "^3.0.0-rc.15" }, "devDependencies": { - "@jupyterlab/builder": "^3.0.0-rc.7", + "@jupyterlab/builder": "^3.0.0-rc.15", "@typescript-eslint/eslint-plugin": "^2.27.0", "@typescript-eslint/parser": "^2.27.0", "eslint": "^7.5.0", @@ -58,7 +58,7 @@ "npm-run-all": "^4.1.5", "prettier": "^1.19.0", "rimraf": "^3.0.2", - "typescript": "~4.0.3" + "typescript": "~4.1.3" }, "sideEffects": [ "style/*.css" diff --git a/basics/hello-world/pyproject.toml b/basics/hello-world/pyproject.toml index ca305776..c40f3629 100644 --- a/basics/hello-world/pyproject.toml +++ b/basics/hello-world/pyproject.toml @@ -1,3 +1,3 @@ [build-system] -requires = ["jupyter_packaging~=0.7.0", "jupyterlab>=3.0.0rc2,==3.*", "setuptools>=40.8.0", "wheel"] +requires = ["jupyter_packaging~=0.7.9", "jupyterlab>=3.0.0rc15,==3.*", "setuptools>=40.8.0", "wheel"] build-backend = "setuptools.build_meta" diff --git a/basics/hello-world/setup.py b/basics/hello-world/setup.py index ebe26d4f..c257f4eb 100644 --- a/basics/hello-world/setup.py +++ b/basics/hello-world/setup.py @@ -6,7 +6,7 @@ from jupyter_packaging import ( create_cmdclass, install_npm, ensure_targets, - combine_commands, get_version, + combine_commands, skip_if_exists ) import setuptools @@ -23,7 +23,6 @@ # Representative files that should exist after a successful build jstargets = [ - os.path.join(HERE, "lib", "index.js"), os.path.join(lab_path, "package.json"), ] @@ -45,11 +44,17 @@ data_files_spec=data_files_spec ) -cmdclass["jsdeps"] = combine_commands( +js_command = combine_commands( install_npm(HERE, build_cmd="build:prod", npm=["jlpm"]), ensure_targets(jstargets), ) +is_repo = os.path.exists(os.path.join(HERE, ".git")) +if is_repo: + cmdclass["jsdeps"] = js_command +else: + cmdclass["jsdeps"] = skip_if_exists(jstargets, js_command) + with open("README.md", "r") as fh: long_description = fh.read() @@ -64,14 +69,14 @@ cmdclass= cmdclass, packages=setuptools.find_packages(), install_requires=[ - "jupyterlab>=3.0.0rc2,==3.*", + "jupyterlab>=3.0.0rc15,==3.*", ], zip_safe=False, include_package_data=True, python_requires=">=3.6", license="BSD-3-Clause", platforms="Linux, Mac OS X, Windows", - keywords=["Jupyter", "JupyterLab"], + keywords=["Jupyter", "JupyterLab", "JupyterLab3"], classifiers=[ "License :: OSI Approved :: BSD License", "Programming Language :: Python", diff --git a/basics/hello-world/style/base.css b/basics/hello-world/style/base.css new file mode 100644 index 00000000..e69de29b diff --git a/basics/hello-world/style/index.js b/basics/hello-world/style/index.js new file mode 100644 index 00000000..a028a764 --- /dev/null +++ b/basics/hello-world/style/index.js @@ -0,0 +1 @@ +import './base.css'; diff --git a/basics/signals/package.json b/basics/signals/package.json index ca64321a..66cd9c26 100644 --- a/basics/signals/package.json +++ b/basics/signals/package.json @@ -44,17 +44,17 @@ "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "^3.0.0-rc.7", - "@jupyterlab/launcher": "^3.0.0-rc.7", - "@jupyterlab/mainmenu": "^3.0.0-rc.7", - "@jupyterlab/translation": "^3.0.0-rc.7", + "@jupyterlab/application": "^3.0.0-rc.15", + "@jupyterlab/launcher": "^3.0.0-rc.15", + "@jupyterlab/mainmenu": "^3.0.0-rc.15", + "@jupyterlab/translation": "^3.0.0-rc.15", "@lumino/algorithm": "^1.3.3", "@lumino/coreutils": "^1.5.3", "@lumino/datagrid": "^0.3.1", "@lumino/disposable": "^1.4.3" }, "devDependencies": { - "@jupyterlab/builder": "^3.0.0-rc.7", + "@jupyterlab/builder": "^3.0.0-rc.15", "@typescript-eslint/eslint-plugin": "^2.27.0", "@typescript-eslint/parser": "^2.27.0", "eslint": "^7.5.0", @@ -65,7 +65,7 @@ "npm-run-all": "^4.1.5", "prettier": "^1.19.0", "rimraf": "^3.0.2", - "typescript": "~4.0.3" + "typescript": "~4.1.3" }, "sideEffects": [ "style/*.css" diff --git a/basics/signals/pyproject.toml b/basics/signals/pyproject.toml index ca305776..c40f3629 100644 --- a/basics/signals/pyproject.toml +++ b/basics/signals/pyproject.toml @@ -1,3 +1,3 @@ [build-system] -requires = ["jupyter_packaging~=0.7.0", "jupyterlab>=3.0.0rc2,==3.*", "setuptools>=40.8.0", "wheel"] +requires = ["jupyter_packaging~=0.7.9", "jupyterlab>=3.0.0rc15,==3.*", "setuptools>=40.8.0", "wheel"] build-backend = "setuptools.build_meta" diff --git a/basics/signals/setup.py b/basics/signals/setup.py index 80747814..d7381cf3 100644 --- a/basics/signals/setup.py +++ b/basics/signals/setup.py @@ -6,7 +6,7 @@ from jupyter_packaging import ( create_cmdclass, install_npm, ensure_targets, - combine_commands, get_version, + combine_commands, skip_if_exists ) import setuptools @@ -23,7 +23,6 @@ # Representative files that should exist after a successful build jstargets = [ - os.path.join(HERE, "lib", "index.js"), os.path.join(lab_path, "package.json"), ] @@ -45,11 +44,17 @@ data_files_spec=data_files_spec ) -cmdclass["jsdeps"] = combine_commands( +js_command = combine_commands( install_npm(HERE, build_cmd="build:prod", npm=["jlpm"]), ensure_targets(jstargets), ) +is_repo = os.path.exists(os.path.join(HERE, ".git")) +if is_repo: + cmdclass["jsdeps"] = js_command +else: + cmdclass["jsdeps"] = skip_if_exists(jstargets, js_command) + with open("README.md", "r") as fh: long_description = fh.read() @@ -64,14 +69,14 @@ cmdclass= cmdclass, packages=setuptools.find_packages(), install_requires=[ - "jupyterlab>=3.0.0rc2,==3.*", + "jupyterlab>=3.0.0rc15,==3.*", ], zip_safe=False, include_package_data=True, python_requires=">=3.6", license="BSD-3-Clause", platforms="Linux, Mac OS X, Windows", - keywords=["Jupyter", "JupyterLab"], + keywords=["Jupyter", "JupyterLab", "JupyterLab3"], classifiers=[ "License :: OSI Approved :: BSD License", "Programming Language :: Python", diff --git a/basics/signals/style/base.css b/basics/signals/style/base.css new file mode 100644 index 00000000..e69de29b diff --git a/basics/signals/style/index.js b/basics/signals/style/index.js new file mode 100644 index 00000000..a028a764 --- /dev/null +++ b/basics/signals/style/index.js @@ -0,0 +1 @@ +import './base.css'; diff --git a/command-palette/package.json b/command-palette/package.json index 10106f82..3572bcad 100644 --- a/command-palette/package.json +++ b/command-palette/package.json @@ -44,10 +44,10 @@ "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "^3.0.0-rc.7" + "@jupyterlab/application": "^3.0.0-rc.15" }, "devDependencies": { - "@jupyterlab/builder": "^3.0.0-rc.7", + "@jupyterlab/builder": "^3.0.0-rc.15", "@typescript-eslint/eslint-plugin": "^2.27.0", "@typescript-eslint/parser": "^2.27.0", "eslint": "^7.5.0", @@ -58,7 +58,7 @@ "npm-run-all": "^4.1.5", "prettier": "^1.19.0", "rimraf": "^3.0.2", - "typescript": "~4.0.3" + "typescript": "~4.1.3" }, "sideEffects": [ "style/*.css" diff --git a/command-palette/pyproject.toml b/command-palette/pyproject.toml index ca305776..c40f3629 100644 --- a/command-palette/pyproject.toml +++ b/command-palette/pyproject.toml @@ -1,3 +1,3 @@ [build-system] -requires = ["jupyter_packaging~=0.7.0", "jupyterlab>=3.0.0rc2,==3.*", "setuptools>=40.8.0", "wheel"] +requires = ["jupyter_packaging~=0.7.9", "jupyterlab>=3.0.0rc15,==3.*", "setuptools>=40.8.0", "wheel"] build-backend = "setuptools.build_meta" diff --git a/command-palette/setup.py b/command-palette/setup.py index ff21cfb1..fe413975 100644 --- a/command-palette/setup.py +++ b/command-palette/setup.py @@ -6,7 +6,7 @@ from jupyter_packaging import ( create_cmdclass, install_npm, ensure_targets, - combine_commands, get_version, + combine_commands, skip_if_exists ) import setuptools @@ -23,7 +23,6 @@ # Representative files that should exist after a successful build jstargets = [ - os.path.join(HERE, "lib", "index.js"), os.path.join(lab_path, "package.json"), ] @@ -45,11 +44,17 @@ data_files_spec=data_files_spec ) -cmdclass["jsdeps"] = combine_commands( +js_command = combine_commands( install_npm(HERE, build_cmd="build:prod", npm=["jlpm"]), ensure_targets(jstargets), ) +is_repo = os.path.exists(os.path.join(HERE, ".git")) +if is_repo: + cmdclass["jsdeps"] = js_command +else: + cmdclass["jsdeps"] = skip_if_exists(jstargets, js_command) + with open("README.md", "r") as fh: long_description = fh.read() @@ -64,14 +69,14 @@ cmdclass= cmdclass, packages=setuptools.find_packages(), install_requires=[ - "jupyterlab>=3.0.0rc2,==3.*", + "jupyterlab>=3.0.0rc15,==3.*", ], zip_safe=False, include_package_data=True, python_requires=">=3.6", license="BSD-3-Clause", platforms="Linux, Mac OS X, Windows", - keywords=["Jupyter", "JupyterLab"], + keywords=["Jupyter", "JupyterLab", "JupyterLab3"], classifiers=[ "License :: OSI Approved :: BSD License", "Programming Language :: Python", diff --git a/command-palette/style/base.css b/command-palette/style/base.css new file mode 100644 index 00000000..e69de29b diff --git a/command-palette/style/index.js b/command-palette/style/index.js new file mode 100644 index 00000000..a028a764 --- /dev/null +++ b/command-palette/style/index.js @@ -0,0 +1 @@ +import './base.css'; diff --git a/commands/package.json b/commands/package.json index 0eae889d..5fdddfe9 100644 --- a/commands/package.json +++ b/commands/package.json @@ -44,10 +44,10 @@ "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "^3.0.0-rc.7" + "@jupyterlab/application": "^3.0.0-rc.15" }, "devDependencies": { - "@jupyterlab/builder": "^3.0.0-rc.7", + "@jupyterlab/builder": "^3.0.0-rc.15", "@typescript-eslint/eslint-plugin": "^2.27.0", "@typescript-eslint/parser": "^2.27.0", "eslint": "^7.5.0", @@ -58,7 +58,7 @@ "npm-run-all": "^4.1.5", "prettier": "^1.19.0", "rimraf": "^3.0.2", - "typescript": "~4.0.3" + "typescript": "~4.1.3" }, "sideEffects": [ "style/*.css" diff --git a/commands/pyproject.toml b/commands/pyproject.toml index ca305776..c40f3629 100644 --- a/commands/pyproject.toml +++ b/commands/pyproject.toml @@ -1,3 +1,3 @@ [build-system] -requires = ["jupyter_packaging~=0.7.0", "jupyterlab>=3.0.0rc2,==3.*", "setuptools>=40.8.0", "wheel"] +requires = ["jupyter_packaging~=0.7.9", "jupyterlab>=3.0.0rc15,==3.*", "setuptools>=40.8.0", "wheel"] build-backend = "setuptools.build_meta" diff --git a/commands/setup.py b/commands/setup.py index 826e28c4..1448ae43 100644 --- a/commands/setup.py +++ b/commands/setup.py @@ -6,7 +6,7 @@ from jupyter_packaging import ( create_cmdclass, install_npm, ensure_targets, - combine_commands, get_version, + combine_commands, skip_if_exists ) import setuptools @@ -23,7 +23,6 @@ # Representative files that should exist after a successful build jstargets = [ - os.path.join(HERE, "lib", "index.js"), os.path.join(lab_path, "package.json"), ] @@ -45,11 +44,17 @@ data_files_spec=data_files_spec ) -cmdclass["jsdeps"] = combine_commands( +js_command = combine_commands( install_npm(HERE, build_cmd="build:prod", npm=["jlpm"]), ensure_targets(jstargets), ) +is_repo = os.path.exists(os.path.join(HERE, ".git")) +if is_repo: + cmdclass["jsdeps"] = js_command +else: + cmdclass["jsdeps"] = skip_if_exists(jstargets, js_command) + with open("README.md", "r") as fh: long_description = fh.read() @@ -64,14 +69,14 @@ cmdclass= cmdclass, packages=setuptools.find_packages(), install_requires=[ - "jupyterlab>=3.0.0rc2,==3.*", + "jupyterlab>=3.0.0rc15,==3.*", ], zip_safe=False, include_package_data=True, python_requires=">=3.6", license="BSD-3-Clause", platforms="Linux, Mac OS X, Windows", - keywords=["Jupyter", "JupyterLab"], + keywords=["Jupyter", "JupyterLab", "JupyterLab3"], classifiers=[ "License :: OSI Approved :: BSD License", "Programming Language :: Python", diff --git a/commands/style/base.css b/commands/style/base.css new file mode 100644 index 00000000..e69de29b diff --git a/commands/style/index.js b/commands/style/index.js new file mode 100644 index 00000000..a028a764 --- /dev/null +++ b/commands/style/index.js @@ -0,0 +1 @@ +import './base.css'; diff --git a/context-menu/package.json b/context-menu/package.json index 297371db..7d7e8d78 100644 --- a/context-menu/package.json +++ b/context-menu/package.json @@ -44,13 +44,13 @@ "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "^3.0.0-rc.7", - "@jupyterlab/apputils": "^3.0.0-rc.7", - "@jupyterlab/filebrowser": "^3.0.0-rc.7", - "@jupyterlab/ui-components": "^3.0.0-rc.7" + "@jupyterlab/application": "^3.0.0-rc.15", + "@jupyterlab/apputils": "^3.0.0-rc.15", + "@jupyterlab/filebrowser": "^3.0.0-rc.15", + "@jupyterlab/ui-components": "^3.0.0-rc.15" }, "devDependencies": { - "@jupyterlab/builder": "^3.0.0-rc.7", + "@jupyterlab/builder": "^3.0.0-rc.15", "@typescript-eslint/eslint-plugin": "^2.27.0", "@typescript-eslint/parser": "^2.27.0", "eslint": "^7.5.0", @@ -61,7 +61,7 @@ "npm-run-all": "^4.1.5", "prettier": "^1.19.0", "rimraf": "^3.0.2", - "typescript": "~4.0.3" + "typescript": "~4.1.3" }, "sideEffects": [ "style/*.css" diff --git a/context-menu/pyproject.toml b/context-menu/pyproject.toml index ca305776..c40f3629 100644 --- a/context-menu/pyproject.toml +++ b/context-menu/pyproject.toml @@ -1,3 +1,3 @@ [build-system] -requires = ["jupyter_packaging~=0.7.0", "jupyterlab>=3.0.0rc2,==3.*", "setuptools>=40.8.0", "wheel"] +requires = ["jupyter_packaging~=0.7.9", "jupyterlab>=3.0.0rc15,==3.*", "setuptools>=40.8.0", "wheel"] build-backend = "setuptools.build_meta" diff --git a/context-menu/setup.py b/context-menu/setup.py index f7420e5e..ce0832aa 100644 --- a/context-menu/setup.py +++ b/context-menu/setup.py @@ -6,7 +6,7 @@ from jupyter_packaging import ( create_cmdclass, install_npm, ensure_targets, - combine_commands, get_version, + combine_commands, skip_if_exists ) import setuptools @@ -23,7 +23,6 @@ # Representative files that should exist after a successful build jstargets = [ - os.path.join(HERE, "lib", "index.js"), os.path.join(lab_path, "package.json"), ] @@ -45,11 +44,17 @@ data_files_spec=data_files_spec ) -cmdclass["jsdeps"] = combine_commands( +js_command = combine_commands( install_npm(HERE, build_cmd="build:prod", npm=["jlpm"]), ensure_targets(jstargets), ) +is_repo = os.path.exists(os.path.join(HERE, ".git")) +if is_repo: + cmdclass["jsdeps"] = js_command +else: + cmdclass["jsdeps"] = skip_if_exists(jstargets, js_command) + with open("README.md", "r") as fh: long_description = fh.read() @@ -64,14 +69,14 @@ cmdclass= cmdclass, packages=setuptools.find_packages(), install_requires=[ - "jupyterlab>=3.0.0rc2,==3.*", + "jupyterlab>=3.0.0rc15,==3.*", ], zip_safe=False, include_package_data=True, python_requires=">=3.6", license="BSD-3-Clause", platforms="Linux, Mac OS X, Windows", - keywords=["Jupyter", "JupyterLab"], + keywords=["Jupyter", "JupyterLab", "JupyterLab3"], classifiers=[ "License :: OSI Approved :: BSD License", "Programming Language :: Python", diff --git a/context-menu/style/base.css b/context-menu/style/base.css new file mode 100644 index 00000000..e69de29b diff --git a/context-menu/style/index.js b/context-menu/style/index.js new file mode 100644 index 00000000..a028a764 --- /dev/null +++ b/context-menu/style/index.js @@ -0,0 +1 @@ +import './base.css'; diff --git a/environment.yml b/environment.yml index 76b35029..b80d7ad8 100644 --- a/environment.yml +++ b/environment.yml @@ -2,7 +2,7 @@ name: jupyterlab-extension-examples channels: - conda-forge dependencies: +- jupyterlab=3 - nodejs - python=3 - yarn -- jupyterlab=2 diff --git a/launcher/package.json b/launcher/package.json index f67c680e..1c6b2f15 100644 --- a/launcher/package.json +++ b/launcher/package.json @@ -44,13 +44,13 @@ "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "^3.0.0-rc.7", - "@jupyterlab/filebrowser": "^3.0.0-rc.7", - "@jupyterlab/launcher": "^3.0.0-rc.7", - "@jupyterlab/mainmenu": "^3.0.0-rc.7" + "@jupyterlab/application": "^3.0.0-rc.15", + "@jupyterlab/filebrowser": "^3.0.0-rc.15", + "@jupyterlab/launcher": "^3.0.0-rc.15", + "@jupyterlab/mainmenu": "^3.0.0-rc.15" }, "devDependencies": { - "@jupyterlab/builder": "^3.0.0-rc.7", + "@jupyterlab/builder": "^3.0.0-rc.15", "@typescript-eslint/eslint-plugin": "^2.27.0", "@typescript-eslint/parser": "^2.27.0", "eslint": "^7.5.0", @@ -61,7 +61,7 @@ "npm-run-all": "^4.1.5", "prettier": "^1.19.0", "rimraf": "^3.0.2", - "typescript": "~4.0.3" + "typescript": "~4.1.3" }, "sideEffects": [ "style/*.css", diff --git a/launcher/pyproject.toml b/launcher/pyproject.toml index ca305776..c40f3629 100644 --- a/launcher/pyproject.toml +++ b/launcher/pyproject.toml @@ -1,3 +1,3 @@ [build-system] -requires = ["jupyter_packaging~=0.7.0", "jupyterlab>=3.0.0rc2,==3.*", "setuptools>=40.8.0", "wheel"] +requires = ["jupyter_packaging~=0.7.9", "jupyterlab>=3.0.0rc15,==3.*", "setuptools>=40.8.0", "wheel"] build-backend = "setuptools.build_meta" diff --git a/launcher/setup.py b/launcher/setup.py index 3e645018..1dd4ea27 100644 --- a/launcher/setup.py +++ b/launcher/setup.py @@ -6,7 +6,7 @@ from jupyter_packaging import ( create_cmdclass, install_npm, ensure_targets, - combine_commands, get_version, + combine_commands, skip_if_exists ) import setuptools @@ -23,7 +23,6 @@ # Representative files that should exist after a successful build jstargets = [ - os.path.join(HERE, "lib", "index.js"), os.path.join(lab_path, "package.json"), ] @@ -45,11 +44,17 @@ data_files_spec=data_files_spec ) -cmdclass["jsdeps"] = combine_commands( +js_command = combine_commands( install_npm(HERE, build_cmd="build:prod", npm=["jlpm"]), ensure_targets(jstargets), ) +is_repo = os.path.exists(os.path.join(HERE, ".git")) +if is_repo: + cmdclass["jsdeps"] = js_command +else: + cmdclass["jsdeps"] = skip_if_exists(jstargets, js_command) + with open("README.md", "r") as fh: long_description = fh.read() @@ -64,14 +69,14 @@ cmdclass= cmdclass, packages=setuptools.find_packages(), install_requires=[ - "jupyterlab>=3.0.0rc2,==3.*", + "jupyterlab>=3.0.0rc15,==3.*", ], zip_safe=False, include_package_data=True, python_requires=">=3.6", license="BSD-3-Clause", platforms="Linux, Mac OS X, Windows", - keywords=["Jupyter", "JupyterLab"], + keywords=["Jupyter", "JupyterLab", "JupyterLab3"], classifiers=[ "License :: OSI Approved :: BSD License", "Programming Language :: Python", diff --git a/launcher/style/base.css b/launcher/style/base.css new file mode 100644 index 00000000..e69de29b diff --git a/launcher/style/index.js b/launcher/style/index.js new file mode 100644 index 00000000..a028a764 --- /dev/null +++ b/launcher/style/index.js @@ -0,0 +1 @@ +import './base.css'; diff --git a/log-console/custom-log-console/package.json b/log-console/custom-log-console/package.json index 1ca19094..4cb4c733 100644 --- a/log-console/custom-log-console/package.json +++ b/log-console/custom-log-console/package.json @@ -44,19 +44,19 @@ "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "^3.0.0-rc.7", - "@jupyterlab/apputils": "^3.0.0-rc.7", - "@jupyterlab/coreutils": "^5.0.0-rc.7", - "@jupyterlab/logconsole": "^3.0.0-rc.7", - "@jupyterlab/mainmenu": "^3.0.0-rc.7", - "@jupyterlab/nbformat": "^3.0.0-rc.7", - "@jupyterlab/rendermime": "^3.0.0-rc.7", - "@jupyterlab/ui-components": "^3.0.0-rc.7", + "@jupyterlab/application": "^3.0.0-rc.15", + "@jupyterlab/apputils": "^3.0.0-rc.15", + "@jupyterlab/coreutils": "^5.0.0-rc.15", + "@jupyterlab/logconsole": "^3.0.0-rc.15", + "@jupyterlab/mainmenu": "^3.0.0-rc.15", + "@jupyterlab/nbformat": "^3.0.0-rc.15", + "@jupyterlab/rendermime": "^3.0.0-rc.15", + "@jupyterlab/ui-components": "^3.0.0-rc.15", "@lumino/coreutils": "^1.5.3", - "@lumino/widgets": "^1.14.0" + "@lumino/widgets": "^1.16.1" }, "devDependencies": { - "@jupyterlab/builder": "^3.0.0-rc.7", + "@jupyterlab/builder": "^3.0.0-rc.15", "@typescript-eslint/eslint-plugin": "^2.27.0", "@typescript-eslint/parser": "^2.27.0", "eslint": "^7.5.0", @@ -67,7 +67,7 @@ "npm-run-all": "^4.1.5", "prettier": "^1.19.0", "rimraf": "^3.0.2", - "typescript": "~4.0.3" + "typescript": "~4.1.3" }, "sideEffects": [ "style/*.css" diff --git a/log-console/custom-log-console/pyproject.toml b/log-console/custom-log-console/pyproject.toml index ca305776..c40f3629 100644 --- a/log-console/custom-log-console/pyproject.toml +++ b/log-console/custom-log-console/pyproject.toml @@ -1,3 +1,3 @@ [build-system] -requires = ["jupyter_packaging~=0.7.0", "jupyterlab>=3.0.0rc2,==3.*", "setuptools>=40.8.0", "wheel"] +requires = ["jupyter_packaging~=0.7.9", "jupyterlab>=3.0.0rc15,==3.*", "setuptools>=40.8.0", "wheel"] build-backend = "setuptools.build_meta" diff --git a/log-console/custom-log-console/setup.py b/log-console/custom-log-console/setup.py index d496aad8..bc188912 100644 --- a/log-console/custom-log-console/setup.py +++ b/log-console/custom-log-console/setup.py @@ -6,7 +6,7 @@ from jupyter_packaging import ( create_cmdclass, install_npm, ensure_targets, - combine_commands, get_version, + combine_commands, skip_if_exists ) import setuptools @@ -23,7 +23,6 @@ # Representative files that should exist after a successful build jstargets = [ - os.path.join(HERE, "lib", "index.js"), os.path.join(lab_path, "package.json"), ] @@ -45,11 +44,17 @@ data_files_spec=data_files_spec ) -cmdclass["jsdeps"] = combine_commands( +js_command = combine_commands( install_npm(HERE, build_cmd="build:prod", npm=["jlpm"]), ensure_targets(jstargets), ) +is_repo = os.path.exists(os.path.join(HERE, ".git")) +if is_repo: + cmdclass["jsdeps"] = js_command +else: + cmdclass["jsdeps"] = skip_if_exists(jstargets, js_command) + with open("README.md", "r") as fh: long_description = fh.read() @@ -64,14 +69,14 @@ cmdclass= cmdclass, packages=setuptools.find_packages(), install_requires=[ - "jupyterlab>=3.0.0rc2,==3.*", + "jupyterlab>=3.0.0rc15,==3.*", ], zip_safe=False, include_package_data=True, python_requires=">=3.6", license="BSD-3-Clause", platforms="Linux, Mac OS X, Windows", - keywords=["Jupyter", "JupyterLab"], + keywords=["Jupyter", "JupyterLab", "JupyterLab3"], classifiers=[ "License :: OSI Approved :: BSD License", "Programming Language :: Python", diff --git a/log-console/custom-log-console/style/base.css b/log-console/custom-log-console/style/base.css new file mode 100644 index 00000000..e69de29b diff --git a/log-console/custom-log-console/style/index.js b/log-console/custom-log-console/style/index.js new file mode 100644 index 00000000..a028a764 --- /dev/null +++ b/log-console/custom-log-console/style/index.js @@ -0,0 +1 @@ +import './base.css'; diff --git a/log-console/log-messages/package.json b/log-console/log-messages/package.json index a5800d6c..dcd83e8d 100644 --- a/log-console/log-messages/package.json +++ b/log-console/log-messages/package.json @@ -44,20 +44,20 @@ "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "^3.0.0-rc.7", - "@jupyterlab/apputils": "^3.0.0-rc.7", - "@jupyterlab/coreutils": "^5.0.0-rc.7", - "@jupyterlab/logconsole": "^3.0.0-rc.7", - "@jupyterlab/mainmenu": "^3.0.0-rc.7", - "@jupyterlab/nbformat": "^3.0.0-rc.7", - "@jupyterlab/notebook": "^3.0.0-rc.7", - "@jupyterlab/rendermime": "^3.0.0-rc.7", - "@jupyterlab/ui-components": "^3.0.0-rc.7", + "@jupyterlab/application": "^3.0.0-rc.15", + "@jupyterlab/apputils": "^3.0.0-rc.15", + "@jupyterlab/coreutils": "^5.0.0-rc.15", + "@jupyterlab/logconsole": "^3.0.0-rc.15", + "@jupyterlab/mainmenu": "^3.0.0-rc.15", + "@jupyterlab/nbformat": "^3.0.0-rc.15", + "@jupyterlab/notebook": "^3.0.0-rc.15", + "@jupyterlab/rendermime": "^3.0.0-rc.15", + "@jupyterlab/ui-components": "^3.0.0-rc.15", "@lumino/coreutils": "^1.5.3", - "@lumino/widgets": "^1.14.0" + "@lumino/widgets": "^1.16.1" }, "devDependencies": { - "@jupyterlab/builder": "^3.0.0-rc.7", + "@jupyterlab/builder": "^3.0.0-rc.15", "@typescript-eslint/eslint-plugin": "^2.27.0", "@typescript-eslint/parser": "^2.27.0", "eslint": "^7.5.0", @@ -68,7 +68,7 @@ "npm-run-all": "^4.1.5", "prettier": "^1.19.0", "rimraf": "^3.0.2", - "typescript": "~4.0.3" + "typescript": "~4.1.3" }, "sideEffects": [ "style/*.css" diff --git a/log-console/log-messages/pyproject.toml b/log-console/log-messages/pyproject.toml index ca305776..c40f3629 100644 --- a/log-console/log-messages/pyproject.toml +++ b/log-console/log-messages/pyproject.toml @@ -1,3 +1,3 @@ [build-system] -requires = ["jupyter_packaging~=0.7.0", "jupyterlab>=3.0.0rc2,==3.*", "setuptools>=40.8.0", "wheel"] +requires = ["jupyter_packaging~=0.7.9", "jupyterlab>=3.0.0rc15,==3.*", "setuptools>=40.8.0", "wheel"] build-backend = "setuptools.build_meta" diff --git a/log-console/log-messages/setup.py b/log-console/log-messages/setup.py index 2fecb102..0b2b0356 100644 --- a/log-console/log-messages/setup.py +++ b/log-console/log-messages/setup.py @@ -6,7 +6,7 @@ from jupyter_packaging import ( create_cmdclass, install_npm, ensure_targets, - combine_commands, get_version, + combine_commands, skip_if_exists ) import setuptools @@ -23,7 +23,6 @@ # Representative files that should exist after a successful build jstargets = [ - os.path.join(HERE, "lib", "index.js"), os.path.join(lab_path, "package.json"), ] @@ -45,11 +44,17 @@ data_files_spec=data_files_spec ) -cmdclass["jsdeps"] = combine_commands( +js_command = combine_commands( install_npm(HERE, build_cmd="build:prod", npm=["jlpm"]), ensure_targets(jstargets), ) +is_repo = os.path.exists(os.path.join(HERE, ".git")) +if is_repo: + cmdclass["jsdeps"] = js_command +else: + cmdclass["jsdeps"] = skip_if_exists(jstargets, js_command) + with open("README.md", "r") as fh: long_description = fh.read() @@ -64,14 +69,14 @@ cmdclass= cmdclass, packages=setuptools.find_packages(), install_requires=[ - "jupyterlab>=3.0.0rc2,==3.*", + "jupyterlab>=3.0.0rc15,==3.*", ], zip_safe=False, include_package_data=True, python_requires=">=3.6", license="BSD-3-Clause", platforms="Linux, Mac OS X, Windows", - keywords=["Jupyter", "JupyterLab"], + keywords=["Jupyter", "JupyterLab", "JupyterLab3"], classifiers=[ "License :: OSI Approved :: BSD License", "Programming Language :: Python", diff --git a/log-console/log-messages/style/base.css b/log-console/log-messages/style/base.css new file mode 100644 index 00000000..e69de29b diff --git a/log-console/log-messages/style/index.js b/log-console/log-messages/style/index.js new file mode 100644 index 00000000..a028a764 --- /dev/null +++ b/log-console/log-messages/style/index.js @@ -0,0 +1 @@ +import './base.css'; diff --git a/main-menu/package.json b/main-menu/package.json index 1d137409..30004a35 100644 --- a/main-menu/package.json +++ b/main-menu/package.json @@ -44,12 +44,12 @@ "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "^3.0.0-rc.7", - "@jupyterlab/mainmenu": "^3.0.0-rc.7", - "@lumino/widgets": "^1.14.0" + "@jupyterlab/application": "^3.0.0-rc.15", + "@jupyterlab/mainmenu": "^3.0.0-rc.15", + "@lumino/widgets": "^1.16.1" }, "devDependencies": { - "@jupyterlab/builder": "^3.0.0-rc.7", + "@jupyterlab/builder": "^3.0.0-rc.15", "@typescript-eslint/eslint-plugin": "^2.27.0", "@typescript-eslint/parser": "^2.27.0", "eslint": "^7.5.0", @@ -60,7 +60,7 @@ "npm-run-all": "^4.1.5", "prettier": "^1.19.0", "rimraf": "^3.0.2", - "typescript": "~4.0.3" + "typescript": "~4.1.3" }, "sideEffects": [ "style/*.css" diff --git a/main-menu/pyproject.toml b/main-menu/pyproject.toml index ca305776..c40f3629 100644 --- a/main-menu/pyproject.toml +++ b/main-menu/pyproject.toml @@ -1,3 +1,3 @@ [build-system] -requires = ["jupyter_packaging~=0.7.0", "jupyterlab>=3.0.0rc2,==3.*", "setuptools>=40.8.0", "wheel"] +requires = ["jupyter_packaging~=0.7.9", "jupyterlab>=3.0.0rc15,==3.*", "setuptools>=40.8.0", "wheel"] build-backend = "setuptools.build_meta" diff --git a/main-menu/setup.py b/main-menu/setup.py index 17fc7229..67f3b592 100644 --- a/main-menu/setup.py +++ b/main-menu/setup.py @@ -6,7 +6,7 @@ from jupyter_packaging import ( create_cmdclass, install_npm, ensure_targets, - combine_commands, get_version, + combine_commands, skip_if_exists ) import setuptools @@ -23,7 +23,6 @@ # Representative files that should exist after a successful build jstargets = [ - os.path.join(HERE, "lib", "index.js"), os.path.join(lab_path, "package.json"), ] @@ -45,11 +44,17 @@ data_files_spec=data_files_spec ) -cmdclass["jsdeps"] = combine_commands( +js_command = combine_commands( install_npm(HERE, build_cmd="build:prod", npm=["jlpm"]), ensure_targets(jstargets), ) +is_repo = os.path.exists(os.path.join(HERE, ".git")) +if is_repo: + cmdclass["jsdeps"] = js_command +else: + cmdclass["jsdeps"] = skip_if_exists(jstargets, js_command) + with open("README.md", "r") as fh: long_description = fh.read() @@ -64,14 +69,14 @@ cmdclass= cmdclass, packages=setuptools.find_packages(), install_requires=[ - "jupyterlab>=3.0.0rc2,==3.*", + "jupyterlab>=3.0.0rc15,==3.*", ], zip_safe=False, include_package_data=True, python_requires=">=3.6", license="BSD-3-Clause", platforms="Linux, Mac OS X, Windows", - keywords=["Jupyter", "JupyterLab"], + keywords=["Jupyter", "JupyterLab", "JupyterLab3"], classifiers=[ "License :: OSI Approved :: BSD License", "Programming Language :: Python", diff --git a/main-menu/style/base.css b/main-menu/style/base.css new file mode 100644 index 00000000..e69de29b diff --git a/main-menu/style/index.js b/main-menu/style/index.js new file mode 100644 index 00000000..a028a764 --- /dev/null +++ b/main-menu/style/index.js @@ -0,0 +1 @@ +import './base.css'; diff --git a/react/react-widget/package.json b/react/react-widget/package.json index 43906051..482f68e2 100644 --- a/react/react-widget/package.json +++ b/react/react-widget/package.json @@ -44,12 +44,12 @@ "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "^3.0.0-rc.7", - "@jupyterlab/launcher": "^3.0.0-rc.7", - "@jupyterlab/ui-components": "^3.0.0-rc.7" + "@jupyterlab/application": "^3.0.0-rc.15", + "@jupyterlab/launcher": "^3.0.0-rc.15", + "@jupyterlab/ui-components": "^3.0.0-rc.15" }, "devDependencies": { - "@jupyterlab/builder": "^3.0.0-rc.7", + "@jupyterlab/builder": "^3.0.0-rc.15", "@typescript-eslint/eslint-plugin": "^2.27.0", "@typescript-eslint/parser": "^2.27.0", "eslint": "^7.5.0", @@ -60,7 +60,7 @@ "npm-run-all": "^4.1.5", "prettier": "^1.19.0", "rimraf": "^3.0.2", - "typescript": "~4.0.3" + "typescript": "~4.1.3" }, "sideEffects": [ "style/*.css" diff --git a/react/react-widget/pyproject.toml b/react/react-widget/pyproject.toml index ca305776..c40f3629 100644 --- a/react/react-widget/pyproject.toml +++ b/react/react-widget/pyproject.toml @@ -1,3 +1,3 @@ [build-system] -requires = ["jupyter_packaging~=0.7.0", "jupyterlab>=3.0.0rc2,==3.*", "setuptools>=40.8.0", "wheel"] +requires = ["jupyter_packaging~=0.7.9", "jupyterlab>=3.0.0rc15,==3.*", "setuptools>=40.8.0", "wheel"] build-backend = "setuptools.build_meta" diff --git a/react/react-widget/setup.py b/react/react-widget/setup.py index be65051f..931251aa 100644 --- a/react/react-widget/setup.py +++ b/react/react-widget/setup.py @@ -6,7 +6,7 @@ from jupyter_packaging import ( create_cmdclass, install_npm, ensure_targets, - combine_commands, get_version, + combine_commands, skip_if_exists ) import setuptools @@ -23,7 +23,6 @@ # Representative files that should exist after a successful build jstargets = [ - os.path.join(HERE, "lib", "index.js"), os.path.join(lab_path, "package.json"), ] @@ -45,11 +44,17 @@ data_files_spec=data_files_spec ) -cmdclass["jsdeps"] = combine_commands( +js_command = combine_commands( install_npm(HERE, build_cmd="build:prod", npm=["jlpm"]), ensure_targets(jstargets), ) +is_repo = os.path.exists(os.path.join(HERE, ".git")) +if is_repo: + cmdclass["jsdeps"] = js_command +else: + cmdclass["jsdeps"] = skip_if_exists(jstargets, js_command) + with open("README.md", "r") as fh: long_description = fh.read() @@ -64,14 +69,14 @@ cmdclass= cmdclass, packages=setuptools.find_packages(), install_requires=[ - "jupyterlab>=3.0.0rc2,==3.*", + "jupyterlab>=3.0.0rc15,==3.*", ], zip_safe=False, include_package_data=True, python_requires=">=3.6", license="BSD-3-Clause", platforms="Linux, Mac OS X, Windows", - keywords=["Jupyter", "JupyterLab"], + keywords=["Jupyter", "JupyterLab", "JupyterLab3"], classifiers=[ "License :: OSI Approved :: BSD License", "Programming Language :: Python", diff --git a/react/react-widget/style/base.css b/react/react-widget/style/base.css new file mode 100644 index 00000000..e69de29b diff --git a/react/react-widget/style/index.js b/react/react-widget/style/index.js new file mode 100644 index 00000000..a028a764 --- /dev/null +++ b/react/react-widget/style/index.js @@ -0,0 +1 @@ +import './base.css'; diff --git a/settings/package.json b/settings/package.json index 380f5294..cdbb7c96 100644 --- a/settings/package.json +++ b/settings/package.json @@ -45,13 +45,13 @@ "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "^3.0.0-rc.7", - "@jupyterlab/mainmenu": "^3.0.0-rc.7", - "@jupyterlab/settingregistry": "^3.0.0-rc.7", - "@lumino/widgets": "^1.14.0" + "@jupyterlab/application": "^3.0.0-rc.15", + "@jupyterlab/mainmenu": "^3.0.0-rc.15", + "@jupyterlab/settingregistry": "^3.0.0-rc.15", + "@lumino/widgets": "^1.16.1" }, "devDependencies": { - "@jupyterlab/builder": "^3.0.0-rc.7", + "@jupyterlab/builder": "^3.0.0-rc.15", "@typescript-eslint/eslint-plugin": "^2.27.0", "@typescript-eslint/parser": "^2.27.0", "eslint": "^7.5.0", @@ -62,7 +62,7 @@ "npm-run-all": "^4.1.5", "prettier": "^1.19.0", "rimraf": "^3.0.2", - "typescript": "~4.0.3" + "typescript": "~4.1.3" }, "sideEffects": [ "style/*.css" diff --git a/settings/pyproject.toml b/settings/pyproject.toml index ca305776..c40f3629 100644 --- a/settings/pyproject.toml +++ b/settings/pyproject.toml @@ -1,3 +1,3 @@ [build-system] -requires = ["jupyter_packaging~=0.7.0", "jupyterlab>=3.0.0rc2,==3.*", "setuptools>=40.8.0", "wheel"] +requires = ["jupyter_packaging~=0.7.9", "jupyterlab>=3.0.0rc15,==3.*", "setuptools>=40.8.0", "wheel"] build-backend = "setuptools.build_meta" diff --git a/settings/setup.py b/settings/setup.py index 9e9a2d91..a3ed2a73 100644 --- a/settings/setup.py +++ b/settings/setup.py @@ -6,7 +6,7 @@ from jupyter_packaging import ( create_cmdclass, install_npm, ensure_targets, - combine_commands, get_version, + combine_commands, skip_if_exists ) import setuptools @@ -23,7 +23,6 @@ # Representative files that should exist after a successful build jstargets = [ - os.path.join(HERE, "lib", "index.js"), os.path.join(lab_path, "package.json"), ] @@ -45,11 +44,17 @@ data_files_spec=data_files_spec ) -cmdclass["jsdeps"] = combine_commands( +js_command = combine_commands( install_npm(HERE, build_cmd="build:prod", npm=["jlpm"]), ensure_targets(jstargets), ) +is_repo = os.path.exists(os.path.join(HERE, ".git")) +if is_repo: + cmdclass["jsdeps"] = js_command +else: + cmdclass["jsdeps"] = skip_if_exists(jstargets, js_command) + with open("README.md", "r") as fh: long_description = fh.read() @@ -64,14 +69,14 @@ cmdclass= cmdclass, packages=setuptools.find_packages(), install_requires=[ - "jupyterlab>=3.0.0rc2,==3.*", + "jupyterlab>=3.0.0rc15,==3.*", ], zip_safe=False, include_package_data=True, python_requires=">=3.6", license="BSD-3-Clause", platforms="Linux, Mac OS X, Windows", - keywords=["Jupyter", "JupyterLab"], + keywords=["Jupyter", "JupyterLab", "JupyterLab3"], classifiers=[ "License :: OSI Approved :: BSD License", "Programming Language :: Python", diff --git a/settings/style/base.css b/settings/style/base.css new file mode 100644 index 00000000..e69de29b diff --git a/settings/style/index.js b/settings/style/index.js new file mode 100644 index 00000000..a028a764 --- /dev/null +++ b/settings/style/index.js @@ -0,0 +1 @@ +import './base.css'; diff --git a/state/package.json b/state/package.json index bec7960b..924260ca 100644 --- a/state/package.json +++ b/state/package.json @@ -44,13 +44,13 @@ "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "^3.0.0-rc.7", - "@jupyterlab/apputils": "^3.0.0-rc.7", - "@jupyterlab/statedb": "^3.0.0-rc.7", + "@jupyterlab/application": "^3.0.0-rc.15", + "@jupyterlab/apputils": "^3.0.0-rc.15", + "@jupyterlab/statedb": "^3.0.0-rc.15", "@lumino/coreutils": "^1.5.3" }, "devDependencies": { - "@jupyterlab/builder": "^3.0.0-rc.7", + "@jupyterlab/builder": "^3.0.0-rc.15", "@typescript-eslint/eslint-plugin": "^2.27.0", "@typescript-eslint/parser": "^2.27.0", "eslint": "^7.5.0", @@ -61,7 +61,7 @@ "npm-run-all": "^4.1.5", "prettier": "^1.19.0", "rimraf": "^3.0.2", - "typescript": "~4.0.3" + "typescript": "~4.1.3" }, "sideEffects": [ "style/*.css" diff --git a/state/pyproject.toml b/state/pyproject.toml index ca305776..c40f3629 100644 --- a/state/pyproject.toml +++ b/state/pyproject.toml @@ -1,3 +1,3 @@ [build-system] -requires = ["jupyter_packaging~=0.7.0", "jupyterlab>=3.0.0rc2,==3.*", "setuptools>=40.8.0", "wheel"] +requires = ["jupyter_packaging~=0.7.9", "jupyterlab>=3.0.0rc15,==3.*", "setuptools>=40.8.0", "wheel"] build-backend = "setuptools.build_meta" diff --git a/state/setup.py b/state/setup.py index 6d9c10ed..7a010652 100644 --- a/state/setup.py +++ b/state/setup.py @@ -6,7 +6,7 @@ from jupyter_packaging import ( create_cmdclass, install_npm, ensure_targets, - combine_commands, get_version, + combine_commands, skip_if_exists ) import setuptools @@ -23,7 +23,6 @@ # Representative files that should exist after a successful build jstargets = [ - os.path.join(HERE, "lib", "index.js"), os.path.join(lab_path, "package.json"), ] @@ -45,11 +44,17 @@ data_files_spec=data_files_spec ) -cmdclass["jsdeps"] = combine_commands( +js_command = combine_commands( install_npm(HERE, build_cmd="build:prod", npm=["jlpm"]), ensure_targets(jstargets), ) +is_repo = os.path.exists(os.path.join(HERE, ".git")) +if is_repo: + cmdclass["jsdeps"] = js_command +else: + cmdclass["jsdeps"] = skip_if_exists(jstargets, js_command) + with open("README.md", "r") as fh: long_description = fh.read() @@ -64,14 +69,14 @@ cmdclass= cmdclass, packages=setuptools.find_packages(), install_requires=[ - "jupyterlab>=3.0.0rc2,==3.*", + "jupyterlab>=3.0.0rc15,==3.*", ], zip_safe=False, include_package_data=True, python_requires=">=3.6", license="BSD-3-Clause", platforms="Linux, Mac OS X, Windows", - keywords=["Jupyter", "JupyterLab"], + keywords=["Jupyter", "JupyterLab", "JupyterLab3"], classifiers=[ "License :: OSI Approved :: BSD License", "Programming Language :: Python", diff --git a/state/style/base.css b/state/style/base.css new file mode 100644 index 00000000..e69de29b diff --git a/state/style/index.js b/state/style/index.js new file mode 100644 index 00000000..a028a764 --- /dev/null +++ b/state/style/index.js @@ -0,0 +1 @@ +import './base.css'; diff --git a/widget-tracker/widgets/package.json b/widget-tracker/widgets/package.json index 13fada03..918c4a01 100644 --- a/widget-tracker/widgets/package.json +++ b/widget-tracker/widgets/package.json @@ -44,14 +44,14 @@ "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "^3.0.0-rc.7", - "@jupyterlab/mainmenu": "^3.0.0-rc.7", + "@jupyterlab/application": "^3.0.0-rc.15", + "@jupyterlab/mainmenu": "^3.0.0-rc.15", "@lumino/algorithm": "^1.3.3", "@lumino/coreutils": "^1.5.3", "@lumino/disposable": "^1.4.3" }, "devDependencies": { - "@jupyterlab/builder": "^3.0.0-rc.7", + "@jupyterlab/builder": "^3.0.0-rc.15", "@typescript-eslint/eslint-plugin": "^2.27.0", "@typescript-eslint/parser": "^2.27.0", "eslint": "^7.5.0", @@ -62,7 +62,7 @@ "npm-run-all": "^4.1.5", "prettier": "^1.19.0", "rimraf": "^3.0.2", - "typescript": "~4.0.3" + "typescript": "~4.1.3" }, "sideEffects": [ "style/*.css" diff --git a/widget-tracker/widgets/pyproject.toml b/widget-tracker/widgets/pyproject.toml index ca305776..c40f3629 100644 --- a/widget-tracker/widgets/pyproject.toml +++ b/widget-tracker/widgets/pyproject.toml @@ -1,3 +1,3 @@ [build-system] -requires = ["jupyter_packaging~=0.7.0", "jupyterlab>=3.0.0rc2,==3.*", "setuptools>=40.8.0", "wheel"] +requires = ["jupyter_packaging~=0.7.9", "jupyterlab>=3.0.0rc15,==3.*", "setuptools>=40.8.0", "wheel"] build-backend = "setuptools.build_meta" diff --git a/widget-tracker/widgets/setup.py b/widget-tracker/widgets/setup.py index 440090ee..73c2c1e1 100644 --- a/widget-tracker/widgets/setup.py +++ b/widget-tracker/widgets/setup.py @@ -6,7 +6,7 @@ from jupyter_packaging import ( create_cmdclass, install_npm, ensure_targets, - combine_commands, get_version, + combine_commands, skip_if_exists ) import setuptools @@ -23,7 +23,6 @@ # Representative files that should exist after a successful build jstargets = [ - os.path.join(HERE, "lib", "index.js"), os.path.join(lab_path, "package.json"), ] @@ -45,11 +44,17 @@ data_files_spec=data_files_spec ) -cmdclass["jsdeps"] = combine_commands( +js_command = combine_commands( install_npm(HERE, build_cmd="build:prod", npm=["jlpm"]), ensure_targets(jstargets), ) +is_repo = os.path.exists(os.path.join(HERE, ".git")) +if is_repo: + cmdclass["jsdeps"] = js_command +else: + cmdclass["jsdeps"] = skip_if_exists(jstargets, js_command) + with open("README.md", "r") as fh: long_description = fh.read() @@ -64,14 +69,14 @@ cmdclass= cmdclass, packages=setuptools.find_packages(), install_requires=[ - "jupyterlab>=3.0.0rc2,==3.*", + "jupyterlab>=3.0.0rc15,==3.*", ], zip_safe=False, include_package_data=True, python_requires=">=3.6", license="BSD-3-Clause", platforms="Linux, Mac OS X, Windows", - keywords=["Jupyter", "JupyterLab"], + keywords=["Jupyter", "JupyterLab", "JupyterLab3"], classifiers=[ "License :: OSI Approved :: BSD License", "Programming Language :: Python", diff --git a/widget-tracker/widgets/style/base.css b/widget-tracker/widgets/style/base.css new file mode 100644 index 00000000..e69de29b diff --git a/widget-tracker/widgets/style/index.js b/widget-tracker/widgets/style/index.js new file mode 100644 index 00000000..a028a764 --- /dev/null +++ b/widget-tracker/widgets/style/index.js @@ -0,0 +1 @@ +import './base.css'; From 94067b91acb7fa0a335aefc53a7c7c769b1c30ee Mon Sep 17 00:00:00 2001 From: Jeremy Tuloup Date: Wed, 23 Dec 2020 16:35:38 +0100 Subject: [PATCH 37/45] Update the main README for JupyterLab 3 --- README.md | 43 +++++++++++++++++++++++++++++++++---------- 1 file changed, 33 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 5fc78936..5cf7f511 100644 --- a/README.md +++ b/README.md @@ -10,18 +10,41 @@ The goal of this repository is to show how to develop extensions for [JupyterLab To get started: ```bash -git clone https://github.com/jupyterlab/extension-examples.git jupyterlab-extension-examples && \ - cd jupyterlab-extension-examples && \ - conda env create && \ - conda activate jupyterlab-extension-examples && \ - cd basics/hello-world && \ - jlpm && \ - jlpm run build && \ - jupyter labextension install . && \ - jupyter lab +# clone the repository +git clone https://github.com/jupyterlab/extension-examples.git jupyterlab-extension-examples + +# go to the extension examples folder +cd jupyterlab-extension-examples + +# create a new environment +conda env create + +# activate the environment +conda activate jupyterlab-extension-examples + +# go to the hello world example +cd basics/hello-world + +# install the extension in editable mode +python -m pip install -e . + +# install your development version of the extension with JupyterLab +jupyter labextension develop . --overwrite + +# build the TypeScript source after making changes +jlpm run build + +# start JupyterLab +jupyter lab ``` -The examples currently target **JupyterLab 2.x**. If you would like to use the examples with JupyterLab 1.x, check out the [1.x branch](https://github.com/jupyterlab/extension-examples/tree/1.x). Note that the `1.x` branch is not updated anymore. +The examples currently target **JupyterLab 3.x**. + +If you would like to use the examples with JupyterLab 2.x, check out the [2.x branch](https://github.com/jupyterlab/extension-examples/tree/2.x). + +If you would like to use the examples with JupyterLab 1.x, check out the [1.x branch](https://github.com/jupyterlab/extension-examples/tree/1.x). + +Note that the `1.x` and `2.x` branches are not updated anymore. ## Develop by Examples From 966044bc319be816cce990e3e312db0abff6c702 Mon Sep 17 00:00:00 2001 From: Jeremy Tuloup Date: Wed, 23 Dec 2020 16:41:29 +0100 Subject: [PATCH 38/45] Run embedme --- advanced/server-extension/README.md | 27 ++++++++++++++++----------- main-menu/README.md | 4 ++-- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/advanced/server-extension/README.md b/advanced/server-extension/README.md index 39b2e20c..b88414ef 100644 --- a/advanced/server-extension/README.md +++ b/advanced/server-extension/README.md @@ -502,7 +502,7 @@ import os from jupyter_packaging import ( create_cmdclass, install_npm, ensure_targets, - combine_commands, get_version, + combine_commands, skip_if_exists ) import setuptools @@ -519,7 +519,6 @@ lab_path = os.path.join(HERE, name, "labextension") # Representative files that should exist after a successful build jstargets = [ - os.path.join(HERE, "lib", "index.js"), os.path.join(lab_path, "package.json"), ] @@ -535,7 +534,7 @@ data_files_spec = [ ("share/jupyter/labextensions/%s" % labext_name, lab_path, "**"), ("share/jupyter/labextensions/%s" % labext_name, HERE, "install.json"),("etc/jupyter/jupyter_server_config.d", "jupyter-config", "jlab_ext_example.json"), - + ] cmdclass = create_cmdclass("jsdeps", @@ -543,11 +542,17 @@ cmdclass = create_cmdclass("jsdeps", data_files_spec=data_files_spec ) -cmdclass["jsdeps"] = combine_commands( +js_command = combine_commands( install_npm(HERE, build_cmd="build:prod", npm=["jlpm"]), ensure_targets(jstargets), ) +is_repo = os.path.exists(os.path.join(HERE, ".git")) +if is_repo: + cmdclass["jsdeps"] = js_command +else: + cmdclass["jsdeps"] = skip_if_exists(jstargets, js_command) + with open("README.md", "r") as fh: long_description = fh.read() @@ -562,14 +567,14 @@ setup_args = dict( cmdclass= cmdclass, packages=setuptools.find_packages(), install_requires=[ - "jupyterlab>=3.0.0rc2,==3.*", + "jupyterlab>=3.0.0rc15,==3.*", ], zip_safe=False, include_package_data=True, python_requires=">=3.6", license="BSD-3-Clause", platforms="Linux, Mac OS X, Windows", - keywords=["Jupyter", "JupyterLab"], + keywords=["Jupyter", "JupyterLab", "JupyterLab3"], classifiers=[ "License :: OSI Approved :: BSD License", "Programming Language :: Python", @@ -593,14 +598,14 @@ the frontend NPM package needs to be built and inserted in the Python package. T done using a special `cmdclass`: ```py -# setup.py#L45-L53 +# setup.py#L44-L52 cmdclass = create_cmdclass("jsdeps", package_data_spec=package_data_spec, data_files_spec=data_files_spec ) -cmdclass["jsdeps"] = combine_commands( +js_command = combine_commands( install_npm(HERE, build_cmd="build:prod", npm=["jlpm"]), ensure_targets(jstargets), ) @@ -609,7 +614,7 @@ cmdclass["jsdeps"] = combine_commands( Basically it will build the frontend NPM package: ```py -# setup.py#L51-L51 +# setup.py#L50-L50 install_npm(HERE, build_cmd="build:prod", npm=["jlpm"]), ``` @@ -617,10 +622,10 @@ install_npm(HERE, build_cmd="build:prod", npm=["jlpm"]), It will ensure one of the generated JS files is `lib/jlabextexample.js`: ```py -# setup.py#L25-L28 +# setup.py#L24-L27 +# Representative files that should exist after a successful build jstargets = [ - os.path.join(HERE, "lib", "index.js"), os.path.join(lab_path, "package.json"), ] ``` diff --git a/main-menu/README.md b/main-menu/README.md index 4fc7e3df..3fbeea0a 100644 --- a/main-menu/README.md +++ b/main-menu/README.md @@ -90,8 +90,8 @@ After the execution of that command, `package.json` should list them in the "watch:src": "tsc -w" }, "dependencies": { - "@jupyterlab/application": "^3.0.0-rc.7", - "@jupyterlab/mainmenu": "^3.0.0-rc.7", + "@jupyterlab/application": "^3.0.0-rc.15", + "@jupyterlab/mainmenu": "^3.0.0-rc.15", ``` With this extension installed, a new menu _Main Menu Example_ should be present. And when From e6592a72e5bbeb8c00bc1cd7889053aea2a97adf Mon Sep 17 00:00:00 2001 From: Jeremy Tuloup Date: Wed, 23 Dec 2020 17:45:32 +0100 Subject: [PATCH 39/45] Update instructions to install all extensions at once --- .gitignore | 2 ++ README.md | 9 +++++++-- basics/datagrid/package.json | 2 +- package.json | 1 + 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 35cfbab0..a39dd1f9 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,8 @@ node_modules/ .ipynb_checkpoints *.tsbuildinfo *.lock +__pycache__ + # Ensure embedme does not run ont node_modules README.md files. **/node_modules/**/README.md diff --git a/README.md b/README.md index 5cf7f511..b406331d 100644 --- a/README.md +++ b/README.md @@ -232,12 +232,17 @@ conda env create && \ ```bash jlpm -jlpm build-ext +jlpm install-py jlpm install-ext -jlpm build-jlab jupyter lab ``` +To rebuild all the extensions: + +```bash +jlpm build-ext +``` + To clean the lib folders: ```bash diff --git a/basics/datagrid/package.json b/basics/datagrid/package.json index 664887f2..4f5a236d 100644 --- a/basics/datagrid/package.json +++ b/basics/datagrid/package.json @@ -49,7 +49,7 @@ "@jupyterlab/translation": "^3.0.0-rc.15", "@lumino/algorithm": "^1.3.3", "@lumino/coreutils": "^1.5.3", - "@lumino/datagrid": "^0.5.2", + "@lumino/datagrid": "^0.14.1", "@lumino/disposable": "^1.4.3" }, "devDependencies": { diff --git a/package.json b/package.json index bdcd8203..419bc85b 100644 --- a/package.json +++ b/package.json @@ -7,6 +7,7 @@ "build-ext": "lerna run build:all", "clean-ext": "lerna run clean", "embedme": "embedme \"[!n]*/**/README.md\"", + "install-py": "lerna exec -- python -m pip install -e .", "install-ext": "lerna run install:extension", "lint": "jlpm && jlpm run prettier", "lint:check": "jlpm run embedme --verify && jlpm run prettier:check", From fe9b29fbfc698d9df83e17b0707faa68212deb9d Mon Sep 17 00:00:00 2001 From: Jeremy Tuloup Date: Wed, 23 Dec 2020 17:51:55 +0100 Subject: [PATCH 40/45] Limit to 4 concurrent for the install-py cmd --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 419bc85b..80aff00d 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "build-ext": "lerna run build:all", "clean-ext": "lerna run clean", "embedme": "embedme \"[!n]*/**/README.md\"", - "install-py": "lerna exec -- python -m pip install -e .", + "install-py": "lerna exec --concurrency 4 -- python -m pip install -e .", "install-ext": "lerna run install:extension", "lint": "jlpm && jlpm run prettier", "lint:check": "jlpm run embedme --verify && jlpm run prettier:check", From 18258e2954c14b13523c7790a67233966de0bad6 Mon Sep 17 00:00:00 2001 From: Jeremy Tuloup Date: Wed, 23 Dec 2020 17:55:18 +0100 Subject: [PATCH 41/45] Add jlpm run build-ext to the top-level readme --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index b406331d..c6b535f1 100644 --- a/README.md +++ b/README.md @@ -232,6 +232,7 @@ conda env create && \ ```bash jlpm +jlpm build-ext jlpm install-py jlpm install-ext jupyter lab From 39642d5069ba37c5bdabde1aba6d3f08281ee57c Mon Sep 17 00:00:00 2001 From: Jeremy Tuloup Date: Fri, 8 Jan 2021 11:02:54 +0100 Subject: [PATCH 42/45] Update .github/workflows/main.yml MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Frédéric Collonval --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index fb86949b..283647a9 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -184,7 +184,7 @@ jobs: run: | python -m pip install --upgrade pip python -m pip install jupyter_packaging - python -m pip install --pre jupyterlab + python -m pip install jupyterlab - name: Install the NPM dependencies if: steps.filter.outputs.extension == 'true' run: | From 59bc87d80696e1cc146893844a3f9ce6a2bf1a9c Mon Sep 17 00:00:00 2001 From: Jeremy Tuloup Date: Fri, 8 Jan 2021 11:04:25 +0100 Subject: [PATCH 43/45] Apply suggestions from code review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Frédéric Collonval --- .github/workflows/main.yml | 2 +- basics/hello-world/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 283647a9..9670f053 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -272,7 +272,7 @@ jobs: restore-keys: | ${{ runner.os }}-pip- - name: Install the Python dependencies - run: python -m pip install --pre jupyterlab + run: python -m pip install jupyterlab - name: Bootstrap the jlpm deps run: jlpm - name: Build all the extensions diff --git a/basics/hello-world/README.md b/basics/hello-world/README.md index 5f5b3969..d819800e 100644 --- a/basics/hello-world/README.md +++ b/basics/hello-world/README.md @@ -91,7 +91,7 @@ called `@jupyterlab/application`. The dependency of your extension on this package is declared in the file `package.json`: ```json5 -// package.json#L44-L46 +// package.json#L46-L48 "watch:src": "tsc -w" }, From f2b72205754707f26aa1033d809f20d309c6d9ec Mon Sep 17 00:00:00 2001 From: Jeremy Tuloup Date: Fri, 8 Jan 2021 11:12:46 +0100 Subject: [PATCH 44/45] Apply suggestions from code review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Frédéric Collonval --- main-menu/README.md | 2 +- settings/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/main-menu/README.md b/main-menu/README.md index 3fbeea0a..53381dae 100644 --- a/main-menu/README.md +++ b/main-menu/README.md @@ -85,7 +85,7 @@ After the execution of that command, `package.json` should list them in the `dependencies`: ```json5 -// package.json#L44-L48 +// package.json#L46-L50 "watch:src": "tsc -w" }, diff --git a/settings/README.md b/settings/README.md index f4ad6939..5fb8e614 100644 --- a/settings/README.md +++ b/settings/README.md @@ -109,7 +109,7 @@ the `package.json` file in the `jupyterlab` section (here `schema`): ```json5 -// package.json#L68-L70 +// package.json#L70-L74 "style/*.css" ], From 4f15b8e0e34ad8d75f9e4b76ff74c40b01f55e7f Mon Sep 17 00:00:00 2001 From: Jeremy Tuloup Date: Fri, 8 Jan 2021 11:14:19 +0100 Subject: [PATCH 45/45] Run embedme --- basics/hello-world/README.md | 4 ++-- main-menu/README.md | 4 ++-- settings/README.md | 6 ++++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/basics/hello-world/README.md b/basics/hello-world/README.md index d819800e..70844c77 100644 --- a/basics/hello-world/README.md +++ b/basics/hello-world/README.md @@ -93,9 +93,9 @@ package is declared in the file `package.json`: ```json5 // package.json#L46-L48 - "watch:src": "tsc -w" -}, "dependencies": { + "@jupyterlab/application": "^3.0.0-rc.15" +}, ``` With this basic import setup, you can move on to construct a new instance diff --git a/main-menu/README.md b/main-menu/README.md index 53381dae..4d56f9c5 100644 --- a/main-menu/README.md +++ b/main-menu/README.md @@ -87,11 +87,11 @@ After the execution of that command, `package.json` should list them in the ```json5 // package.json#L46-L50 - "watch:src": "tsc -w" -}, "dependencies": { "@jupyterlab/application": "^3.0.0-rc.15", "@jupyterlab/mainmenu": "^3.0.0-rc.15", + "@lumino/widgets": "^1.16.1" +}, ``` With this extension installed, a new menu _Main Menu Example_ should be present. And when diff --git a/settings/README.md b/settings/README.md index 5fb8e614..b6ebcea9 100644 --- a/settings/README.md +++ b/settings/README.md @@ -111,9 +111,11 @@ the `package.json` file in the `jupyterlab` section (here `schema`): ```json5 // package.json#L70-L74 - "style/*.css" -], "jupyterlab": { + "extension": true, + "schemaDir": "schema", + "outputDir": "jupyterlab_examples_settings/labextension" +} ```