merge: resolve conflicts between testing and main

pyproject.toml

@@ -13,6 +13,17 @@ dependencies = [
     "docker>=7.0",
     "pyyaml>=6.0",
     "jinja2>=3.1",
+<<<<<<< HEAD
+=======
+    "fastapi>=0.110.0",
+    "uvicorn>=0.29.0",
+    "aiosqlite>=0.20.0",
+    "PyJWT>=2.8.0",
+    "bcrypt>=4.1.0",
+    "psutil>=5.9.0",
+    "python-dotenv>=1.0.0",
+    "sqlmodel>=0.0.16",
+>>>>>>> testing
 ]
 
 [project.optional-dependencies]
@@ -21,13 +32,65 @@ dev = [
     "ruff>=0.4",
     "bandit>=1.7",
     "pip-audit>=2.0",
+<<<<<<< HEAD
     "hypothesis>=6.0",
+=======
+    "httpx>=0.27.0",
+    "hypothesis>=6.0",
+    "pytest-cov>=7.0",
+    "pytest-asyncio>=1.0",
+    "freezegun>=1.5",
+    "schemathesis>=4.0",
+    "pytest-xdist>=3.8.0",
+    "flask>=3.0",
+    "twisted>=24.0",
+    "requests>=2.32",
+    "redis>=5.0",
+    "pymysql>=1.1",
+    "psycopg2-binary>=2.9",
+    "paho-mqtt>=2.0",
+    "pymongo>=4.0",
+>>>>>>> testing
 ]
 
 [project.scripts]
 decnet = "decnet.cli:app"
 
+<<<<<<< HEAD
+=======
+[tool.pytest.ini_options]
+asyncio_mode = "auto"
+addopts = "-m 'not fuzz and not live' -v -q -x -n logical"
+markers = [
+    "fuzz: hypothesis-based fuzz tests (slow, run with -m fuzz or -m '' for all)",
+    "live: live subprocess service tests (run with -m live)",
+    "live_docker: live Docker container tests (requires DECNET_LIVE_DOCKER=1)",
+]
+filterwarnings = [
+    "ignore::pytest.PytestUnhandledThreadExceptionWarning",
+    "ignore::DeprecationWarning",
+]
+
+[tool.coverage.run]
+source = ["decnet"]
+omit = ["*/tests/*", "templates/*"]
+parallel = true
+
+[tool.coverage.report]
+show_missing = true
+skip_covered = false
+# Run with: pytest --cov --cov-report=term-missing
+>>>>>>> testing
 
 [tool.setuptools.packages.find]
 where = ["."]
 include = ["decnet*"]
+
+[tool.bandit]
+exclude_dirs = [
+    "templates/http/decnet_logging.py",
+    "templates/imap/decnet_logging.py",
+    "templates/pop3/decnet_logging.py",
+    "templates/real_ssh/decnet_logging.py",
+    "templates/smtp/decnet_logging.py",
+]