Skip to content
This repository has been archived by the owner on Jan 4, 2024. It is now read-only.

Commit

Permalink
Convert to Safir's AsyncMultiQueue
Browse files Browse the repository at this point in the history
Use the AsyncMultiQueue data structure from Safir to manage the
progress events. This is a richer version of the data structures
that were being used internally.

Rely on the spawner calling end() in its finally block and don't
poll the spawner task for completion inside the progress iterator.
The Safir AsyncMultiQueue has a mechanism for explicitly indicating
the end of the data in the queue, which should serve the same
purpose.

Simplify the way that progress events are checked in the test suite
and add an explicit test for reading the events of a spawn after the
spawn has completed.
  • Loading branch information
rra committed Sep 20, 2023
1 parent a702c60 commit 396079b
Show file tree
Hide file tree
Showing 5 changed files with 198 additions and 156 deletions.
6 changes: 3 additions & 3 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
#
# pip-compile --allow-unsafe --generate-hashes --output-file=requirements/dev.txt requirements/dev.in
#
anyio==4.0.0 \
--hash=sha256:cfdb2b588b9fc25ede96d8db56ed50848b0b649dca3dd1df0b11f683bb9e0b5f \
--hash=sha256:f7ed51751b2c2add651e5747c891b47e26d2a21be5d32d9311dfe9692f3e5d7a
anyio==3.7.1 \
--hash=sha256:44a3c9aba0f5defa43261a8b3efb97891f2bd7d804e0e1f56419befa1adfc780 \
--hash=sha256:91dee416e570e92c64041bd18b900d1d6fa78dff7048769ce5ac5ddad004fbb5
# via
# -c requirements/main.txt
# httpcore
Expand Down
5 changes: 5 additions & 0 deletions requirements/main.in
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ jupyterhub==3.1.1
httpx
httpx-sse
PyYAML
safir>=4.5.0
traitlets

# Additional dependencies required by our configuration of JupyterHub.
Expand All @@ -31,3 +32,7 @@ kubernetes_asyncio
# JupyterHub image currently uses.
exceptiongroup
ruamel.yaml.clib

# Uncomment this, change the branch, comment out safir above, and run make
# update-deps-no-hashes to test against an unreleased version of Safir.
# safir @ git+https://github.com/lsst-sqre/safir@main
Loading

0 comments on commit 396079b

Please sign in to comment.