From 20fae00bdfcbf6087897814a7e475deac7aaada2 Mon Sep 17 00:00:00 2001 From: Kevin Veen-Birkenbach Date: Thu, 5 Nov 2026 17:07:20 +0000 Subject: [PATCH] refactor(cli): import ImageRef from its module instead of the mirror shim MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit py/unused-import on PR #625 (mirror/model.py:10): the module only re-imported ImageRef from utils.docker.image.discovery. providers.py and the four mirror tests import it from there, as wait/__main__.py already did; no other importer exists. 🎯 Fix: 97 % 💥 Break: 2 % 💸 Cost: – ⏱️ Time: – 🛡️ Security: ~100 % 🏆 Score: 95 🚦 Gate: ✅ 90/5, cost and time <= 100, security 100 % Co-Authored-By: Claude Opus 5.5 --- cli/contributing/mirror/model.py | 10 ---------- cli/contributing/mirror/providers.py | 2 +- .../python/cli/contributing/mirror/test_providers.py | 2 +- .../python/cli/contributing/mirror/test_resolver.py | 2 +- tests/unit/python/cli/contributing/mirror/test_sync.py | 2 +- tests/unit/python/cli/contributing/mirror/test_wait.py | 2 +- 6 files changed, 5 insertions(+), 15 deletions(-) delete mode 100644 cli/contributing/mirror/model.py diff --git a/cli/contributing/mirror/model.py b/cli/contributing/mirror/model.py deleted file mode 100644 index 36342a4672..0000000000 --- a/cli/contributing/mirror/model.py +++ /dev/null @@ -1,10 +0,0 @@ -"""Local name for the image reference the mirror commands pass around. - -No ``__all__``: declaring the re-exported name makes autodoc document the -class here as well as where it is defined, and sphinx then finds two targets -for every ``ImageRef`` annotation. -""" - -from __future__ import annotations - -from utils.docker.image.discovery import ImageRef # noqa: F401 diff --git a/cli/contributing/mirror/providers.py b/cli/contributing/mirror/providers.py index 6e1a4246d0..bf19ea8819 100644 --- a/cli/contributing/mirror/providers.py +++ b/cli/contributing/mirror/providers.py @@ -10,7 +10,7 @@ from utils.docker.registry import manifest_digest if TYPE_CHECKING: import argparse - from .model import ImageRef + from utils.docker.image.discovery import ImageRef class RegistryProvider(ABC): diff --git a/tests/unit/python/cli/contributing/mirror/test_providers.py b/tests/unit/python/cli/contributing/mirror/test_providers.py index 5f2afcd098..2ce6c51657 100644 --- a/tests/unit/python/cli/contributing/mirror/test_providers.py +++ b/tests/unit/python/cli/contributing/mirror/test_providers.py @@ -3,8 +3,8 @@ from __future__ import annotations import unittest from unittest.mock import patch -from cli.contributing.mirror.model import ImageRef from cli.contributing.mirror.providers import GHCRProvider +from utils.docker.image.discovery import ImageRef class TestGHCRProviderImageBase(unittest.TestCase): diff --git a/tests/unit/python/cli/contributing/mirror/test_resolver.py b/tests/unit/python/cli/contributing/mirror/test_resolver.py index 909dc60038..ed929a7c14 100644 --- a/tests/unit/python/cli/contributing/mirror/test_resolver.py +++ b/tests/unit/python/cli/contributing/mirror/test_resolver.py @@ -5,8 +5,8 @@ import unittest from unittest.mock import patch import cli.contributing.mirror.resolver.__main__ as resolver_main -from cli.contributing.mirror.model import ImageRef from utils.cache.yaml import load_yaml_str +from utils.docker.image.discovery import ImageRef from utils.roles.mapping import ROLE_FILE_META_SERVICES diff --git a/tests/unit/python/cli/contributing/mirror/test_sync.py b/tests/unit/python/cli/contributing/mirror/test_sync.py index 5bf496a5d9..f31552de61 100644 --- a/tests/unit/python/cli/contributing/mirror/test_sync.py +++ b/tests/unit/python/cli/contributing/mirror/test_sync.py @@ -5,7 +5,7 @@ import unittest from unittest.mock import patch import cli.contributing.mirror.sync.__main__ as sync_main -from cli.contributing.mirror.model import ImageRef +from utils.docker.image.discovery import ImageRef class TestMirrorSync(unittest.TestCase): diff --git a/tests/unit/python/cli/contributing/mirror/test_wait.py b/tests/unit/python/cli/contributing/mirror/test_wait.py index 6467cfadfb..e287c44221 100644 --- a/tests/unit/python/cli/contributing/mirror/test_wait.py +++ b/tests/unit/python/cli/contributing/mirror/test_wait.py @@ -4,7 +4,7 @@ import unittest from unittest.mock import patch import cli.contributing.mirror.wait.__main__ as wait_main -from cli.contributing.mirror.model import ImageRef +from utils.docker.image.discovery import ImageRef class TestMirrorWait(unittest.TestCase):