From 1292b28015a720831a6c1fb942456800573316ff Mon Sep 17 00:00:00 2001 From: Marten Richter Date: Sun, 2 Feb 2025 10:30:23 +0000 Subject: [PATCH 01/11] Do skip python release --- pyproject.toml | 3 --- 1 file changed, 3 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index d558c95..2aa0904 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -39,9 +39,6 @@ allow-direct-references = true [tool.check-manifest] ignore = [".*"] -[tool.jupyter-releaser] -skip = [ "build-python", "check-links", "check-python", "check-npm"] - [tool.jupyter-releaser.options] version_cmd = "npm run versionlerna" From 48be6f67a08a8e8ffa2b86daed6420417f16d368 Mon Sep 17 00:00:00 2001 From: Marten Richter Date: Sun, 2 Feb 2025 10:42:57 +0000 Subject: [PATCH 02/11] Jupyter release adjust steps to skip --- packages/applet-view/pyproject.toml | 3 +++ packages/filesystem-extension/pyproject.toml | 3 +++ packages/interceptor/pyproject.toml | 3 +++ packages/launcher/pyproject.toml | 3 +++ pyproject.toml | 5 ++++- 5 files changed, 16 insertions(+), 1 deletion(-) diff --git a/packages/applet-view/pyproject.toml b/packages/applet-view/pyproject.toml index e8dcf3b..601a449 100644 --- a/packages/applet-view/pyproject.toml +++ b/packages/applet-view/pyproject.toml @@ -63,6 +63,9 @@ npm = ["jlpm"] source_dir = "src" build_dir = "fails_components_jupyter_applet_view/labextension" +[tool.jupyter-releaser] +skip = [ ] + [tool.jupyter-releaser.hooks] before-build-npm = [ "python -m pip install 'jupyterlab>=4.0.0,<5'", diff --git a/packages/filesystem-extension/pyproject.toml b/packages/filesystem-extension/pyproject.toml index 623097d..e255825 100644 --- a/packages/filesystem-extension/pyproject.toml +++ b/packages/filesystem-extension/pyproject.toml @@ -63,6 +63,9 @@ npm = ["jlpm"] source_dir = "src" build_dir = "fails_components_jupyter_filesystem_extension/labextension" +[tool.jupyter-releaser] +skip = [] + [tool.jupyter-releaser.hooks] before-build-npm = [ "python -m pip install 'jupyterlab>=4.0.0,<5'", diff --git a/packages/interceptor/pyproject.toml b/packages/interceptor/pyproject.toml index a2f1422..e7cf901 100644 --- a/packages/interceptor/pyproject.toml +++ b/packages/interceptor/pyproject.toml @@ -63,6 +63,9 @@ npm = ["jlpm"] source_dir = "src" build_dir = "fails_components_jupyter_interceptor/labextension" +[tool.jupyter-releaser] +skip = [] + [tool.jupyter-releaser.hooks] before-build-npm = [ "python -m pip install 'jupyterlab>=4.0.0,<5'", diff --git a/packages/launcher/pyproject.toml b/packages/launcher/pyproject.toml index 42c246e..ac07fb5 100644 --- a/packages/launcher/pyproject.toml +++ b/packages/launcher/pyproject.toml @@ -63,6 +63,9 @@ npm = ["jlpm"] source_dir = "src" build_dir = "fails_components_jupyter_launcher/labextension" +[tool.jupyter-releaser] +skip = [] + [tool.jupyter-releaser.hooks] before-build-npm = [ "python -m pip install 'jupyterlab>=4.0.0,<5'", diff --git a/pyproject.toml b/pyproject.toml index 2aa0904..2ad7a1b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -39,13 +39,16 @@ allow-direct-references = true [tool.check-manifest] ignore = [".*"] +[tool.jupyter-releaser] +skip = [ "build-python", "check-links", "check-python", "check-npm"] + [tool.jupyter-releaser.options] version_cmd = "npm run versionlerna" [tool.jupyter-releaser.hooks] before-build-npm = [ "python -m pip install 'jupyterlab>=4.0.0,<5'", - "jlpm install", + "jlpm", "jlpm build:prod" ] before-build-python = ["jlpm clean:all"] From 501a78ef03688d5fe0b8782042493cb1a78611f8 Mon Sep 17 00:00:00 2001 From: Marten Richter Date: Sun, 2 Feb 2025 10:49:15 +0000 Subject: [PATCH 03/11] Remove skipping --- packages/applet-view/pyproject.toml | 3 --- packages/filesystem-extension/pyproject.toml | 3 --- packages/interceptor/pyproject.toml | 3 --- packages/launcher/pyproject.toml | 3 --- pyproject.toml | 3 --- 5 files changed, 15 deletions(-) diff --git a/packages/applet-view/pyproject.toml b/packages/applet-view/pyproject.toml index 601a449..e8dcf3b 100644 --- a/packages/applet-view/pyproject.toml +++ b/packages/applet-view/pyproject.toml @@ -63,9 +63,6 @@ npm = ["jlpm"] source_dir = "src" build_dir = "fails_components_jupyter_applet_view/labextension" -[tool.jupyter-releaser] -skip = [ ] - [tool.jupyter-releaser.hooks] before-build-npm = [ "python -m pip install 'jupyterlab>=4.0.0,<5'", diff --git a/packages/filesystem-extension/pyproject.toml b/packages/filesystem-extension/pyproject.toml index e255825..623097d 100644 --- a/packages/filesystem-extension/pyproject.toml +++ b/packages/filesystem-extension/pyproject.toml @@ -63,9 +63,6 @@ npm = ["jlpm"] source_dir = "src" build_dir = "fails_components_jupyter_filesystem_extension/labextension" -[tool.jupyter-releaser] -skip = [] - [tool.jupyter-releaser.hooks] before-build-npm = [ "python -m pip install 'jupyterlab>=4.0.0,<5'", diff --git a/packages/interceptor/pyproject.toml b/packages/interceptor/pyproject.toml index e7cf901..a2f1422 100644 --- a/packages/interceptor/pyproject.toml +++ b/packages/interceptor/pyproject.toml @@ -63,9 +63,6 @@ npm = ["jlpm"] source_dir = "src" build_dir = "fails_components_jupyter_interceptor/labextension" -[tool.jupyter-releaser] -skip = [] - [tool.jupyter-releaser.hooks] before-build-npm = [ "python -m pip install 'jupyterlab>=4.0.0,<5'", diff --git a/packages/launcher/pyproject.toml b/packages/launcher/pyproject.toml index ac07fb5..42c246e 100644 --- a/packages/launcher/pyproject.toml +++ b/packages/launcher/pyproject.toml @@ -63,9 +63,6 @@ npm = ["jlpm"] source_dir = "src" build_dir = "fails_components_jupyter_launcher/labextension" -[tool.jupyter-releaser] -skip = [] - [tool.jupyter-releaser.hooks] before-build-npm = [ "python -m pip install 'jupyterlab>=4.0.0,<5'", diff --git a/pyproject.toml b/pyproject.toml index 2ad7a1b..0ffc5ff 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -39,9 +39,6 @@ allow-direct-references = true [tool.check-manifest] ignore = [".*"] -[tool.jupyter-releaser] -skip = [ "build-python", "check-links", "check-python", "check-npm"] - [tool.jupyter-releaser.options] version_cmd = "npm run versionlerna" From 233866aa94be782effdd4c0893fb0bbc79ebf0f2 Mon Sep 17 00:00:00 2001 From: Marten Richter Date: Sun, 2 Feb 2025 10:55:04 +0000 Subject: [PATCH 04/11] Specify python packages --- pyproject.toml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pyproject.toml b/pyproject.toml index 0ffc5ff..3144ea3 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -41,6 +41,12 @@ ignore = [".*"] [tool.jupyter-releaser.options] version_cmd = "npm run versionlerna" +python_packages = [ + "packages/applet-view", + "packages/filesystem-extension", + "packages/interceptor", + "packages/launcher" +] [tool.jupyter-releaser.hooks] before-build-npm = [ From 6b56dfab76694e8c460971bf2e911d4ef2d6ca88 Mon Sep 17 00:00:00 2001 From: Marten Richter Date: Sun, 2 Feb 2025 11:32:49 +0000 Subject: [PATCH 05/11] Run version command always at the root package --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 3144ea3..c55d3c3 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -40,7 +40,7 @@ allow-direct-references = true ignore = [".*"] [tool.jupyter-releaser.options] -version_cmd = "npm run versionlerna" +version_cmd = "npm run versionlerna -workspace @fails-components/jupyter-monorepo" python_packages = [ "packages/applet-view", "packages/filesystem-extension", From 0d3e1b41488cb5d9f98bef1706a4be599c59f282 Mon Sep 17 00:00:00 2001 From: Marten Richter Date: Sun, 2 Feb 2025 11:52:27 +0000 Subject: [PATCH 06/11] Prevent multiple version increases --- packages/filesystem-extension/pyproject.toml | 3 +++ packages/interceptor/pyproject.toml | 3 +++ packages/jupyterreactedit/pyproject.toml | 3 +++ packages/launcher/pyproject.toml | 3 +++ 4 files changed, 12 insertions(+) diff --git a/packages/filesystem-extension/pyproject.toml b/packages/filesystem-extension/pyproject.toml index 623097d..ee57bfa 100644 --- a/packages/filesystem-extension/pyproject.toml +++ b/packages/filesystem-extension/pyproject.toml @@ -63,6 +63,9 @@ npm = ["jlpm"] source_dir = "src" build_dir = "fails_components_jupyter_filesystem_extension/labextension" +[tool.jupyter-releaser.options] +version_cmd = """echo "Do not change version twice to:" """ + [tool.jupyter-releaser.hooks] before-build-npm = [ "python -m pip install 'jupyterlab>=4.0.0,<5'", diff --git a/packages/interceptor/pyproject.toml b/packages/interceptor/pyproject.toml index a2f1422..d46bf9d 100644 --- a/packages/interceptor/pyproject.toml +++ b/packages/interceptor/pyproject.toml @@ -63,6 +63,9 @@ npm = ["jlpm"] source_dir = "src" build_dir = "fails_components_jupyter_interceptor/labextension" +[tool.jupyter-releaser.options] +version_cmd = """echo "Do not change version twice to:" """ + [tool.jupyter-releaser.hooks] before-build-npm = [ "python -m pip install 'jupyterlab>=4.0.0,<5'", diff --git a/packages/jupyterreactedit/pyproject.toml b/packages/jupyterreactedit/pyproject.toml index f5f4b57..890989c 100644 --- a/packages/jupyterreactedit/pyproject.toml +++ b/packages/jupyterreactedit/pyproject.toml @@ -46,6 +46,9 @@ npm = ["jlpm"] source_dir = "src" build_dir = "lib" +[tool.jupyter-releaser.options] +version_cmd = """echo "Do not change version twice to:" """ + [tool.jupyter-releaser.hooks] before-build-npm = [ "jlpm", diff --git a/packages/launcher/pyproject.toml b/packages/launcher/pyproject.toml index 42c246e..ce5b123 100644 --- a/packages/launcher/pyproject.toml +++ b/packages/launcher/pyproject.toml @@ -63,6 +63,9 @@ npm = ["jlpm"] source_dir = "src" build_dir = "fails_components_jupyter_launcher/labextension" +[tool.jupyter-releaser.options] +version_cmd = """echo "Do not change version twice to:" """ + [tool.jupyter-releaser.hooks] before-build-npm = [ "python -m pip install 'jupyterlab>=4.0.0,<5'", From 03eff66c5b01b8e1ee2c1e801057ea6e0ce92489 Mon Sep 17 00:00:00 2001 From: Marten Richter Date: Sun, 2 Feb 2025 12:02:13 +0000 Subject: [PATCH 07/11] Only increment if not dirty --- packages/filesystem-extension/pyproject.toml | 2 -- packages/interceptor/pyproject.toml | 3 --- packages/jupyterreactedit/pyproject.toml | 3 --- packages/launcher/pyproject.toml | 3 --- pyproject.toml | 2 +- 5 files changed, 1 insertion(+), 12 deletions(-) diff --git a/packages/filesystem-extension/pyproject.toml b/packages/filesystem-extension/pyproject.toml index ee57bfa..5ae9842 100644 --- a/packages/filesystem-extension/pyproject.toml +++ b/packages/filesystem-extension/pyproject.toml @@ -63,8 +63,6 @@ npm = ["jlpm"] source_dir = "src" build_dir = "fails_components_jupyter_filesystem_extension/labextension" -[tool.jupyter-releaser.options] -version_cmd = """echo "Do not change version twice to:" """ [tool.jupyter-releaser.hooks] before-build-npm = [ diff --git a/packages/interceptor/pyproject.toml b/packages/interceptor/pyproject.toml index d46bf9d..a2f1422 100644 --- a/packages/interceptor/pyproject.toml +++ b/packages/interceptor/pyproject.toml @@ -63,9 +63,6 @@ npm = ["jlpm"] source_dir = "src" build_dir = "fails_components_jupyter_interceptor/labextension" -[tool.jupyter-releaser.options] -version_cmd = """echo "Do not change version twice to:" """ - [tool.jupyter-releaser.hooks] before-build-npm = [ "python -m pip install 'jupyterlab>=4.0.0,<5'", diff --git a/packages/jupyterreactedit/pyproject.toml b/packages/jupyterreactedit/pyproject.toml index 890989c..f5f4b57 100644 --- a/packages/jupyterreactedit/pyproject.toml +++ b/packages/jupyterreactedit/pyproject.toml @@ -46,9 +46,6 @@ npm = ["jlpm"] source_dir = "src" build_dir = "lib" -[tool.jupyter-releaser.options] -version_cmd = """echo "Do not change version twice to:" """ - [tool.jupyter-releaser.hooks] before-build-npm = [ "jlpm", diff --git a/packages/launcher/pyproject.toml b/packages/launcher/pyproject.toml index ce5b123..42c246e 100644 --- a/packages/launcher/pyproject.toml +++ b/packages/launcher/pyproject.toml @@ -63,9 +63,6 @@ npm = ["jlpm"] source_dir = "src" build_dir = "fails_components_jupyter_launcher/labextension" -[tool.jupyter-releaser.options] -version_cmd = """echo "Do not change version twice to:" """ - [tool.jupyter-releaser.hooks] before-build-npm = [ "python -m pip install 'jupyterlab>=4.0.0,<5'", diff --git a/pyproject.toml b/pyproject.toml index c55d3c3..3df3c7a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -40,7 +40,7 @@ allow-direct-references = true ignore = [".*"] [tool.jupyter-releaser.options] -version_cmd = "npm run versionlerna -workspace @fails-components/jupyter-monorepo" +version_cmd = "git status --porcelain | grep -q . || npm run versionlerna -workspace @fails-components/jupyter-monorepo" python_packages = [ "packages/applet-view", "packages/filesystem-extension", From d6bdd030bc43005e74e2319b41591bd6d612d175 Mon Sep 17 00:00:00 2001 From: Marten Richter Date: Sun, 2 Feb 2025 12:09:35 +0000 Subject: [PATCH 08/11] Fix clean labextension --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9bf4a23..ab2e4b7 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ "clean": "jlpm clean:lib --no-private", "clean:lib": "lerna run clean:lib --no-private", "clean:lintcache": "lerna run clean:lintcache --no-private", - "clean:labextension": "lerna run clean:labextension--no-private", + "clean:labextension": "lerna run clean:labextension --no-private", "clean:all": "jlpm clean:lib && jlpm clean:labextension && jlpm clean:lintcache", "eslint": "lerna run eslint --no-private", "eslint:check": "lerna run eslint:check --no-private", From 0f5e3c07448bd522b6bb98c0dc23b8a81c5c946c Mon Sep 17 00:00:00 2001 From: Marten Richter Date: Sun, 2 Feb 2025 12:36:09 +0000 Subject: [PATCH 09/11] Fix invoking lerna --- package.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index ab2e4b7..63ab343 100644 --- a/package.json +++ b/package.json @@ -22,24 +22,24 @@ "url": "git+https://github.com/fails-components/jupyterfails.git" }, "scripts": { - "build": "jlpm build:lib && jlpm build:labextension:dev", - "build:prod": "jlpm clean && jlpm build:lib:prod && jlpm build:labextension", + "build": "lerna run build --no-private", + "build:prod": "lerna run build:prod --no-private", "build:labextension": "lerna run build:labextension --no-private", "build:labextension:dev": "lerna run build:labextension:dev --no-private", "build:lib": "lerna run build:lib --no-private", "build:lib:prod": "lerna run build:lib:prod --no-private", - "clean": "jlpm clean:lib --no-private", + "clean": "lerna run clean:lib --no-private", "clean:lib": "lerna run clean:lib --no-private", "clean:lintcache": "lerna run clean:lintcache --no-private", "clean:labextension": "lerna run clean:labextension --no-private", - "clean:all": "jlpm clean:lib && jlpm clean:labextension && jlpm clean:lintcache", + "clean:all": "lerna run clean:all", "eslint": "lerna run eslint --no-private", "eslint:check": "lerna run eslint:check --no-private", "install:extension": "jlpm build", - "lint": "jlpm stylelint && jlpm prettier && jlpm eslint", - "lint:check": "jlpm stylelint:check && jlpm prettier:check && jlpm eslint:check", + "lint": "lerna run lint", + "lint:check": "lerna run lint:check", "labextension:develop": "lerna run labextension:develop --no-private", - "prettier": "jlpm prettier:base --write --list-different", + "prettier": "lerna prettier", "prettier:base": "lerna run prettier:base --no-private", "prettier:check": "lerna run prettier:check --no-private", "stylelint": "lerna run stylelint --no-private", From 25a486f8d6822b966695b29f63c97bae132fa4dc Mon Sep 17 00:00:00 2001 From: Marten Richter Date: Sun, 2 Feb 2025 12:47:09 +0000 Subject: [PATCH 10/11] Fix lerna not doing infinite loops --- package.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 63ab343..468cd0e 100644 --- a/package.json +++ b/package.json @@ -32,14 +32,14 @@ "clean:lib": "lerna run clean:lib --no-private", "clean:lintcache": "lerna run clean:lintcache --no-private", "clean:labextension": "lerna run clean:labextension --no-private", - "clean:all": "lerna run clean:all", + "clean:all": "lerna run clean:all --no-private", "eslint": "lerna run eslint --no-private", "eslint:check": "lerna run eslint:check --no-private", - "install:extension": "jlpm build", - "lint": "lerna run lint", - "lint:check": "lerna run lint:check", + "install:extension": "lerna build --no-private", + "lint": "lerna run lint --no-private", + "lint:check": "lerna run lint:check --no-private", "labextension:develop": "lerna run labextension:develop --no-private", - "prettier": "lerna prettier", + "prettier": "lerna prettier --no-privat", "prettier:base": "lerna run prettier:base --no-private", "prettier:check": "lerna run prettier:check --no-private", "stylelint": "lerna run stylelint --no-private", From 1d0ffa51fc4e959f500656ac967d9ce86e6abb4c Mon Sep 17 00:00:00 2001 From: Marten Richter Date: Sun, 2 Feb 2025 12:55:57 +0000 Subject: [PATCH 11/11] Fix build python --- pyproject.toml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 3df3c7a..3b4df74 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -54,7 +54,10 @@ before-build-npm = [ "jlpm", "jlpm build:prod" ] -before-build-python = ["jlpm clean:all"] +before-build-python = [ + "jlpm clean:all", + "jlpm build:lib:prod" +] [tool.check-wheel-contents] ignore = ["W002"]