Skip to content

Commit

Permalink
Update to the latest RC
Browse files Browse the repository at this point in the history
  • Loading branch information
jtpio committed Dec 23, 2020
1 parent 6b7dbd3 commit cf61326
Show file tree
Hide file tree
Showing 86 changed files with 307 additions and 205 deletions.
16 changes: 8 additions & 8 deletions advanced/kernel-messaging/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion advanced/kernel-messaging/pyproject.toml
Original file line number Diff line number Diff line change
@@ -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"
15 changes: 10 additions & 5 deletions advanced/kernel-messaging/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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"),
]

Expand All @@ -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()

Expand All @@ -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",
Expand Down
Empty file.
1 change: 1 addition & 0 deletions advanced/kernel-messaging/style/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
import './base.css';
14 changes: 7 additions & 7 deletions advanced/kernel-output/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion advanced/kernel-output/pyproject.toml
Original file line number Diff line number Diff line change
@@ -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"
15 changes: 10 additions & 5 deletions advanced/kernel-output/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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"),
]

Expand All @@ -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()

Expand All @@ -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",
Expand Down
Empty file.
1 change: 1 addition & 0 deletions advanced/kernel-output/style/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
import './base.css';
12 changes: 6 additions & 6 deletions advanced/server-extension/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion advanced/server-extension/pyproject.toml
Original file line number Diff line number Diff line change
@@ -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"
17 changes: 11 additions & 6 deletions advanced/server-extension/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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"),
]

Expand All @@ -39,19 +38,25 @@
("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",
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),
)

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()

Expand All @@ -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",
Expand Down
Empty file.
1 change: 1 addition & 0 deletions advanced/server-extension/style/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
import './base.css';
10 changes: 5 additions & 5 deletions basics/datagrid/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion basics/datagrid/pyproject.toml
Original file line number Diff line number Diff line change
@@ -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"
15 changes: 10 additions & 5 deletions basics/datagrid/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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"),
]

Expand All @@ -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()

Expand All @@ -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",
Expand Down
Empty file added basics/datagrid/style/base.css
Empty file.
1 change: 1 addition & 0 deletions basics/datagrid/style/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
import './base.css';
6 changes: 3 additions & 3 deletions basics/hello-world/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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"
Expand Down
Loading

0 comments on commit cf61326

Please sign in to comment.