Skip to content

Commit

Permalink
Update to JupyterLab v3.1 (#173)
Browse files Browse the repository at this point in the history
* Upgrade dependencies

* Upgrade JupyterLab in GitHub actions

* Line endings, style bug, and update lab
  • Loading branch information
hbcarlos committed Jul 28, 2021
1 parent ff3753d commit 39df8ff
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion {{cookiecutter.python_name}}/.github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
yarn-
{% endraw %}
- name: Install dependencies
run: python -m pip install -U jupyterlab~=3.0 check-manifest
run: python -m pip install -U jupyterlab~=3.1 check-manifest
- name: Build the extension
run: |
set -eux
Expand Down
2 changes: 1 addition & 1 deletion {{cookiecutter.python_name}}/MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
include LICENSE
include README.md
include RELEASE.md
include pyproject.toml{%- if cookiecutter.has_server_extension == "y" -%}
include pyproject.toml{% if cookiecutter.has_server_extension == "y" %}
recursive-include jupyter-config *.json{% endif %}

include package.json
Expand Down
14 changes: 7 additions & 7 deletions {{cookiecutter.python_name}}/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
},
"files": [
"lib/**/*.{d.ts,eot,gif,html,jpg,js,js.map,json,png,svg,woff2,ttf}",
"style/**/*.{css,.js,eot,gif,html,jpg,json,png,svg,woff2,ttf}"{% if cookiecutter.has_settings.lower().startswith('y') %},
"style/**/*.{css,js,eot,gif,html,jpg,json,png,svg,woff2,ttf}"{% if cookiecutter.has_settings.lower().startswith('y') %},
"schema/*.json"{% endif %}
],
"main": "lib/index.js",
Expand Down Expand Up @@ -46,14 +46,14 @@
"watch:labextension": "jupyter labextension watch ."
},
"dependencies": {
"@jupyterlab/application": "^3.0.0"{% if cookiecutter.has_settings.lower().startswith('y') %},
"@jupyterlab/settingregistry": "^3.0.0"{% endif %}{% if cookiecutter.has_server_extension.lower().startswith('y') %},
"@jupyterlab/coreutils": "^5.0.0",
"@jupyterlab/services": "^6.0.0"
"@jupyterlab/application": "^3.1.0"{% if cookiecutter.has_settings.lower().startswith('y') %},
"@jupyterlab/settingregistry": "^3.1.0"{% endif %}{% if cookiecutter.has_server_extension.lower().startswith('y') %},
"@jupyterlab/coreutils": "^5.1.0",
"@jupyterlab/services": "^6.1.0"
{% endif %}
},
"devDependencies": {
"@jupyterlab/builder": "^3.0.0",
"@jupyterlab/builder": "^3.1.0",
"@typescript-eslint/eslint-plugin": "^4.8.1",
"@typescript-eslint/parser": "^4.8.1",
"eslint": "^7.14.0",
Expand Down Expand Up @@ -88,7 +88,7 @@
"jupyter-releaser": {
"hooks": {
"before-build-npm": [
"python -m pip install jupyterlab~=3.0",
"python -m pip install jupyterlab~=3.1",
"jlpm"
]
}
Expand Down
2 changes: 1 addition & 1 deletion {{cookiecutter.python_name}}/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[build-system]
requires = ["jupyter_packaging~=0.10,<2", "jupyterlab~=3.0"]
requires = ["jupyter_packaging~=0.10,<2", "jupyterlab~=3.1"]
build-backend = "jupyter_packaging.build_api"

[tool.jupyter-packaging.options]
Expand Down
4 changes: 2 additions & 2 deletions {{cookiecutter.python_name}}/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

data_files_spec = [
("share/jupyter/labextensions/%s" % labext_name, str(lab_path.relative_to(HERE)), "**"),
("share/jupyter/labextensions/%s" % labext_name, str("."), "install.json"),{%- if cookiecutter.has_server_extension == "y" -%}
("share/jupyter/labextensions/%s" % labext_name, str("."), "install.json"),{% if cookiecutter.has_server_extension == "y" %}
("etc/jupyter/jupyter_server_config.d",
"jupyter-config/server-config", "{{ cookiecutter.python_name }}.json"),
# For backward compatibility with notebook server
Expand All @@ -48,7 +48,7 @@
long_description=long_description,
long_description_content_type="text/markdown",
packages=setuptools.find_packages(),
install_requires=[{%- if cookiecutter.has_server_extension == "y" -%}
install_requires=[{% if cookiecutter.has_server_extension == "y" %}
"jupyter_server>=1.6,<2"
{% endif %}],
zip_safe=False,
Expand Down

0 comments on commit 39df8ff

Please sign in to comment.