From bb6968c2847e99ba89a7597ff5b8a31fb5dd9434 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ekl=C3=B6f?= <daniel@ekloef.se>
Date: Fri, 26 Dec 2025 17:23:46 +0100
Subject: [PATCH] ci: combine the codespell and mypy stages

They both need python and a venv, so let's combine them, to avoid
having to install the same things twice.
---
 .woodpecker.yaml | 22 ++++------------------
 pyproject.toml   |  2 +-
 2 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/.woodpecker.yaml b/.woodpecker.yaml
index 35d52d67..5b4fa587 100644
--- a/.woodpecker.yaml
+++ b/.woodpecker.yaml
@@ -1,7 +1,7 @@
 # -*- yaml -*-
 
 steps:
-  - name: codespell
+  - name: pychecks
     when:
       - event: [manual, pull_request]
       - event: [push, tag]
@@ -11,26 +11,12 @@ steps:
       - apk add openssl
       - apk add python3
       - apk add py3-pip
-      - python3 -m venv codespell-venv
-      - source codespell-venv/bin/activate
+      - python3 -m venv venv
+      - source venv/bin/activate
       - pip install codespell
-      - codespell
-      - deactivate
-
-  - name: mypy
-    when:
-      - event: [manual, pull_request]
-      - event: [push, tag]
-        branch: [master, releases/*]
-    image: alpine:edge
-    commands:
-      - apk add openssl
-      - apk add python3
-      - apk add py3-pip
-      - python3 -m venv mypy-venv
-      - source mypy-venv/bin/activate
       - pip install mypy
       - pip install ruff
+      - codespell
       - mypy
       - ruff check
       - deactivate
diff --git a/pyproject.toml b/pyproject.toml
index 654e632d..f5fc08a2 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -6,5 +6,5 @@ files = '$MYPY_CONFIG_FILE_DIR/scripts'
 strict = true
 
 [tool.codespell]
-skip = 'pyproject.toml,./subprojects,./pkg,./src,./bld,foot.info,./unicode,.*-venv'
+skip = 'pyproject.toml,./subprojects,./pkg,./src,./bld,foot.info,./unicode,./venv'
 ignore-regex = 'terminfo capability `rin`|\* Simon Ser|\* \[zar\]\(https://codeberg.org/zar\)|iterm theme|iterm.toml|iterm/OneHalfDark.itermcolors'
\ No newline at end of file