Merge pull request #72 from hbcarlos/releaser

Updates to JupyterLab 3.6 and fixes check release

Author: hbcarlos

.github/workflows/check-release.yml

@@ -5,23 +5,27 @@ on:
   pull_request:
     branches: ["*"]
 
+permissions:
+  contents: write
+
 jobs:
   check_release:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v3
+
       - name: Base Setup
         uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1
-      - name: Install Dependencies
-        run: |
-          pip install -e .
+
       - name: Check Release
         uses: jupyter-server/jupyter_releaser/.github/actions/check-release@v2
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
+
       - name: Upload Distributions
         uses: actions/upload-artifact@v3
         with:
-          name: jupyterlab_blockly-releaser-dist-${{ '{{ github.run_number }}' }}
-          path: .jupyter_releaser_checkout/dist
+          name: jupyter-releaser-dist-${{ github.run_number }}
+          path: |
+            .jupyter_releaser_checkout/dist

README.md

@@ -16,7 +16,7 @@ Repo: https://github.com/google/blockly
 
 ## Requirements
 
-- JupyterLab == 3.4
+- JupyterLab == 3.6
 
 ## Install
 
@@ -53,14 +53,14 @@ The `jlpm` command is JupyterLab's pinned version of
 `yarn` or `npm` in lieu of `jlpm` below.
 
 ```bash
-micromamba create -n blockly -c conda-forge python nodejs pre-commit yarn jupyterlab==3.4 jupyter-packaging jupyterlab-language-pack-es-ES jupyterlab-language-pack-fr-FR ipykernel xeus-python xeus-lua
+micromamba create -n blockly -c conda-forge python nodejs=18 yarn pre-commit jupyterlab==3.6 jupyter-packaging jupyterlab-language-pack-es-ES jupyterlab-language-pack-fr-FR ipykernel xeus-python xeus-lua
 micromamba activate blockly
 # Clone the repo to your local environment
 # Change directory to the jupyterlab_blockly directory
 # Installing pre-commit to run command when adding commits
 pre-commit install
 # Install package in development mode
-pip install -e .
+pip install -e ".[dev]"
 # Link your development version of the extension with JupyterLab
 jupyter labextension develop . --overwrite
 # Rebuild extension Typescript source after making changes

docs/installation.md

@@ -2,7 +2,7 @@
 
 ## Requirements
 
-- JupyterLab == 3.4
+- JupyterLab == 3.6
 
 ## Install
 
@@ -37,12 +37,12 @@ The `jlpm` command is JupyterLab's pinned version of
 `yarn` or `npm` in lieu of `jlpm` below.
 
 ```bash
-micromamba create -n blockly -c conda-forge python nodejs pre-commit yarn jupyterlab==3.4 jupyter-packaging jupyterlab-language-pack-es-ES jupyterlab-language-pack-fr-FR ipykernel xeus-python xeus-lua
+micromamba create -n blockly -c conda-forge python nodejs=18 yarn pre-commit jupyterlab==3.6 jupyter-packaging jupyterlab-language-pack-es-ES jupyterlab-language-pack-fr-FR ipykernel xeus-python xeus-lua
 micromamba activate blockly
 # Clone the repo to your local environment
 # Change directory to the jupyterlab_blockly directory
 # Install package in development mode
-pip install -e .
+pip install -e ".[dev]"
 # Installing pre-commit to run command when adding commits
 pre-commit install
 # Link your development version of the extension with JupyterLab

packages/blockly-extension/package.json

