From 60f075cf9ff9337330a5e27630275410dab15fea Mon Sep 17 00:00:00 2001 From: lekss361 Date: Fri, 15 May 2026 13:10:11 +0300 Subject: [PATCH] =?UTF-8?q?fixup(cadastre):=20drop=20importorskip=20(PR2?= =?UTF-8?q?=20merged)=20=E2=80=94=20imports=20now=20top-level=20(#168=20PR?= =?UTF-8?q?3)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/tests/services/test_cadastre_bulk.py | 22 +++----------------- 1 file changed, 3 insertions(+), 19 deletions(-) diff --git a/backend/tests/services/test_cadastre_bulk.py b/backend/tests/services/test_cadastre_bulk.py index 6f6b296c..fc0a7300 100644 --- a/backend/tests/services/test_cadastre_bulk.py +++ b/backend/tests/services/test_cadastre_bulk.py @@ -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 # ── Фикстуры ─────────────────────────────────────────────────────────────────