fixup(cadastre): drop importorskip (PR2 merged) — imports now top-level (#168 PR3)

This commit is contained in:
lekss361 2026-05-15 13:10:11 +03:00
parent 13025c81ee
commit 60f075cf9f

View file

@ -11,30 +11,14 @@ from unittest.mock import AsyncMock, MagicMock, patch
import pytest
# nspd_bulk schemas живут в app.schemas.nspd_bulk (добавлены в PR 2/5).
# importorskip пропустит весь модуль (skip_module=True по умолчанию в pytest 7+)
# если PR 2 ещё не смержен в эту ветку.
pytest.importorskip(
"app.schemas.nspd_bulk",
reason=(
"app.schemas.nspd_bulk отсутствует — нужно смержить main (PR #170). "
"Команда: git rebase origin/main"
),
)
from app.schemas.nspd_bulk import ( # type: ignore[import] # noqa: E402
NSPDBulkFeature,
QuarterSnapshot,
)
from app.services.cadastre.bulk_harvest import ( # type: ignore[import] # noqa: E402
from app.schemas.nspd_bulk import NSPDBulkFeature, QuarterSnapshot
from app.services.cadastre.bulk_harvest import (
_derive_quarter_cad,
_safe_int,
_safe_numeric,
upsert_features,
)
from app.services.cadastre.grid_geometry import ( # type: ignore[import] # noqa: E402
generate_grid_click_points,
)
from app.services.cadastre.grid_geometry import generate_grid_click_points
# ── Фикстуры ─────────────────────────────────────────────────────────────────