From a22bd5de40f5e6e87e98af3fb36671c91fcb76ef Mon Sep 17 00:00:00 2001
From: Bartosz Sokorski <b.sokorski@gmail.com>
Date: Thu, 18 Apr 2024 00:38:27 +0200
Subject: [PATCH] Fix CI and a mypy issue (#9317)

---
 .cirrus.yml                        | 2 +-
 .github/workflows/tests.yaml       | 2 +-
 tests/console/commands/test_add.py | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 8095910b231..a1ada2d62b6 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -60,7 +60,7 @@ tests_task:
     # TODO: caching
     - alias: mypy
       name: "Tests / FreeBSD (Python ${PYTHON_VERSION}) / mypy"
-      skip: "!changesInclude('.cirrus.yml', 'poetry.lock', 'pyproject.toml', 'src/**.py')"
+      skip: "!changesInclude('.cirrus.yml', 'poetry.lock', 'pyproject.toml', 'src/**.py', 'tests/**')"
       mypy_script: poetry run mypy
 
 status_task:
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index 2d277c7bf7a..a4ff36417c2 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -108,7 +108,7 @@ jobs:
     with:
       runner: ${{ matrix.os.image }}
       python-version: ${{ matrix.python-version }}
-      run-mypy: ${{ needs.changes.outputs.src == 'true' }}
+      run-mypy: ${{ needs.changes.outputs.tests == 'true' }}
       run-pytest: ${{ needs.changes.outputs.tests == 'true' }}
       run-pytest-export: ${{ needs.changes.outputs.src == 'true' }}
     secrets: inherit
diff --git a/tests/console/commands/test_add.py b/tests/console/commands/test_add.py
index c0e501af026..da6467d2854 100644
--- a/tests/console/commands/test_add.py
+++ b/tests/console/commands/test_add.py
@@ -81,12 +81,12 @@ def repo_add_default_packages(repo: TestRepository) -> None:
     repo.add_package(redis)
 
     cachy010 = get_package("cachy", "0.1.0")
-    cachy010.extras = {"msgpack": [msgpack_dep]}
+    cachy010.extras = {canonicalize_name("msgpack"): [msgpack_dep]}
     cachy010.add_dependency(msgpack_optional_dep)
     repo.add_package(cachy010)
 
     cachy020 = get_package("cachy", "0.2.0")
-    cachy020.extras = {"msgpack": [get_dependency("msgpack-python")]}
+    cachy020.extras = {canonicalize_name("msgpack"): [get_dependency("msgpack-python")]}
     cachy020.add_dependency(msgpack_dep)
     repo.add_package(cachy020)