From 83b9736aed7ff9799e93efcfac8f41eefd204c4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Collonval?= Date: Mon, 12 Dec 2022 09:07:58 +0100 Subject: [PATCH 1/4] Use only pyproject for jupyter-releaser --- package.json | 11 ----------- pyproject.toml | 4 ++++ 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index 5bf9223..d8af055 100644 --- a/package.json +++ b/package.json @@ -82,16 +82,5 @@ "stylelint-prettier": "^2.0.0", "ts-jest": "^26.0.0", "typescript": "~4.1.3" - }, - "jupyter-releaser": { - "hooks": { - "before-build-npm": [ - "python -m pip install jupyterlab~=3.1", - "jlpm" - ], - "before-build-python": [ - "jlpm clean:all" - ] - } } } diff --git a/pyproject.toml b/pyproject.toml index 4cd6139..e219e20 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -78,3 +78,7 @@ build_dir = "jupyterlab_rise/labextension" [tool.jupyter-releaser.options] version_cmd = "hatch version" + +[tool.jupyter-releaser.hooks] +before-build-npm = ["python -m pip install jupyterlab~=3.1", "jlpm"] +before-build-python = ["jlpm clean:all"] From fe8dcc4e0977d081a4bc539968c9b1f7ffbbbaa3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Collonval?= Date: Mon, 12 Dec 2022 09:12:58 +0100 Subject: [PATCH 2/4] Use only package.json --- package.json | 14 ++++++++++++++ pyproject.toml | 7 ------- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index d8af055..f6454fb 100644 --- a/package.json +++ b/package.json @@ -82,5 +82,19 @@ "stylelint-prettier": "^2.0.0", "ts-jest": "^26.0.0", "typescript": "~4.1.3" + }, + "jupyter-releaser": { + "hooks": { + "before-build-npm": [ + "python -m pip install jupyterlab~=3.1", + "jlpm" + ], + "before-build-python": [ + "jlpm clean:all" + ] + }, + "options": { + "version_cmd": "hatch version" + } } } diff --git a/pyproject.toml b/pyproject.toml index e219e20..44b1661 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -75,10 +75,3 @@ build_cmd = "install:extension" npm = ["jlpm"] source_dir = "src" build_dir = "jupyterlab_rise/labextension" - -[tool.jupyter-releaser.options] -version_cmd = "hatch version" - -[tool.jupyter-releaser.hooks] -before-build-npm = ["python -m pip install jupyterlab~=3.1", "jlpm"] -before-build-python = ["jlpm clean:all"] From ba0051b4207a6d098bfcf1ee0527753391ea9044 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Collonval?= Date: Mon, 12 Dec 2022 09:24:47 +0100 Subject: [PATCH 3/4] Apply fix of https://github.com/jupyterlab/extension-cookiecutter-ts/pull/251 --- package.json | 14 -------------- pyproject.toml | 11 +++++++++++ 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/package.json b/package.json index f6454fb..d8af055 100644 --- a/package.json +++ b/package.json @@ -82,19 +82,5 @@ "stylelint-prettier": "^2.0.0", "ts-jest": "^26.0.0", "typescript": "~4.1.3" - }, - "jupyter-releaser": { - "hooks": { - "before-build-npm": [ - "python -m pip install jupyterlab~=3.1", - "jlpm" - ], - "before-build-python": [ - "jlpm clean:all" - ] - }, - "options": { - "version_cmd": "hatch version" - } } } diff --git a/pyproject.toml b/pyproject.toml index 44b1661..3e5fabe 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -75,3 +75,14 @@ build_cmd = "install:extension" npm = ["jlpm"] source_dir = "src" build_dir = "jupyterlab_rise/labextension" + +[tool.jupyter-releaser.options] +version_cmd = "hatch version" + +[tool.jupyter-releaser.hooks] +before-build-npm = [ + "python -m pip install jupyterlab~=3.1", + "jlpm", + "jlpm build:prod" +] +before-build-python = ["jlpm clean:all"] From d1228bafc5a38cd47596606b5abcf2344479c5d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Collonval?= Date: Mon, 12 Dec 2022 09:32:42 +0100 Subject: [PATCH 4/4] Fix build-python step --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 3e5fabe..d0e4b27 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -85,4 +85,4 @@ before-build-npm = [ "jlpm", "jlpm build:prod" ] -before-build-python = ["jlpm clean:all"] +before-build-python = ["jlpm clean"]