add type hinting and integrate with pytest

devenv.nix

@@ -4,6 +4,7 @@
   env.PYTHONUNBUFFERED = "true";
   env.ALEMBIC_CONFIG = "development.ini";
   env.PGDATABASE = "aramaki";
+  env.MYPYPATH="stubs";
 
   packages = [
     pkgs.git

pyproject.toml

@@ -47,6 +47,7 @@ pytest = ">=7.4"
 pytest-cov = ">=4.1"
 pytest-cache = ">=1.0"
 pytest-timeout = ">=2.2"
+pytest-mypy = ">=0.10"
 
 [tool.poetry.plugins."paste.app_factory"]
 main = "aramaki.server.web.main:main"
@@ -62,3 +63,20 @@ Issues = "https://github.com/flyingcircusio/aramaki/issues"
 
 [tool.black]
 line-length = 79
+
+
+[[tool.mypy.overrides]]
+module = "webob.*"
+ignore_errors = true
+
+[[tool.mypy.overrides]]
+module = "zope.*"
+ignore_errors = true
+
+[[tool.mypy.overrides]]
+module = "pkg_resources.*"
+ignore_errors = true
+
+[[tool.mypy.overrides]]
+module = "pyramid.*"
+ignore_errors = true

pytest.ini

@@ -1,3 +1,3 @@
 [pytest]
-addopts = --timeout=30 --cov=src --cov-report=html --ignore lib --ignore lib64 --strict-markers
+addopts = --timeout=30 --mypy --cov=src --cov-report=html --ignore lib --ignore lib64 --strict-markers
 testpaths = src/aramaki

src/aramaki/server/main.py

@@ -4,15 +4,16 @@
 def main():
     parser = argparse.ArgumentParser(
         prog="aramaki-server",
-        description="Server implementation of Aramaki, the federated DevOps control plane.",
+        description="Server implementation of Aramaki, the federated DevOps "
+        "control plane.",
         epilog="Text at the bottom of help",
     )
 
     parser.add_argument("subsystem")
 
     args = parser.parse_args()
     if args.subsystem == "ui":
-        from .ui.main import main as real_main
+        from .web.main import main as real_main
     elif args.subsystem == "processing":
         from .processing.main import main as real_main
     elif args.subsystem == "federation":

src/aramaki/server/models/meta.py

@@ -1,4 +1,4 @@
-from sqlalchemy.orm import declarative_base
+from sqlalchemy.orm import DeclarativeBase
 from sqlalchemy.schema import MetaData
 
 # Recommended naming convention used by Alembic, as various different database
@@ -13,4 +13,7 @@
 }
 
 metadata = MetaData(naming_convention=NAMING_CONVENTION)
-Base = declarative_base(metadata=metadata)
+
+
+class Base(DeclarativeBase):
+    metadata = metadata

src/aramaki/server/models/system.py

@@ -1,25 +1,24 @@
 import uuid
 
-from sqlalchemy import Column, String, func
-from sqlalchemy.dialects.postgresql import UUID
+from sqlalchemy import func
+from sqlalchemy.orm import Mapped, mapped_column
 
-from .meta import Base
+from . import meta
 
 
-class System(Base):
+class System(meta.Base):
     __tablename__ = "system"
 
-    id = Column(
-        UUID(as_uuid=True),
+    id: Mapped[uuid.UUID] = mapped_column(
         primary_key=True,
         default=uuid.uuid4,
         server_default=func.gen_random_uuid(),
     )
 
-    title = Column(String, nullable=False)
+    title: Mapped[str]
 
-    # Make this a dictionary.
-    type_ = Column(String, nullable=False)
+    # Make this a dictionary, use references
+    type_: Mapped[str]
 
     # XXX Turn into relationship
-    primary_instance = Column(UUID(as_uuid=True))
+    primary_instance: Mapped[uuid.UUID]