Skip to content

Rebase openrvdas_dev onto main v1.0.2 #30

Description

@webbpinner

main has been released as v1.0.2. Rebase openrvdas_dev onto it, per the branching workflow in CLAUDE.md / RELEASING.md.

v1.0.2 contains #28: template mypy fixes, the pydantic.mypy plugin, and a blocking CI mypy step. After #26, openrvdas_dev has no OpenRVDAS-specific mypy errors left, so after this rebase mypy should pass completely and CI will enforce it.

Expected conflicts (dry-run rebase):

  • pyproject.toml: first hit on the very first replayed commit. Keep the OpenRVDAS name/version/description and dependency changes, and take main's [tool.mypy] plugins = ["pydantic.mypy"]. Resolve hunk by hunk, not by taking a whole side.
  • The dry run stops at the first conflict, so later ones weren't checked. Likely candidates are the files Fix template mypy errors and make CI mypy blocking #28 touched that also differ on this branch: app/config.py (database_url: str = "" and the cached_data_server_* settings), app/db/session.py (async_sessionmaker) and tests/conftest.py.
  • poetry.lock: regenerate after the rebase.

Migration chain: this release has no migration changes. Keep 6e53aa40f2e0 out of this branch (removed in #22) and confirm alembic heads shows d2e3f4a5b6c7 as the only head.

Verify before force-pushing: black / isort / flake8 / mypy all clean, pytest passes, and alembic upgrade head on a fresh SQLite database.

Activity

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Metadata

Metadata

Assignees

No one assigned

    Labels

    No labels
    No labels

    Type

    No type

    Projects

    No projects

      Milestone

      No milestone

      Relationships

      None yet

      Development

      No branches or pull requests

      Issue actions