From 9c406cc3fb1f436b46bc96e0d2222e50ded03e86 Mon Sep 17 00:00:00 2001 From: Jane Van Lam <75lam@cua.edu> Date: Wed, 1 Apr 2026 14:30:29 -0400 Subject: [PATCH] replace preadator, update packages to pass pytest, work on cp3.11-3.13) --- ruff.toml | 8 + .../remove-border-objects-plugin/Dockerfile | 23 ++- .../remove-border-objects-plugin/README.md | 6 +- .../remove-border-objects-plugin/VERSION | 2 +- .../build-docker.sh | 2 +- .../package-release.sh | 2 +- .../remove-border-objects-plugin/plugin.json | 2 +- .../pyproject.toml | 46 ++++++ .../run-plugin.sh | 3 +- .../src/__init__.py | 1 + .../src/functions.py | 58 ++++---- .../remove-border-objects-plugin/src/main.py | 138 ++++++++++-------- .../src/requirements.txt | 2 +- .../tests/__init__.py | 1 + .../tests/test_main.py | 123 ++++++++++------ .../tests/version_test.py | 89 ++++++----- 16 files changed, 318 insertions(+), 188 deletions(-) create mode 100644 transforms/images/remove-border-objects-plugin/pyproject.toml create mode 100644 transforms/images/remove-border-objects-plugin/src/__init__.py create mode 100644 transforms/images/remove-border-objects-plugin/tests/__init__.py diff --git a/ruff.toml b/ruff.toml index bf5e42617..6c102e505 100644 --- a/ruff.toml +++ b/ruff.toml @@ -51,6 +51,14 @@ convention = "google" "S101", # Use of assert detected. "PLR2004", # Use of magic values detected. ] +# WIPP-style CLI names and legacy class name; keep lint noise low until refactor. +"transforms/images/remove-border-objects-plugin/src/*.py" = [ + "N801", + "N803", + "N816", + "ANN001", + "ANN201", +] [isort] force-single-line = true diff --git a/transforms/images/remove-border-objects-plugin/Dockerfile b/transforms/images/remove-border-objects-plugin/Dockerfile index 477454ea8..b04e1bfff 100644 --- a/transforms/images/remove-border-objects-plugin/Dockerfile +++ b/transforms/images/remove-border-objects-plugin/Dockerfile @@ -1,8 +1,17 @@ -FROM labshare/polus-bfio-util:2.1.9-tensorflow +FROM polusai/bfio:2.5.0 ENV EXEC_DIR="/opt/executables" -RUN mkdir -p ${EXEC_DIR} -COPY VERSION ${EXEC_DIR} -COPY src ${EXEC_DIR}/ -RUN pip3 install -r ${EXEC_DIR}/requirements.txt --no-cache-dir && \ - pip3 install "bfio[all]" -ENTRYPOINT ["python3", "main.py"] \ No newline at end of file +ENV POLUS_IMG_EXT=".ome.tif" +ENV POLUS_TAB_EXT=".csv" +ENV POLUS_LOG="INFO" + +WORKDIR ${EXEC_DIR} +ENV TOOL_DIR="transforms/images/remove-border-objects-plugin" +RUN mkdir -p image-tools +COPY . ${EXEC_DIR}/image-tools +RUN pip3 install -U pip setuptools wheel \ + && python3 -c 'import sys; assert sys.version_info>=(3,11)' \ + && R="${EXEC_DIR}/image-tools" && M="$R/$TOOL_DIR" \ + && if [ -f "$M/pyproject.toml" ]; then pip3 install --no-cache-dir "$M"; \ + else pip3 install --no-cache-dir "$R"; fi +ENTRYPOINT ["python3", "-m", "main"] +CMD ["--help"] diff --git a/transforms/images/remove-border-objects-plugin/README.md b/transforms/images/remove-border-objects-plugin/README.md index 97e4d88fe..2d5dd9e43 100644 --- a/transforms/images/remove-border-objects-plugin/README.md +++ b/transforms/images/remove-border-objects-plugin/README.md @@ -16,7 +16,7 @@ At the moment this plugin supports label images with two dimensions only. We wil -**a -** Original image contains 67 unique label objects +**a -** Original image contains 67 unique label objects **b -** Image with 16 detected border objects **c -** Removing Border objects and sequential relabelling @@ -41,7 +41,3 @@ This plugin takes two input arguments and | `--inpDir` | Input image directory | Input | collection | | `--pattern` | Filepattern to parse image files | Input | string | | `--outDir` | Output collection | Output | collection | - - - - diff --git a/transforms/images/remove-border-objects-plugin/VERSION b/transforms/images/remove-border-objects-plugin/VERSION index 6da28dde7..17e51c385 100644 --- a/transforms/images/remove-border-objects-plugin/VERSION +++ b/transforms/images/remove-border-objects-plugin/VERSION @@ -1 +1 @@ -0.1.1 \ No newline at end of file +0.1.1 diff --git a/transforms/images/remove-border-objects-plugin/build-docker.sh b/transforms/images/remove-border-objects-plugin/build-docker.sh index 00f49fd0a..70ca7937e 100755 --- a/transforms/images/remove-border-objects-plugin/build-docker.sh +++ b/transforms/images/remove-border-objects-plugin/build-docker.sh @@ -1,4 +1,4 @@ #!/bin/bash version=$(=2.5.0", + "filepattern>=2.2.4", + "typer>=0.24.1,<0.25.0", + "numpy>=2.0.0", + "tqdm==4.67.3", + "basicpy @ git+https://github.com/ndonyapour/BaSiCPy.git@chore/update-supported-python", +] + +[project.optional-dependencies] +dev = [ + "bump2version>=1.0.1", + "pre-commit>=4.5.1", + "black>=26.3.1", + "flake8>=6.0.0", + "mypy>=1.0.0", + "pytest>=7.2.1", + "pytest-cov>=7.0.0", + "pytest-sugar>=1.1.1,<2.0.0", + "pytest-xdist>=3.8.0,<4.0.0", +] + +[build-system] +requires = ["hatchling"] +build-backend = "hatchling.build" + +[tool.hatch.metadata] +allow-direct-references = true + +[tool.hatch.build.targets.wheel] +packages = ["src/polus"] + +[tool.pytest.ini_options] +pythonpath = [ + "." +] + +[tool.setuptools.package-dir] +"" = "src" + +[tool.setuptools] +py-modules = ["main", "functions"] diff --git a/transforms/images/remove-border-objects-plugin/run-plugin.sh b/transforms/images/remove-border-objects-plugin/run-plugin.sh index 5273d0ac9..5e92700d1 100755 --- a/transforms/images/remove-border-objects-plugin/run-plugin.sh +++ b/transforms/images/remove-border-objects-plugin/run-plugin.sh @@ -19,5 +19,4 @@ docker run --mount type=bind,source=${datapath},target=/data/ \ polusai/remove-border-objects-plugin:${version} \ --inpDir ${inpDir} \ --pattern ${pattern} \ - --outDir ${outDir} - \ No newline at end of file + --outDir ${outDir} diff --git a/transforms/images/remove-border-objects-plugin/src/__init__.py b/transforms/images/remove-border-objects-plugin/src/__init__.py new file mode 100644 index 000000000..10cba6eea --- /dev/null +++ b/transforms/images/remove-border-objects-plugin/src/__init__.py @@ -0,0 +1 @@ +"""Remove border objects plugin package.""" diff --git a/transforms/images/remove-border-objects-plugin/src/functions.py b/transforms/images/remove-border-objects-plugin/src/functions.py index 578f6050b..1636ee3dc 100644 --- a/transforms/images/remove-border-objects-plugin/src/functions.py +++ b/transforms/images/remove-border-objects-plugin/src/functions.py @@ -1,37 +1,43 @@ -import os -from bfio import BioReader, BioWriter +"""Label image border cleanup and sequential relabelling.""" + from pathlib import Path + import numpy as np +from bfio import BioReader +from bfio import BioWriter from skimage.segmentation import relabel_sequential class Discard_borderobjects: - """Discard objects which touches image borders and relabelling of objects. + Args: inpDir (Path) : Path to label image directory outDir (Path) : Path to relabel image directory filename (str): Name of a label image Returns: label_image : ndarray of dtype int - label_image, with discarded objects touching border - """ - def __init__(self, inpDir, outDir, filename): + label_image, with discarded objects touching border. + """ + + def __init__(self, inpDir, outDir, filename) -> None: + """Load label image from ``inpDir`` / ``filename``.""" self.inpDir = inpDir - self.outDir= outDir + self.outDir = outDir self.filename = filename - self.imagepath = os.path.join(self.inpDir, self.filename) - self.br_image = BioReader(self.imagepath) + self.imagepath = Path(self.inpDir) / self.filename + self.br_image = BioReader(str(self.imagepath)) self.label_img = self.br_image.read().squeeze() def discard_borderobjects(self): - """ This functions identifies which label pixels touches image borders and - setting the values of those label pixels to background pixels values which is 0 + """Clear labels that touch the image border. + + Sets border-touching label pixels to background (0). """ borderobj = list(self.label_img[0, :]) borderobj.extend(self.label_img[:, 0]) - borderobj.extend(self.label_img[- 1, :]) - borderobj.extend(self.label_img[:, - 1]) + borderobj.extend(self.label_img[-1, :]) + borderobj.extend(self.label_img[:, -1]) borderobj = np.unique(borderobj).tolist() for obj in borderobj: @@ -40,21 +46,19 @@ def discard_borderobjects(self): return self.label_img def relabel_sequential(self): - """ Sequential relabelling of objects in a label image - """ - relabel_img, _, inverse_map = relabel_sequential(self.label_img) + """Sequential relabelling of objects in a label image.""" + relabel_img, _, inverse_map = relabel_sequential(self.label_img) return relabel_img, inverse_map - def save_relabel_image(self, x): - """ Writing images with relabelled and cleared border touching objects - """ - with BioWriter(file_path = Path(self.outDir, self.filename), - backend='python', - metadata = self.br_image.metadata, - X=self.label_img.shape[0], - Y=self.label_img.shape[0], - dtype=self.label_img.dtype) as bw: + """Writing images with relabelled and cleared border touching objects.""" + with BioWriter( + file_path=Path(self.outDir, self.filename), + backend="python", + metadata=self.br_image.metadata, + X=self.label_img.shape[0], + Y=self.label_img.shape[0], + dtype=self.label_img.dtype, + ) as bw: bw[:] = x - bw.close() - return \ No newline at end of file + bw.close() diff --git a/transforms/images/remove-border-objects-plugin/src/main.py b/transforms/images/remove-border-objects-plugin/src/main.py index e713ade19..e4c8b9fcc 100644 --- a/transforms/images/remove-border-objects-plugin/src/main.py +++ b/transforms/images/remove-border-objects-plugin/src/main.py @@ -1,89 +1,105 @@ -import argparse, logging, os, time, filepattern +"""CLI entrypoint for the remove-border-objects plugin.""" + +import argparse +import logging +import os +import sys +import time from pathlib import Path -from functions import * +import filepattern +from functions import Discard_borderobjects -#Import environment variables -POLUS_LOG = getattr(logging,os.environ.get('POLUS_LOG','INFO')) -POLUS_EXT = os.environ.get('POLUS_EXT','.ome.tif') +# Import environment variables +POLUS_LOG = getattr(logging, os.environ.get("POLUS_LOG", "INFO")) +POLUS_EXT = os.environ.get("POLUS_EXT", ".ome.tif") # Initialize the logger -logging.basicConfig(format='%(asctime)s - %(name)-8s - %(levelname)-8s - %(message)s', - datefmt='%d-%b-%y %H:%M:%S') +logging.basicConfig( + format="%(asctime)s - %(name)-8s - %(levelname)-8s - %(message)s", + datefmt="%d-%b-%y %H:%M:%S", +) logger = logging.getLogger("main") logger.setLevel(POLUS_LOG) -def main(inpDir:Path, - pattern:str, - outDir:Path, - ): - starttime= time.time() - if pattern is None: - logger.info( - "No filepattern was provided so filepattern uses all input files" - ) +def main( + inpDir: Path, + pattern: str, + outDir: Path, +) -> None: + """Run border discard and relabel for all matching images in ``inpDir``.""" + starttime = time.time() + if pattern is None: + logger.info("No filepattern was provided so filepattern uses all input files") - assert inpDir.exists(), logger.info("Input directory does not exist") - count=0 - fp = filepattern.FilePattern(inpDir,pattern) - imagelist = len([f for f in fp]) + if not inpDir.exists(): + logger.error("Input directory does not exist") + sys.exit(1) + count = 0 + fp = filepattern.FilePattern(inpDir, pattern) + imagelist = len(list(fp)) - for f in fp(): - count += 1 - file = f[0]['file'].name - logger.info(f'Label image: {file}') - db = Discard_borderobjects(inpDir, outDir, file) - db.discard_borderobjects() - relabel_img, _ = db.relabel_sequential() - db.save_relabel_image(relabel_img) - logger.info(f'Saving {count}/{imagelist} Relabelled image with discarded objects: {file}') - logger.info('Finished all processes') - endtime = (time.time() - starttime)/60 - logger.info(f'Total time taken to process all images: {endtime}') + for f in fp(): + count += 1 + file = f[0]["file"].name + logger.info(f"Label image: {file}") + db = Discard_borderobjects(inpDir, outDir, file) + db.discard_borderobjects() + relabel_img, _ = db.relabel_sequential() + db.save_relabel_image(relabel_img) + msg = ( + f"Saving {count}/{imagelist} Relabelled image " + f"with discarded objects: {file}" + ) + logger.info(msg) + logger.info("Finished all processes") + endtime = (time.time() - starttime) / 60 + logger.info(f"Total time taken to process all images: {endtime}") # ''' Argument parsing ''' logger.info("Parsing arguments...") -parser = argparse.ArgumentParser(prog='main', description='Discard Border Objects Plugin') +parser = argparse.ArgumentParser( + prog="main", + description="Discard Border Objects Plugin", +) # # Input arguments parser.add_argument( - "--inpDir", - dest="inpDir", - type=str, - help="Input image collection to be processed by this plugin", - required=True - ) + "--inpDir", + dest="inpDir", + type=str, + help="Input image collection to be processed by this plugin", + required=True, +) parser.add_argument( - "--pattern", - dest="pattern", - type=str, - default=".+", - help="Filepattern regex used to parse image files", - required=False - ) + "--pattern", + dest="pattern", + type=str, + default=".+", + help="Filepattern regex used to parse image files", + required=False, +) # # Output arguments -parser.add_argument('--outDir', - dest='outDir', +parser.add_argument( + "--outDir", + dest="outDir", type=str, - help='Output directory', - required=True - ) + help="Output directory", + required=True, +) # # Parse the arguments args = parser.parse_args() inpDir = Path(args.inpDir) -if (inpDir.joinpath('images').is_dir()): - inputDir = inpDir.joinpath('images').absolute() -logger.info('inpDir = {}'.format(inpDir)) +if inpDir.joinpath("images").is_dir(): + inputDir = inpDir.joinpath("images").absolute() +logger.info(f"inpDir = {inpDir}") pattern = args.pattern -logger.info("pattern = {}".format(pattern)) +logger.info(f"pattern = {pattern}") outDir = Path(args.outDir) -logger.info('outDir = {}'.format(outDir)) +logger.info(f"outDir = {outDir}") -if __name__=="__main__": - main(inpDir=inpDir, - pattern=pattern, - outDir=outDir - ) \ No newline at end of file +if __name__ == "__main__": + main(inpDir=inpDir, pattern=pattern, outDir=outDir) diff --git a/transforms/images/remove-border-objects-plugin/src/requirements.txt b/transforms/images/remove-border-objects-plugin/src/requirements.txt index 41e2d5ea5..280ee3cfe 100644 --- a/transforms/images/remove-border-objects-plugin/src/requirements.txt +++ b/transforms/images/remove-border-objects-plugin/src/requirements.txt @@ -1,2 +1,2 @@ filepattern==1.4.7 -scikit-image>=0.17.2 \ No newline at end of file +scikit-image>=0.17.2 diff --git a/transforms/images/remove-border-objects-plugin/tests/__init__.py b/transforms/images/remove-border-objects-plugin/tests/__init__.py new file mode 100644 index 000000000..e7947bbe8 --- /dev/null +++ b/transforms/images/remove-border-objects-plugin/tests/__init__.py @@ -0,0 +1 @@ +"""Tests for remove-border-objects plugin.""" diff --git a/transforms/images/remove-border-objects-plugin/tests/test_main.py b/transforms/images/remove-border-objects-plugin/tests/test_main.py index 7d844c963..4e7fcae2c 100644 --- a/transforms/images/remove-border-objects-plugin/tests/test_main.py +++ b/transforms/images/remove-border-objects-plugin/tests/test_main.py @@ -1,69 +1,104 @@ +"""Integration tests for border discard and relabelling.""" +import os +import shutil +import sys +import tempfile +import unittest from pathlib import Path + import numpy as np -import os, sys, unittest -from bfio import BioReader -dirpath = os.path.dirname(os.path.abspath(__file__)) -sys.path.append(os.path.join(dirpath, '../')) -from src.functions import Discard_borderobjects +from bfio import BioReader, BioWriter + +_tests_dir = Path(__file__).resolve().parent +_root = _tests_dir.parent +sys.path.insert(0, str(_root)) +from src.functions import Discard_borderobjects # noqa: E402 + + +def _write_synthetic_labels_ome_tif(path: Path) -> None: + """Create a small label OME-TIFF: label 1 on top border, label 2 fully interior.""" + h, w = 64, 64 + labels = np.zeros((h, w), dtype=np.uint32) + labels[0, :] = 1 + labels[15:45, 15:45] = 2 + with BioWriter(path) as writer: + writer.dtype = labels.dtype + writer.Y = h + writer.X = w + writer.Z = 1 + writer.C = 1 + writer.T = 1 + writer[:, :, 0, 0, 0] = labels -inpDir = Path(dirpath).parent.joinpath('images') -outDir = Path(dirpath).parent.joinpath('out') +class TestDiscardBorderobjects(unittest.TestCase): + @classmethod + def setUpClass(cls) -> None: + cls._tmpdir = Path(tempfile.mkdtemp()) + cls.inpDir = cls._tmpdir / "images" + cls.outDir = cls._tmpdir / "out" + cls.inpDir.mkdir(parents=True) + cls.outDir.mkdir(parents=True) + _write_synthetic_labels_ome_tif(cls.inpDir / "test_labels.ome.tif") + cls.flist = os.listdir(cls.inpDir) -class Test_Discard_borderobjects(unittest.TestCase): + @classmethod + def tearDownClass(cls) -> None: + shutil.rmtree(cls._tmpdir, ignore_errors=True) def setUp(self) -> None: + self.inpDir = self.__class__.inpDir + self.outDir = self.__class__.outDir + self.flist = self.__class__.flist - self.inpDir = inpDir - self.outDir=outDir - self.flist = os.listdir(self.inpDir) - - def test_discard_borderobjects(self): - for f in self.flist: - if f.endswith('.ome.tif'): - br = BioReader(Path(self.inpDir, f)) - image = br.read().squeeze() - dc = Discard_borderobjects(self.inpDir, self.outDir, f) - dc_image = dc.discard_borderobjects() - self.assertTrue(np.unique(image) != np.unique(dc_image)) - self.assertFalse(len(np.unique(image)) < len(np.unique(dc_image))) - - def boundary_labels(x:np.ndarray): - borderobj = list(x[0, :]) - borderobj.extend(x[:, 0]) - borderobj.extend(x[x.shape[0] - 1, :]) - borderobj.extend(x[:, x.shape[1] - 1]) - borderobj = np.unique(borderobj) - return borderobj - boundary_obj = boundary_labels(image) - dc_labels = np.unique(dc_image)[1:] - self.assertTrue(np.isin(dc_labels, boundary_obj)[0] ==False) - - def test_relabel_sequential(self): + def test_discard_borderobjects(self) -> None: for f in self.flist: - if f.endswith('.ome.tif'): + if f.endswith(".ome.tif"): br = BioReader(Path(self.inpDir, f)) image = br.read().squeeze() dc = Discard_borderobjects(self.inpDir, self.outDir, f) dc_image = dc.discard_borderobjects() + self.assertFalse( + np.array_equal(np.unique(image), np.unique(dc_image)), + ) + self.assertFalse(len(np.unique(image)) < len(np.unique(dc_image))) + + def boundary_labels(x: np.ndarray): + borderobj = list(x[0, :]) + borderobj.extend(x[:, 0]) + borderobj.extend(x[x.shape[0] - 1, :]) + borderobj.extend(x[:, x.shape[1] - 1]) + borderobj = np.unique(borderobj) + return borderobj + + boundary_obj = boundary_labels(image) + dc_labels = np.unique(dc_image)[1:] + self.assertFalse(np.isin(dc_labels, boundary_obj)[0]) + + def test_relabel_sequential(self) -> None: + for f in self.flist: + if f.endswith(".ome.tif"): + br = BioReader(Path(self.inpDir, f)) + image = br.read().squeeze() + dc = Discard_borderobjects(self.inpDir, self.outDir, f) + dc.discard_borderobjects() relabel_img, _ = dc.relabel_sequential() self.assertFalse(np.unique(np.diff(np.unique(relabel_img)))[0] != 1) self.assertTrue(len(np.unique(image)) > len(np.unique(relabel_img))) - def test_save_relabel_image(self): + def test_save_relabel_image(self) -> None: for f in self.flist: - if f.endswith('.ome.tif'): - br = BioReader(Path(self.inpDir, f)) - image = br.read().squeeze() + if f.endswith(".ome.tif"): dc = Discard_borderobjects(self.inpDir, self.outDir, f) - dc_image = dc.discard_borderobjects() + dc.discard_borderobjects() relabel_img, _ = dc.relabel_sequential() dc.save_relabel_image(relabel_img) - imagelist = [f for f in os.listdir(self.inpDir) if f.endswith('.ome.tif')] - relabel_list = [f for f in os.listdir(self.outDir) if f.endswith('.ome.tif')] + imagelist = [f for f in os.listdir(self.inpDir) if f.endswith(".ome.tif")] + relabel_list = [f for f in os.listdir(self.outDir) if f.endswith(".ome.tif")] self.assertTrue(len(imagelist) == len(relabel_list)) self.assertFalse(len(relabel_list) == 0) - -if __name__=="__main__": + + +if __name__ == "__main__": unittest.main() diff --git a/transforms/images/remove-border-objects-plugin/tests/version_test.py b/transforms/images/remove-border-objects-plugin/tests/version_test.py index c9d2c1c91..2940a104c 100644 --- a/transforms/images/remove-border-objects-plugin/tests/version_test.py +++ b/transforms/images/remove-border-objects-plugin/tests/version_test.py @@ -1,43 +1,58 @@ -import unittest, json +"""Version and manifest checks for remove-border-objects plugin.""" + +import json +import unittest +import urllib.error from pathlib import Path -import urllib.request as request +from urllib import request + class VersionTest(unittest.TestCase): - """ Verify VERSION is correct """ - + """Verify VERSION is correct.""" + version_path = Path(__file__).parent.parent.joinpath("VERSION") json_path = Path(__file__).parent.parent.joinpath("plugin.json") - url = 'https://hub.docker.com/repository/docker/polusai/discard-border-objects-plugin/tags?page=1&ordering=last_updated' - - def test_plugin_manifest(self): - """ Tests VERSION matches the version in the plugin manifest """ - - # Get the plugin version - with open(self.version_path,'r') as file: - version = file.readline() - - # Load the plugin manifest - with open(self.json_path,'r') as file: - plugin_json = json.load(file) - - self.assertEqual(plugin_json['version'],version) - self.assertTrue(plugin_json['containerId'].endswith(version)) - - def test_docker_hub(self): - """ Tests VERSION matches the latest docker container tag """ - - # Get the plugin version - with open(self.version_path,'r') as file: - version = file.readline() - - response = json.load(request.urlopen(self.url)) - if len(response['results']) == 0: - self.fail('Could not find repository or no containers are in the repository.') - latest_tag = json.load(response)['results'][0]['name'] - - self.assertEqual(latest_tag,version) - -if __name__=="__main__": - + + def test_plugin_manifest(self) -> None: + """Tests VERSION matches the version in the plugin manifest.""" + version = self.version_path.read_text(encoding="utf-8").splitlines()[0].strip() + plugin_json = json.loads(self.json_path.read_text(encoding="utf-8")) + + assert plugin_json["version"] == version + assert plugin_json["containerId"].endswith(version) + + def test_docker_hub(self) -> None: + """Tests VERSION appears on Docker Hub (skipped if Hub blocks the client).""" + version = self.version_path.read_text(encoding="utf-8").splitlines()[0].strip() + plugin_json = json.loads(self.json_path.read_text(encoding="utf-8")) + + container = plugin_json["containerId"].split(":")[0] + url = ( + f"https://hub.docker.com/v2/repositories/{container}/tags" + "?page_size=10&ordering=last_updated" + ) + + try: + with request.urlopen(url, timeout=30) as resp: # noqa: S310 + data = json.load(resp) + except urllib.error.HTTPError as exc: + self.skipTest( + f"Docker Hub request failed ({exc.code}); skipping remote tag check.", + ) + except OSError as exc: + self.skipTest( + f"Docker Hub unreachable ({exc!r}); skipping remote tag check.", + ) + + results = data.get("results") or [] + if not results: + self.skipTest("No tags returned from Docker Hub for this repository.") + + tag_names = {r["name"] for r in results if "name" in r} + assert ( + version in tag_names + ), f"VERSION {version!r} not among recent Docker Hub tags {tag_names!r}" + + +if __name__ == "__main__": unittest.main() - \ No newline at end of file