diff --git a/.github/workflows/check-release.yml b/.github/workflows/check-release.yml index 702e56cc..c88e5980 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 @@ -15,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: 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 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" - ] - } } } diff --git a/pyproject.toml b/pyproject.toml index b297321e..c7aa6cc2 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.0,<5", "hatch-nodejs-version>=0.3.2"] build-backend = "hatchling.build" [project] @@ -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] @@ -72,14 +63,15 @@ 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"] 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"] @@ -144,6 +136,14 @@ filterwarnings = [ [tool.jupyter_releaser] 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] check_untyped_defs = true disallow_incomplete_defs = true @@ -155,6 +155,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/**"]