Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ env:
# this. The version should match the version used in
# .pre-commit-config.yaml and frozen in uv.lock. It is updated by
# make update-deps.
UV_VERSION: "0.13.4"
UV_VERSION: "0.13.7"

"on":
merge_group: {}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/periodic-ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ env:
# this. The version should match the version used in
# .pre-commit-config.yaml and frozen in uv.lock. It is updated by
# make update-deps.
UV_VERSION: "0.13.4"
UV_VERSION: "0.13.7"

"on":
schedule:
Expand Down
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ repos:
exclude: ^\.devcontainer/(devcontainer\.json$|stoker/)

- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.16.10
rev: v0.17.4
hooks:
- id: ruff-check
args: [--fix, --exit-non-zero-on-fix]
- id: ruff-format

- repo: https://github.com/astral-sh/uv-pre-commit
rev: "0.13.4"
rev: "0.13.7"
hooks:
- id: uv-lock
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
FROM base-image AS install-image

# Install uv.
COPY --from=ghcr.io/astral-sh/uv:0.13.4 /uv /bin/uv
COPY --from=ghcr.io/astral-sh/uv:0.13.7 /uv /bin/uv

# Install system packages only needed for building dependencies.
COPY scripts/install-dependency-packages.sh .
Expand Down
9 changes: 8 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,14 @@ dev = [
"asgi-lifespan",
"coverage[toml]",
"httpx",
"pytest",
# Temporary cap. pytest 9.2.0 no longer reads the private Item._nodeid
# attribute that pytest-xdist 3.8.0 writes to implement
# --dist=loadgroup, so the xdist_group mark is silently ignored and the
# paired pins in tests/session_lifespan_test.py land on different
# workers. Fixed on pytest-xdist's master branch but not yet released;
# drop this cap once a pytest-xdist newer than 3.8.0 is out. See
# https://github.com/pytest-dev/pytest-xdist/issues/1386
"pytest<9.2",
"pytest-asyncio",
# 2.4 is the first release whose debugger detection reads
# sys.monitoring, which is how a debugger attaches on the Python this
Expand Down
21 changes: 5 additions & 16 deletions tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,7 @@
from asgi_lifespan import LifespanManager # noqa: E402
from fastapi import FastAPI # noqa: E402
from httpx import ASGITransport, AsyncClient # noqa: E402
from rubin.repertoire import ( # noqa: E402
DiscoveryClient,
register_mock_discovery,
)
from rubin.repertoire import DiscoveryClient, register_mock_discovery # noqa: E402
from safir.arq import MockArqQueue # noqa: E402
from safir.database import create_database_engine # noqa: E402
from safir.dependencies.arq import arq_dependency # noqa: E402
Expand Down Expand Up @@ -58,20 +55,12 @@
from docverse_server.main import app as docverse_app # noqa: E402
from docverse_server.metrics import build_event_manager # noqa: E402
from docverse_server.metrics.events import DocverseEvents # noqa: E402
from docverse_server.services.keeper_sync_run import ( # noqa: E402
KEEPER_SYNC_QUEUE_NAME,
)
from docverse_server.services.keeper_sync_run import KEEPER_SYNC_QUEUE_NAME # noqa: E402
from docverse_server.storage.build_store import BuildStore # noqa: E402
from docverse_server.storage.membership_store import ( # noqa: E402
OrgMembershipStore,
)
from docverse_server.storage.organization_store import ( # noqa: E402
OrganizationStore,
)
from docverse_server.storage.membership_store import OrgMembershipStore # noqa: E402
from docverse_server.storage.organization_store import OrganizationStore # noqa: E402
from docverse_server.storage.project_store import ProjectStore # noqa: E402
from docverse_server.storage.user_info_store import ( # noqa: E402
StubUserInfoStore,
)
from docverse_server.storage.user_info_store import StubUserInfoStore # noqa: E402
from docverse_server.worker.queues import MAINTENANCE_QUEUE_NAME # noqa: E402

from .support.arq_testing import register_queue # noqa: E402
Expand Down
Loading
Loading