From 56b64d929df8524574c79f3cf2dc446e874cc098 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Fri, 28 Feb 2025 04:49:43 +0000 Subject: [PATCH] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- repo2docker/app.py | 3 +-- repo2docker/utils.py | 4 ++-- tests/registry/test_registry.py | 22 ++++++++++------------ 3 files changed, 13 insertions(+), 16 deletions(-) diff --git a/repo2docker/app.py b/repo2docker/app.py index 418ef12d..d70ec761 100755 --- a/repo2docker/app.py +++ b/repo2docker/app.py @@ -37,7 +37,7 @@ RBuildPack, ) from .engine import BuildError, ContainerEngineException, ImageLoadError -from .utils import ByteSpecification, R2dState, chdir, get_platform, get_free_port +from .utils import ByteSpecification, R2dState, chdir, get_free_port, get_platform class Repo2Docker(Application): @@ -744,7 +744,6 @@ def wait_for_container(self, container): if exit_code: sys.exit(exit_code) - def find_image(self): # if this is a dry run it is Ok for dockerd to be unreachable so we # always return False for dry runs. diff --git a/repo2docker/utils.py b/repo2docker/utils.py index ebae3da9..e71dcf94 100644 --- a/repo2docker/utils.py +++ b/repo2docker/utils.py @@ -1,7 +1,7 @@ import os -import socket import platform import re +import socket import subprocess import warnings from contextlib import contextmanager @@ -556,4 +556,4 @@ def get_free_port(): s.bind(("", 0)) port = s.getsockname()[1] s.close() - return port \ No newline at end of file + return port diff --git a/tests/registry/test_registry.py b/tests/registry/test_registry.py index 03b00566..a7bc76b7 100644 --- a/tests/registry/test_registry.py +++ b/tests/registry/test_registry.py @@ -1,22 +1,23 @@ -from pathlib import Path +import secrets import subprocess +import time +from pathlib import Path + import pytest +import requests + from repo2docker.__main__ import make_r2d from repo2docker.utils import get_free_port -import time -import requests -import secrets HERE = Path(__file__).parent + @pytest.fixture def registry(): port = get_free_port() - cmd = [ - "docker", "run", "-it", "-p", f"{port}:5000", "registry:3.0.0-rc.3" - ] + cmd = ["docker", "run", "-it", "-p", f"{port}:5000", "registry:3.0.0-rc.3"] proc = subprocess.Popen(cmd) - health_url = f'http://localhost:{port}/v2' + health_url = f"http://localhost:{port}/v2" # Wait for the registry to actually come up for i in range(10): try: @@ -39,10 +40,7 @@ def registry(): def test_registry(registry): image_name = f"{registry}/{secrets.token_hex(8)}:latest" - r2d = make_r2d([ - "--image", image_name, - "--push", "--no-run", str(HERE) - ]) + r2d = make_r2d(["--image", image_name, "--push", "--no-run", str(HERE)]) r2d.start()