From ec8bc6cdc44060e93f490bce0925c4c508a04a31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Krassowski?= <5832902+krassowski@users.noreply.github.com> Date: Fri, 15 Nov 2024 09:53:53 +0000 Subject: [PATCH 01/12] Remove releaser config from package.json --- package.json | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/package.json b/package.json index 308de8dd..c4f09895 100644 --- a/package.json +++ b/package.json @@ -128,17 +128,5 @@ "extension": true, "outputDir": "jupyter_scheduler/labextension", "schemaDir": "schema" - }, - "jupyter-releaser": { - "hooks": { - "before-build-npm": [ - "python -m pip install jupyterlab~=4.0", - "jlpm", - "jlpm build:prod" - ], - "before-build-python": [ - "jlpm clean:all" - ] - } } } From dbfae6659de6615c53649615bd131d1ffbacff6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Krassowski?= <5832902+krassowski@users.noreply.github.com> Date: Fri, 15 Nov 2024 09:55:52 +0000 Subject: [PATCH 02/12] Add releaser/sdist config to `pyproject.toml` --- pyproject.toml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pyproject.toml b/pyproject.toml index b297321e..cf5dde01 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -93,6 +93,10 @@ npm = ["jlpm"] source_dir = "src" build_dir = "jupyter_scheduler/labextension" +[tool.hatch.build.targets.sdist] +artifacts = ["jupyter_scheduler/labextension"] +exclude = [".github", "binder"] + [tool.tbump.version] current = "2.10.0" regex = "(?P\\d+)\\.(?P\\d+)\\.(?P\\d+)((?Pa|b|rc|.dev)(?P\\d+))?" @@ -144,6 +148,9 @@ filterwarnings = [ [tool.jupyter_releaser] skip = ["check-links"] +[tool.jupyter-releaser.hooks] +before-build-python = ["jlpm clean:all"] + [tool.mypy] check_untyped_defs = true disallow_incomplete_defs = true From 1f0030da2a99eae10369a9c3baab908311a6f872 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Krassowski?= <5832902+krassowski@users.noreply.github.com> Date: Fri, 15 Nov 2024 09:59:53 +0000 Subject: [PATCH 03/12] Merge duplicates --- pyproject.toml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index cf5dde01..9a2c5047 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -72,7 +72,8 @@ artifacts = ["jupyter_scheduler/labextension"] "jupyter-config/nb-config" = "etc/jupyter/jupyter_notebook_config.d" [tool.hatch.build.targets.sdist] -exclude = [".github"] +artifacts = ["jupyter_scheduler/labextension"] +exclude = [".github", "binder"] [tool.hatch.build.hooks.jupyter-builder] dependencies = ["hatch-jupyter-builder>=0.5"] @@ -93,10 +94,6 @@ npm = ["jlpm"] source_dir = "src" build_dir = "jupyter_scheduler/labextension" -[tool.hatch.build.targets.sdist] -artifacts = ["jupyter_scheduler/labextension"] -exclude = [".github", "binder"] - [tool.tbump.version] current = "2.10.0" regex = "(?P\\d+)\\.(?P\\d+)\\.(?P\\d+)((?Pa|b|rc|.dev)(?P\\d+))?" From 7ab8d043eaa0c28724324a1fd92949acb84fd016 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Krassowski?= <5832902+krassowski@users.noreply.github.com> Date: Fri, 15 Nov 2024 10:01:03 +0000 Subject: [PATCH 04/12] Actually run jupyter-releaser `check-release` on PRs --- .github/workflows/check-release.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/check-release.yml b/.github/workflows/check-release.yml index 702e56cc..4fe23e79 100644 --- a/.github/workflows/check-release.yml +++ b/.github/workflows/check-release.yml @@ -6,7 +6,6 @@ on: pull_request: branches: - main - types: [closed] permissions: contents: write From 823c5bc60d2b1fab0ae12de525b2f8f0656962b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Krassowski?= <5832902+krassowski@users.noreply.github.com> Date: Fri, 15 Nov 2024 10:04:31 +0000 Subject: [PATCH 05/12] Add missing hook --- pyproject.toml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pyproject.toml b/pyproject.toml index 9a2c5047..9a94cfed 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -146,6 +146,11 @@ filterwarnings = [ skip = ["check-links"] [tool.jupyter-releaser.hooks] +before-build-npm = [ + "python -m pip install 'jupyterlab>=4.0.0,<5'", + "jlpm", + "jlpm build:prod" +] before-build-python = ["jlpm clean:all"] [tool.mypy] From 4774ce6f1329f815240edadb0ad2b88c881fc1ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Krassowski?= <5832902+krassowski@users.noreply.github.com> Date: Fri, 15 Nov 2024 10:25:47 +0000 Subject: [PATCH 06/12] Debug more --- .github/workflows/check-release.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/check-release.yml b/.github/workflows/check-release.yml index 4fe23e79..c88e5980 100644 --- a/.github/workflows/check-release.yml +++ b/.github/workflows/check-release.yml @@ -14,12 +14,14 @@ jobs: check_release: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v3 + - run: ls -al - uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1 - name: Check Release uses: jupyter-server/jupyter_releaser/.github/actions/check-release@v2 with: token: ${{ secrets.GITHUB_TOKEN }} + - run: ls -al - name: Upload Distributions uses: actions/upload-artifact@v4 with: From a6d5e3fc8cddd609294187e8997e91fd5d76c1d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Krassowski?= <5832902+krassowski@users.noreply.github.com> Date: Fri, 15 Nov 2024 10:41:09 +0000 Subject: [PATCH 07/12] More alignment --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 9a94cfed..ccfb3d8f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,5 +1,5 @@ [build-system] -requires = ["hatchling>=1.3.1", "jupyterlab~=4.0"] +requires = ["hatchling>=1.5.0", "jupyterlab~=4.0", "hatch-nodejs-version>=0.3.2"] build-backend = "hatchling.build" [project] From 49a542db09856555c78d8c9b32e49010da9cf1c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Krassowski?= <5832902+krassowski@users.noreply.github.com> Date: Fri, 15 Nov 2024 10:59:01 +0000 Subject: [PATCH 08/12] Delete MANIFEST.in --- MANIFEST.in | 31 ------------------------------- 1 file changed, 31 deletions(-) delete mode 100644 MANIFEST.in diff --git a/MANIFEST.in b/MANIFEST.in deleted file mode 100644 index 7affaa3a..00000000 --- a/MANIFEST.in +++ /dev/null @@ -1,31 +0,0 @@ -include LICENSE -include *.md -include pyproject.toml -recursive-include jupyter-config *.json -include conftest.py - -include package.json -include install.json -include ts*.json -include *.config.js -include yarn.lock - -graft jupyter_scheduler/labextension - -# Javascript files -graft src -graft style -graft ui-tests -prune **/node_modules -prune lib -prune binder - -# dev scripts -prune dev - -# Patterns to exclude from any directory -global-exclude *~ -global-exclude *.pyc -global-exclude *.pyo -global-exclude .git -global-exclude .ipynb_checkpoints From 82d966e11e940ade16676a9f64a52bb3a4b8d2fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Krassowski?= <5832902+krassowski@users.noreply.github.com> Date: Fri, 15 Nov 2024 11:33:34 +0000 Subject: [PATCH 09/12] Relax JupyterLab pin --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index ccfb3d8f..83c9ff24 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,5 +1,5 @@ [build-system] -requires = ["hatchling>=1.5.0", "jupyterlab~=4.0", "hatch-nodejs-version>=0.3.2"] +requires = ["hatchling>=1.5.0", "jupyterlab>=4.0.0,<5", "hatch-nodejs-version>=0.3.2"] build-backend = "hatchling.build" [project] From 8ae2e2472b5fdd2cb9b637c85037687878b96338 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Krassowski?= <5832902+krassowski@users.noreply.github.com> Date: Fri, 15 Nov 2024 11:40:43 +0000 Subject: [PATCH 10/12] Fix double `/` in ensured targets --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 83c9ff24..5c8849b1 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -80,7 +80,7 @@ dependencies = ["hatch-jupyter-builder>=0.5"] build-function = "hatch_jupyter_builder.npm_builder" ensured-targets = [ "jupyter_scheduler/labextension/static/style.js", - "jupyter_scheduler//labextension/package.json", + "jupyter_scheduler/labextension/package.json", ] skip-if-exists = ["jupyter_scheduler/labextension/static/style.js"] From 03480af314b931626d74807d841ab892b51b5e8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Krassowski?= <5832902+krassowski@users.noreply.github.com> Date: Fri, 15 Nov 2024 11:52:18 +0000 Subject: [PATCH 11/12] Remove dead config --- pyproject.toml | 3 --- 1 file changed, 3 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 5c8849b1..e5b474e4 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -164,6 +164,3 @@ strict_equality = true warn_unused_configs = true warn_unused_ignores = true warn_redundant_casts = true - -[tool.check-manifest] -ignore = ["binder/**", "packages/**", "*.json", "*.png", "yarn.lock", ".*", "jupyter_scheduler/labextension/**", "jupyter_scheduler/static/**"] From 92c42ac24def48e4b4a9ab82e59aae549215168f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Krassowski?= <5832902+krassowski@users.noreply.github.com> Date: Fri, 15 Nov 2024 12:08:31 +0000 Subject: [PATCH 12/12] Is it a dependency? --- pyproject.toml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index e5b474e4..c7aa6cc2 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -30,15 +30,6 @@ classifiers = [ "Programming Language :: Python :: 3.12", ] dependencies = [ - "jupyter_server>=1.6,<3", - "traitlets~=5.0", - "nbconvert~=7.0", - "pydantic>=1.10,<3", - "sqlalchemy>=2.0,<3", - "croniter~=1.4", - "pytz>=2023.3,<=2024.2", - "fsspec>=2023.6.0,<=2024.10.0", - "psutil~=5.9" ] [project.optional-dependencies]