Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DM-41528: Incorporate the REST spawner and JupyterHub build #210

Merged
merged 171 commits into from
Nov 3, 2023
Merged

Conversation

rra
Copy link
Member

@rra rra commented Nov 3, 2023

Merge the rsp-restspawner repository into this repository as a subdirectory and integrate it with the build system. Merge its Ruff exclusions and update Python dependencies.

rra and others added 26 commits September 25, 2023 09:51
…ns/checkout-4

Bump actions/checkout from 3 to 4
- Update pre-commit/pre-commit-hooks pre-commit hook from v4.4.0 to v4.5.0
- Update astral-sh/ruff-pre-commit pre-commit hook from v0.0.291 to v0.0.292
[neophile] Update dependencies
tickets/DM-41198: add postgresql-client to image
- Update astral-sh/ruff-pre-commit pre-commit hook from v0.0.292 to v0.1.1
- Update psf/black pre-commit hook from 23.9.1 to 23.10.0
[neophile] Update dependencies
Update the lab status enum to match the current Nublado controller,
including renaming starting to pending. Add support for terminated
status, which will be used for labs killed by the idle culler.
Update comments for the (soon to be implemented) behavior of the
Nublado controller.

Treat terminating status the same as terminated: tell the hub that
the lab has exited, even though it hasn't yet. We want to allow the
user to start spawning a new lab, and if they kick that off before
the lab deletion completes, we'll join the existing delete call now
that the controller supports multiple simultaneous deletes.
DM-41350: Handle terminating and terminated status
Get somewhat nicer test output.
DM-41350: Update Python dependencies, use pytest-sugar
Remove the mypy and linter configuration, since this can now be done
at the top level. Point setuptools_scm at the correct root of the
repository for its magic. Update the project URLs and set the
development status back to beta for now.
Update Python dependencies for both the controller and the spawner.
Pin the version of anyio for the spawner since a newer version breaks
the controller (via FastAPI). This is temporary until I redo how
dependencies are handled for the JuypterHub build.
Move the top-level Dockerfile to Dockerfile.controller since it
only builds the controller, and move its scripts into the controller
subdirectory instead of the top level since they'll conflict with
the scripts for the spawner.
Eventually the additional modules we add to the spawner will be
broken up into separate directories, but for now add the spawner
directory with its own frozen dependencies.
Move the Dockerfile in the spawner directory up a level as
Dockerfile.hub and integrate that build into GitHub CI. Push that
image as nublado-jupyterhub.
Python wants a LICENSE file for pyproject.toml for each Python
project, but the overall repository only has one license. Use
symlinks to make Python happy.
The spawner code triggers a couple more Ruff errors that seem too
prone to false positives.
The module name will change, but tell Ruff this is a first-party
module for proper import sorting.
Force Black to use the top-level pyproject.toml for configuration
when run with pre-commit instead of finding the pyproject.toml in
a subdirectory and then using its defaults for line length since
no Black configuration is present there.
Remove GitHub Actions, flake8, .gitignore, pre-commit, Makefile,
and tox configuration from the spawner directory, since this is
now handled by the top-level configuration.
Update Python and pre-commit dependencies.
@rra rra force-pushed the tickets/DM-41528 branch from b5d59b2 to ab57cf4 Compare November 3, 2023 21:49
@rra rra merged commit aac01e5 into main Nov 3, 2023
@rra rra deleted the tickets/DM-41528 branch November 3, 2023 22:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants