You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
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.
mainhas been released as v1.0.2. Rebaseopenrvdas_devonto it, per the branching workflow inCLAUDE.md/RELEASING.md.v1.0.2 contains #28: template mypy fixes, the
pydantic.mypyplugin, and a blocking CI mypy step. After #26,openrvdas_devhas 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 OpenRVDASname/version/descriptionand dependency changes, and takemain's[tool.mypy] plugins = ["pydantic.mypy"]. Resolve hunk by hunk, not by taking a whole side.app/config.py(database_url: str = ""and thecached_data_server_*settings),app/db/session.py(async_sessionmaker) andtests/conftest.py.poetry.lock: regenerate after the rebase.Migration chain: this release has no migration changes. Keep
6e53aa40f2e0out of this branch (removed in #22) and confirmalembic headsshowsd2e3f4a5b6c7as the only head.Verify before force-pushing: black / isort / flake8 / mypy all clean, pytest passes, and
alembic upgrade headon a fresh SQLite database.