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';