Update lint, security/type checks to use docker

.github/workflows/ci.yml

@@ -1,38 +1,39 @@
 name: CI
+
 on:
-  - push
-  - pull_request
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - main
+
 jobs:
   test:
     runs-on: ubuntu-latest
-
     strategy:
       matrix:
         python-version: [3.11]
+        include:
+          - name: Lint
+            command: make lint
+          - name: Reformat
+            command: make reformat
+          - name: Type-Check
+            command: make type-check
+          - name: Security-Check
+            command: make security-check
 
     steps:
-      - name: Check out repository
-        uses: actions/checkout@v3
-
+      - uses: actions/checkout@v3
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
-
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
           pip install tox tox-ignore-env-name-mismatch
-          pip install -r requirements.txt
-
-      - name: Run lint
-        run: tox -e lint
-
-      - name: Run reformat
-        run: tox -e reformat
-
-      - name: Run type-check
-        run: tox -e type-check
-
-      - name: Run security-check
-        run: tox -e security-check
+          pip install -r requirements/dev.txt
+      - name: Run ${{ matrix.name }}
+        run: ${{ matrix.command }}

Makefile

@@ -2,7 +2,7 @@
 	lint reformat type-check security-check \
 	start stop rebuild destroy \
 	migrate create-admin \
-	routes install-deps install-tox
+	routes
 
 default:
 	@echo "Call a specific subcommand:"
@@ -14,24 +14,6 @@ default:
 	@echo
 	@exit 1
 
-install-deps:
-	pip install -r requirements.txt
-
-install-tox:
-	pip install tox
-
-lint: install-tox
-	tox -e lint
-
-reformat: install-tox
-	tox -e reformat
-
-type-check: install-tox
-	tox -e type-check
-
-security-check: install-tox
-	tox -e security-check
-
 start:
 	docker-compose up --build --detach
 
@@ -60,3 +42,9 @@ reformat:
 
 lint:
 	docker compose run --build --rm base bin/lint
+
+security-check:
+	docker compose run --build --rm base bandit -c pyproject.toml -r .
+
+type-check:
+	docker compose run --build --rm base mypy --config-file pyproject.toml .

cabotage/server/models/projects.py

@@ -499,8 +499,7 @@ def deposed_reason(self):
             ).first()
             if configuration_object is None:
                 reasons.append(
-                    f"<code>Configuration for {
-                        configuration} no longer exists!</code>"
+                    f"<code>Configuration for {configuration} no longer exists!</code>"
                 )
         return reasons
 
@@ -542,11 +541,7 @@ def envconsul_configurations(self):
         configurations["shell"] = "\n".join([exec_statement, environment_statements])
         for proc_name, proc in self.image_object.processes.items():
             custom_env = json.dumps([f"{key}={value}" for key, value in proc["env"]])
-            exec_statement = (
-                "exec {\n"
-                f'  command = {
-                json.dumps(proc["cmd"])}\n'
-            )
+            exec_statement = "exec {\n" f'  command = {json.dumps(proc["cmd"])}\n'
             if not self.application.privileged:
                 exec_statement += (
                     "  env = {\n"

pyproject.toml

@@ -0,0 +1,5 @@
+[tool.bandit]
+exclude_dirs = ["bin", "lib"]
+
+[tool.mypy]
+ignore_missing_imports = true