diff --git a/compose/README.md b/compose/README.md index 6aca6f5..2099c0a 100644 --- a/compose/README.md +++ b/compose/README.md @@ -453,4 +453,4 @@ To add a new compose file: --- -See `COMPOSE_BRAINSTORM.md` for future compose variants and design ideas. +See `docs/compose-brainstorm.md` for future compose variants and design ideas. diff --git a/COMPOSE_BRAINSTORM.md b/docs/compose-brainstorm.md similarity index 100% rename from COMPOSE_BRAINSTORM.md rename to docs/compose-brainstorm.md diff --git a/netengine/workers/__init__.py b/netengine/workers/__init__.py index 1cc940a..8b0063a 100644 --- a/netengine/workers/__init__.py +++ b/netengine/workers/__init__.py @@ -1 +1 @@ -# netengine/workers/ - Background worker tasks +"""Background worker tasks.""" diff --git a/pyproject.toml b/pyproject.toml index ec30239..a11f079 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -85,32 +85,3 @@ markers = [ "integration: Integration tests (requires Docker)", "slow: Slow tests", ] - -[tool.flake8] -max-line-length = 100 -extend-ignore = ["E203", "W503"] -exclude = [ - "tests", - "netengine/phases", - "netengine/utils", - "netengine/api", - "netengine/cli", - "netengine/core/pgmq_client.py", - "netengine/core/supabase_client.py", - "netengine/handlers/substrate.py", - "netengine/handlers/dns.py", - "netengine/handlers/pki_handler.py", - "netengine/handlers/phase_pki.py", - "netengine/handlers/oidc_handler.py", - "netengine/handlers/gateway_handler.py", - "netengine/handlers/docker_handler.py", - "netengine/handlers/and_handler.py", - "netengine/handlers/domain_registry_handler.py", - "netengine/handlers/mail_handler.py", - "netengine/handlers/minio_handler.py", - "netengine/handlers/app_handler.py", - "netengine/handlers/whois_server.py", - "netengine/handlers/world_registry_handler.py", - "netengine/logging/middleware.py", - "netengine/logging/sinks.py", -] diff --git a/tests/conftest.py b/tests/conftest.py index 91f678a..07776ba 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -71,6 +71,13 @@ def dev_sandbox_spec() -> NetEngineSpec: return load_spec(examples_dir / "dev-sandbox.yaml") +@pytest.fixture +def m3_spec() -> NetEngineSpec: + """Full valid spec for M3 orchestrator tests.""" + examples_dir = _get_examples_dir() + return load_spec(examples_dir / "minimal.yaml") + + # ───────────────────────────────────────────── # Runtime State Fixtures # ───────────────────────────────────────────── diff --git a/tests/integration/test_m3_bootstrap.py b/tests/integration/test_m3_bootstrap.py index 3e2a611..7a74029 100644 --- a/tests/integration/test_m3_bootstrap.py +++ b/tests/integration/test_m3_bootstrap.py @@ -1,6 +1,5 @@ """Integration tests for M3 bootstrap (Phases 3-4: PKI + Platform Identity).""" -from pathlib import Path from unittest.mock import AsyncMock, patch import pytest @@ -8,15 +7,6 @@ from netengine.core.orchestrator import Orchestrator from netengine.handlers.phase_pki import PKIPhaseHandler from netengine.phases.phase_platform_identity import PlatformIdentityPhaseHandler -from netengine.spec.loader import load_spec - -_EXAMPLES = Path(__file__).parent.parent.parent / "examples" - - -@pytest.fixture -def m3_spec(): - """Full valid spec for M3 orchestrator tests.""" - return load_spec(_EXAMPLES / "minimal.yaml") class TestPKIPhaseHandlerContract: diff --git a/tests/integration/test_orchestrator_m3.py b/tests/integration/test_orchestrator_m3.py index 2e5f76a..fee70e1 100644 --- a/tests/integration/test_orchestrator_m3.py +++ b/tests/integration/test_orchestrator_m3.py @@ -1,6 +1,5 @@ """Tests for Orchestrator with M3 phases.""" -from pathlib import Path from unittest.mock import AsyncMock, patch import pytest @@ -8,9 +7,6 @@ from netengine.core.orchestrator import Orchestrator from netengine.handlers.phase_pki import PKIPhaseHandler from netengine.phases.phase_platform_identity import PlatformIdentityPhaseHandler -from netengine.spec.loader import load_spec - -_EXAMPLES = Path(__file__).parent.parent.parent / "examples" async def _set_substrate_output(context): @@ -25,12 +21,6 @@ async def _set_pki_output(context): context.runtime_state.pki_bootstrapped = True -@pytest.fixture -def m3_spec(): - """Full valid spec for M3 orchestrator tests.""" - return load_spec(_EXAMPLES / "minimal.yaml") - - class TestOrchestratorPhaseExecution: """Tests for Orchestrator.execute_phases() behavior."""