@@ -43,24 +43,24 @@
     "watch:labextension": "jupyter labextension watch ."
   },
   "dependencies": {
-    "@jupyterlab/application": "^3.4",
-    "@jupyterlab/apputils": "^3.4",
-    "@jupyterlab/codeeditor": "^3.4",
-    "@jupyterlab/filebrowser": "^3.4",
-    "@jupyterlab/launcher": "^3.4",
-    "@jupyterlab/mainmenu": "^3.4",
-    "@jupyterlab/rendermime": "^3.4",
-    "@jupyterlab/settingregistry": "^3.4",
-    "@jupyterlab/translation": "^3.4",
-    "@jupyterlab/ui-components": "^3.4",
+    "@jupyterlab/application": "^3.6",
+    "@jupyterlab/apputils": "^3.6",
+    "@jupyterlab/codeeditor": "^3.6",
+    "@jupyterlab/filebrowser": "^3.6",
+    "@jupyterlab/launcher": "^3.6",
+    "@jupyterlab/mainmenu": "^3.6",
+    "@jupyterlab/rendermime": "^3.6",
+    "@jupyterlab/settingregistry": "^3.6",
+    "@jupyterlab/translation": "^3.6",
+    "@jupyterlab/ui-components": "^3.6",
     "jupyterlab-blockly": "^0.2.1"
   },
   "devDependencies": {
-    "@jupyterlab/builder": "^3.5",
+    "@jupyterlab/builder": "^3.6",
     "npm-run-all": "^4.1.5",
     "rimraf": "^4.4.0",
-    "typescript": "~4.9.5",
-    "source-map-loader": "^4.0.1"
+    "source-map-loader": "^4.0.1",
+    "typescript": "~4.9.5"
   },
   "sideEffects": [
     "style/*.css",

packages/blockly/package.json

@@ -31,24 +31,25 @@
   "scripts": {
     "build": "tsc -b",
     "build:prod": "jlpm build",
-    "clean": "rimraf lib tsconfig.tsbuildinfo",
-    "clean:all": "jlpm clean",
+    "clean": "jlpm clean:lib",
+    "clean:lib": "rimraf lib tsconfig.tsbuildinfo",
+    "clean:all": "jlpm clean:lib",
     "install:extension": "jlpm build"
   },
   "dependencies": {
-    "@jupyterlab/apputils": "^3.4",
-    "@jupyterlab/cells": "^3.4",
-    "@jupyterlab/codeeditor": "^3.4",
-    "@jupyterlab/coreutils": "^5.4",
-    "@jupyterlab/docregistry": "^3.4",
-    "@jupyterlab/rendermime": "^3.4",
-    "@jupyterlab/services": "^6.4",
-    "@jupyterlab/ui-components": "^3.4",
+    "@jupyterlab/apputils": "^3.6",
+    "@jupyterlab/cells": "^3.6",
+    "@jupyterlab/codeeditor": "^3.6",
+    "@jupyterlab/coreutils": "^5.6",
+    "@jupyterlab/docregistry": "^3.6",
+    "@jupyterlab/rendermime": "^3.6",
+    "@jupyterlab/services": "^6.6",
+    "@jupyterlab/ui-components": "^3.6",
     "@lumino/algorithm": "^1.9.0",
     "@lumino/coreutils": "^1.11.0",
     "@lumino/messaging": "^1.10.0",
     "@lumino/signaling": "^1.10.0",
-    "@lumino/widgets": "^1.30.0",
+    "@lumino/widgets": "^1.37.1",
     "blockly": "^9.2.1",
     "react": "^17.0.1",
     "react-dom": "^17.0.1"

patches/@jupyterlab+codeeditor+3.4.3.patch renamed to patches/@jupyterlab+codeeditor+3.6.1.patch

@@ -2,7 +2,7 @@ diff --git a/node_modules/@jupyterlab/codeeditor/lib/editor.d.ts b/node_modules/
 index ffe8d1f..d63b2f8 100644
 --- a/node_modules/@jupyterlab/codeeditor/lib/editor.d.ts
 +++ b/node_modules/@jupyterlab/codeeditor/lib/editor.d.ts
-@@ -44,7 +44,7 @@ export declare namespace CodeEditor {
+@@ -47,7 +47,7 @@ export declare namespace CodeEditor {
      /**
       * An interface describing editor state coordinates.
       */

pyproject.toml

@@ -1,6 +1,6 @@
 [build-system]
 build-backend = "hatchling.build"
-requires = ["hatchling>=1.4.0", "hatch-nodejs-version", "jupyterlab~=3.4"]
+requires = ["hatchling>=1.4.0", "hatch-nodejs-version", "jupyterlab~=3.6"]
 
 [project]
 name = "jupyterlab_blockly"
@@ -23,14 +23,15 @@ classifiers = [
     "Programming Language :: Python :: 3.11",
 ]
 dependencies = [
-	"jupyterlab~=3.4"
+	"jupyterlab~=3.6"
 ]
 dynamic = ["version", "description", "authors", "urls", "keywords"]
 
 [project.optional-dependencies]
 dev = [
     "click",
-    "jupyter_releaser==0.22"
+    "pre-commit",
+    "jupyter_releaser"
 ]
 
 [tool.hatch.version]
@@ -39,9 +40,12 @@ source = "nodejs"
 [tool.hatch.metadata.hooks.nodejs]
 fields = ["description", "authors", "urls"]
 
-[tool.hatch.build]
-artifacts = ["package.json", "scripts", "packages", "patches", "jupyterlab_blockly/labextension"]
-exclude = [".github", "binder"]
+[tool.hatch.build.targets.sdist]
+artifacts = ["/jupyterlab_blockly/labextension"]
+exclude = ["/.github", "/binder", "node_modules"]
+
+[tool.hatch.build.targets.sdist.force-include]
+"./packages" = "packages"
 
 [tool.hatch.build.targets.wheel.shared-data]
 "jupyterlab_blockly/labextension" = "share/jupyter/labextensions/jupyterlab-blockly-extension"
@@ -57,21 +61,27 @@ ensured-targets = [
 skip-if-exists = ["jupyterlab_blockly/labextension/static/style.js"]
 
 [tool.hatch.build.hooks.jupyter-builder.build-kwargs]
-build_cmd = "build:prod"
-npm = ["jlpm"]
-
-[tool.hatch.build.hooks.jupyter-builder.editable-build-kwargs]
-build_cmd = "install:extension"
 npm = ["jlpm"]
-build_dir = "jupyterlab_blockly/labextension"
+build_cmd = "build:prod"
+editable_build_cmd = "install:extension"
 
 [tool.jupyter-releaser.options]
 version-cmd = "python scripts/bump-version.py --force"
 
 [tool.jupyter-releaser.hooks]
-before-bump-version = ["python -m pip install jupyterlab~=3.4", "jlpm"]
-before-build-npm = ["python -m pip install jupyterlab~=3.4", "jlpm", "jlpm build:prod"]
-before-build-python = ["jlpm clean:all"]
+before-bump-version = [
+    "python -m pip install --pre -U jupyterlab~=3.6",
+    "jlpm"
+]
+before-build-npm = [
+    "jlpm build:prod"
+]
+before-build-python = [
+    # Build the assets
+    "jlpm build:prod",
+    # Clean the build artifacts to not include them in sdist
+    "jlpm clean"
+]
 
 [tool.check-wheel-contents]
 ignore = ["W002"]