remote-docker-cli 0.3.0__tar.gz → 0.3.1__tar.gz

{remote_docker_cli-0.3.0 → remote_docker_cli-0.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: remote-docker-cli
-Version: 0.3.0
+Version: 0.3.1
 Summary: A CLI tool for managing remote Docker hosts
 Project-URL: Homepage, https://gitee.com/kzhuo/remote-docker
 Project-URL: Issues, https://gitee.com/kzhuo/remote-docker/issues
@@ -96,16 +96,16 @@ Description-Content-Type: text/markdown
 ### 使用 pip
 
 ```bash
-pip install remote-docker
+pip install remote-docker-cli
 
 # 可选：启用 paramiko 后端（当前版本使用系统 ssh，可不装）
-pip install "remote-docker[ssh]"
+pip install "remote-docker-cli[ssh]"
 ```
 
 ### 从源码安装（推荐使用 uv）
 
 ```bash
-git clone https://github.com/kzhuo/remote-docker.git
+git clone https://gitee.com/kzhuo/remote-docker.git
 cd remote-docker
 uv sync
 uv pip install -e .
@@ -115,6 +115,7 @@ uv pip install -e .
 
 ```bash
 rdocker --help
+rdocker version          # 查看版本
 ```
 
 ### 远端机器前置条件
@@ -234,7 +235,20 @@ $ rdocker_HOST=override.host rdocker config show
 
 所有动作命令均支持 `--try` 干跑：仅打印将要执行的 ssh / scp / skopeo 命令，不实际执行。
 
-`--name` 缺省规则：
+### `rdocker version`
+
+打印当前安装的 rdocker 版本：
+
+```bash
+$ rdocker version
+rdocker 0.3.1
+```
+
+### 通用选项
+
+- `--host / --user / --port / --key` — 可在任意子命令上直接覆盖 SSH 连接参数（默认从配置文件/环境变量读取），优先级与配置一致。
+
+### `--name` 缺省规则：
 - **compose 模式**（`pull` / `all` / `save` / `fetch` / `cleanup`） → 当前目录最后一级目录名
 - **image 模式**（`spull`） → 镜像去除 tag 后的最后一段（如 `nginx:1.25-alpine` → `nginx`，`registry:5000/myapp:v1` → `myapp`）
 
@@ -372,12 +386,14 @@ rdocker load ./myapp.tar.gz
 ```bash
 rdocker kaggle upload docker-compose.yml                       # --name 缺省 = cwd 短名
 rdocker kaggle upload docker-compose.yml --name prod --registry-auth admin:pass
+rdocker kaggle upload docker-compose.yml --arch arm64          # 覆盖镜像架构
 rdocker kaggle upload docker-compose.yml --try                 # 只打印不推送
 ```
 
 选项：
 - `--name, -n` — Bundle 名称（缺省 = cwd 短名）
 - `--registry-auth, -a` — 镜像仓库认证 `user:pass`
+- `--arch` — 覆盖镜像架构（如 `amd64`、`arm64`、`ppc64le`、`s390x`、`386`、`arm`；缺省 = 本地自动探测）
 - `--try` — 干跑：只打印 notebook 内容
 
 ### `rdocker kaggle fetch [--name <bundle>] [--output-dir <dir>] [--try]`
@@ -406,7 +422,7 @@ rdocker kaggle fetch --name myapp --try                        # 只打印命令
 
 - **kaggle CLI 缺失 / 未配置** → `pip install kaggle` 后 `kaggle config view` 验证。`rdocker` 会把错误指向这两步。
 - **kernel 跑失败** → 在 https://www.kaggle.com/<username>/rdocker-<bundle> 看 stderr；常因镜像仓库私有需 `--registry-auth`，或 compose 中含 Kaggle 网络策略拉不到的镜像。
-- **arch 不匹配** → `rdocker` 默认按本地 `platform.machine()` 注入 `--override-arch`；如需覆盖，临时改 `KAGGLE_NOTEBOOK_TEMPLATE` 中的 `ARCH` 注入值（进阶用法）。
+- **arch 不匹配** → `rdocker` 默认按本地 `platform.machine()` 注入 `--override-arch`；如需拉取其他架构的镜像，使用 `rdocker kaggle upload --arch <arch>` 覆盖（如 `amd64`、`arm64`）。
 - **output 还没生成** → `kaggle kernels output` 报错时直接看返回的 stderr；常见原因是 kernel 仍在排队（免费版 CPU 偶尔排队几分钟）或已失败。
 - **`.kaggle/` 目录膨胀** → 该目录在 CWD 下，是 `kaggle kernels push` 的暂存区，可随时 `rm -rf .kaggle`。
 
@@ -460,7 +476,9 @@ remote-docker/
 │   └── remote_docker/
 │       ├── __init__.py        # 包元信息 (__version__)
 │       ├── __main__.py        # python -m remote_docker 入口
-│       └── cli.py             # Click CLI 主体
+│       ├── cli.py             # Click CLI 主体
+│       └── tests/             # pytest 测试
+├── openspec/                  # OpenSpec 变更规格（如 add-kaggle-support）
 ├── pyproject.toml             # 项目与依赖配置（hatchling 构建）
 ├── uv.lock                    # uv 锁定文件
 └── README.md

{remote_docker_cli-0.3.0 → remote_docker_cli-0.3.1}/README.md

@@ -64,16 +64,16 @@
 ### 使用 pip
 
 ```bash
-pip install remote-docker
+pip install remote-docker-cli
 
 # 可选：启用 paramiko 后端（当前版本使用系统 ssh，可不装）
-pip install "remote-docker[ssh]"
+pip install "remote-docker-cli[ssh]"
 ```
 
 ### 从源码安装（推荐使用 uv）
 
 ```bash
-git clone https://github.com/kzhuo/remote-docker.git
+git clone https://gitee.com/kzhuo/remote-docker.git
 cd remote-docker
 uv sync
 uv pip install -e .
@@ -83,6 +83,7 @@ uv pip install -e .
 
 ```bash
 rdocker --help
+rdocker version          # 查看版本
 ```
 
 ### 远端机器前置条件
@@ -202,7 +203,20 @@ $ rdocker_HOST=override.host rdocker config show
 
 所有动作命令均支持 `--try` 干跑：仅打印将要执行的 ssh / scp / skopeo 命令，不实际执行。
 
-`--name` 缺省规则：
+### `rdocker version`
+
+打印当前安装的 rdocker 版本：
+
+```bash
+$ rdocker version
+rdocker 0.3.1
+```
+
+### 通用选项
+
+- `--host / --user / --port / --key` — 可在任意子命令上直接覆盖 SSH 连接参数（默认从配置文件/环境变量读取），优先级与配置一致。
+
+### `--name` 缺省规则：
 - **compose 模式**（`pull` / `all` / `save` / `fetch` / `cleanup`） → 当前目录最后一级目录名
 - **image 模式**（`spull`） → 镜像去除 tag 后的最后一段（如 `nginx:1.25-alpine` → `nginx`，`registry:5000/myapp:v1` → `myapp`）
 
@@ -340,12 +354,14 @@ rdocker load ./myapp.tar.gz
 ```bash
 rdocker kaggle upload docker-compose.yml                       # --name 缺省 = cwd 短名
 rdocker kaggle upload docker-compose.yml --name prod --registry-auth admin:pass
+rdocker kaggle upload docker-compose.yml --arch arm64          # 覆盖镜像架构
 rdocker kaggle upload docker-compose.yml --try                 # 只打印不推送
 ```
 
 选项：
 - `--name, -n` — Bundle 名称（缺省 = cwd 短名）
 - `--registry-auth, -a` — 镜像仓库认证 `user:pass`
+- `--arch` — 覆盖镜像架构（如 `amd64`、`arm64`、`ppc64le`、`s390x`、`386`、`arm`；缺省 = 本地自动探测）
 - `--try` — 干跑：只打印 notebook 内容
 
 ### `rdocker kaggle fetch [--name <bundle>] [--output-dir <dir>] [--try]`
@@ -374,7 +390,7 @@ rdocker kaggle fetch --name myapp --try                        # 只打印命令
 
 - **kaggle CLI 缺失 / 未配置** → `pip install kaggle` 后 `kaggle config view` 验证。`rdocker` 会把错误指向这两步。
 - **kernel 跑失败** → 在 https://www.kaggle.com/<username>/rdocker-<bundle> 看 stderr；常因镜像仓库私有需 `--registry-auth`，或 compose 中含 Kaggle 网络策略拉不到的镜像。
-- **arch 不匹配** → `rdocker` 默认按本地 `platform.machine()` 注入 `--override-arch`；如需覆盖，临时改 `KAGGLE_NOTEBOOK_TEMPLATE` 中的 `ARCH` 注入值（进阶用法）。
+- **arch 不匹配** → `rdocker` 默认按本地 `platform.machine()` 注入 `--override-arch`；如需拉取其他架构的镜像，使用 `rdocker kaggle upload --arch <arch>` 覆盖（如 `amd64`、`arm64`）。
 - **output 还没生成** → `kaggle kernels output` 报错时直接看返回的 stderr；常见原因是 kernel 仍在排队（免费版 CPU 偶尔排队几分钟）或已失败。
 - **`.kaggle/` 目录膨胀** → 该目录在 CWD 下，是 `kaggle kernels push` 的暂存区，可随时 `rm -rf .kaggle`。
 
@@ -428,7 +444,9 @@ remote-docker/
 │   └── remote_docker/
 │       ├── __init__.py        # 包元信息 (__version__)
 │       ├── __main__.py        # python -m remote_docker 入口
-│       └── cli.py             # Click CLI 主体
+│       ├── cli.py             # Click CLI 主体
+│       └── tests/             # pytest 测试
+├── openspec/                  # OpenSpec 变更规格（如 add-kaggle-support）
 ├── pyproject.toml             # 项目与依赖配置（hatchling 构建）
 ├── uv.lock                    # uv 锁定文件
 └── README.md

{remote_docker_cli-0.3.0 → remote_docker_cli-0.3.1}/src/remote_docker/__init__.py

@@ -1,3 +1,3 @@
 """remote-docker: A CLI tool for managing remote Docker hosts."""
 
-__version__ = "0.3.0"
+__version__ = "0.3.1"

{remote_docker_cli-0.3.0 → remote_docker_cli-0.3.1}/src/remote_docker/cli.py

@@ -445,6 +445,12 @@ def _require_host(ctx: click.Context) -> str:
     return host
 
 
+@cli.command("version", help="Print rdocker version and exit")
+def version_cmd():
+    """Print the installed rdocker version."""
+    click.echo(f"rdocker {__version__}")
+
+
 # ── config 命令组 ────────────────────────────
 
 @cli.group(help="Manage rdocker configuration (~/.config/rdocker/config.yml)")
@@ -817,7 +823,7 @@ def cleanup(ctx: click.Context, name: str, dry_run: bool):
 
 # ── all ───────────────────────────────────────
 
-@cli.command(name="all")
+@cli.command()
 @click.argument("compose_file", type=click.Path(exists=True, dir_okay=False))
 @click.option("--name", "-n", default="", help="Bundle name (default: current directory short name)")
 @click.option("--registry-auth", "-a", default=lambda: get_config_value("registry_auth", ""), help="Registry credentials (user:pass)")
@@ -1011,7 +1017,7 @@ for img in IMAGES:
         "docker://" + img,
         "docker-archive:" + tar_path + ":" + img,
     ])
-    print("[rdocker] skopeo copy " + img + " -> " + tar_path, flush=True)
+    print("[rdocker] skopeo copy " + img + " {arch}-> " + tar_path, flush=True)
     subprocess.run(cmd, check=True)
 
 # --- Step 3: pack as tar.gz with . as root (compatible with rdocker load) ---
@@ -1136,7 +1142,7 @@ def build_kaggle_notebook_dir(name, images, arch, registry_auth, username):
     return notebook_dir
 
 
-def do_kaggle_upload(name, compose_file, registry_auth):
+def do_kaggle_upload(name, compose_file, registry_auth, arch=None):
     """Build the Kaggle kernel from a compose file and push it via the kaggle CLI."""
     compose_path = Path(compose_file)
     click.echo(f"📦 Bundle name: {name}")
@@ -1151,8 +1157,11 @@ def do_kaggle_upload(name, compose_file, registry_auth):
     click.echo("")
 
     username = get_kaggle_username()
-    arch = local_arch()
-    click.echo(f"🐳 Arch (from local): {arch}")
+    if arch is None:
+        arch = local_arch()
+        click.echo(f"🐳 Arch (from local): {arch}")
+    else:
+        click.echo(f"🐳 Arch (override): {arch}")
     click.echo(f"👤 Kaggle username: {username}")
 
     notebook_dir = build_kaggle_notebook_dir(
@@ -1176,7 +1185,7 @@ def do_kaggle_upload(name, compose_file, registry_auth):
     click.echo(f"   View at: https://www.kaggle.com/{slug}")
 
 
-def print_kaggle_upload_plan(name, compose_file, registry_auth):
+def print_kaggle_upload_plan(name, compose_file, registry_auth, arch=None):
     """Dry-run: resolve the real username, then print the notebook content (no writes, no push)."""
     compose_path = Path(compose_file)
     images = parse_compose_images(compose_path)
@@ -1192,9 +1201,12 @@ def print_kaggle_upload_plan(name, compose_file, registry_auth):
     click.echo("")
 
     username = get_kaggle_username()
-    arch = local_arch()
+    if arch is None:
+        arch = local_arch()
+        click.echo(f"🐳 Arch (from local): {arch}")
+    else:
+        click.echo(f"🐳 Arch (override): {arch}")
     auth_display = registry_auth if registry_auth else "(none)"
-    click.echo(f"🐳 Arch: {arch}")
     click.echo(f"👤 Kaggle username: {username}")
     click.echo(f"🔐 Registry auth: {auth_display}")
     click.echo("")
@@ -1268,17 +1280,18 @@ def kaggle():
 @click.argument("compose_file", type=click.Path(exists=True, dir_okay=False))
 @click.option("--name", "-n", default="", help="Bundle name (default: current directory short name)")
 @click.option("--registry-auth", "-a", default=lambda: get_config_value("registry_auth", ""), help="Registry credentials (user:pass)")
+@click.option("--arch", default=None, help="Override image architecture (e.g. amd64, arm64, ppc64le, s390x, 386, arm). Default: auto-detected from local machine.")
 @click.option("--try", "dry_run", is_flag=True, help="Dry-run: print notebook content without pushing")
 @click.pass_context
-def upload(ctx, compose_file, name, registry_auth, dry_run):
+def upload(ctx, compose_file, name, registry_auth, arch, dry_run):
     """Generate a Kaggle kernel from a compose file and push it."""
     if not name:
         name = default_bundle_name("compose")
     auth = registry_auth or None
     if dry_run:
-        print_kaggle_upload_plan(name, compose_file, auth)
+        print_kaggle_upload_plan(name, compose_file, auth, arch)
         return
-    do_kaggle_upload(name, compose_file, auth)
+    do_kaggle_upload(name, compose_file, auth, arch)
 
 
 @kaggle.command()

{remote_docker_cli-0.3.0 → remote_docker_cli-0.3.1}/src/remote_docker/tests/test_cli_commands.py

@@ -18,7 +18,6 @@ from unittest.mock import MagicMock, patch
 import pytest
 from click.testing import CliRunner
 
-import remote_docker.cli as cli_mod
 from remote_docker.cli import cli, do_load
 
 
@@ -43,24 +42,10 @@ def runner():
     return CliRunner()
 
 
-@pytest.fixture
-def no_remote_config(monkeypatch, tmp_path):
-    """Point CONFIG_FILE/CONFIG_DIR to an empty tmp location so tests that
-    exercise the "no host" branch are not poisoned by a real ~/.config/rdocker."""
-    cfg_dir = tmp_path / "rdocker-empty"
-    cfg_file = cfg_dir / "config.yml"
-    monkeypatch.setattr(cli_mod, "CONFIG_DIR", cfg_dir)
-    monkeypatch.setattr(cli_mod, "CONFIG_FILE", cfg_file)
-    # Also clear any rdocker_* env vars that might set a host.
-    for k in [k for k in os.environ if k.startswith("rdocker_")]:
-        monkeypatch.delenv(k, raising=False)
-    return cfg_dir, cfg_file
-
-
 # ── pull ──────────────────────────────────────────────────────────────
 
 class TestPullCommand:
-    def test_pull_requires_host(self, runner, compose_file, no_remote_config):
+    def test_pull_requires_host(self, runner, compose_file):
         result = runner.invoke(cli, ["pull", str(compose_file)])
         assert result.exit_code != 0
         assert "Remote host not specified" in result.output

{remote_docker_cli-0.3.0 → remote_docker_cli-0.3.1}/src/remote_docker/tests/test_kaggle.py

@@ -7,6 +7,8 @@ Covers:
   rm-rf cleanup step, tar root '.'
 - render_kaggle_kernel_metadata: id / title composition, default fields
 - build_kaggle_notebook_dir: writes rdcontainer.py + kernel-metadata.json under .kaggle/<name>/
+- --arch override: the CLI flag is wired through to the rendered notebook in both the
+  push and --try paths, and falls back to local_arch() when omitted
 """
 import json
 import subprocess
@@ -14,16 +16,36 @@ from unittest.mock import MagicMock, patch
 
 import click
 import pytest
+from click.testing import CliRunner
 
 from remote_docker.cli import (
     KAGGLE_USERNAME_RE,
     build_kaggle_notebook_dir,
+    cli,
+    do_kaggle_upload,
     get_kaggle_username,
+    print_kaggle_upload_plan,
     render_kaggle_kernel_metadata,
     render_kaggle_notebook,
 )
 
 
+COMPOSE_BASIC = """\
+services:
+  web:
+    image: nginx:1.25-alpine
+  cache:
+    image: redis:7
+"""
+
+
+@pytest.fixture
+def compose_file(tmp_path):
+    p = tmp_path / "docker-compose.yml"
+    p.write_text(COMPOSE_BASIC, encoding="utf-8")
+    return p
+
+
 # ── KAGGLE_USERNAME_RE ────────────────────────────────────────────────
 
 class TestKaggleUsernameRegex:
@@ -254,3 +276,139 @@ class TestBuildKaggleNotebookDir:
         meta = json.loads((result / "kernel-metadata.json").read_text(encoding="utf-8"))
         assert meta["id"] == "alice/rdocker-myapp"
         assert meta["title"] == "rdocker-myapp"
+
+
+# ── --arch override (do_kaggle_upload / print_kaggle_upload_plan) ─────
+
+class TestKaggleUploadArchOverride:
+    def _patch_all_subprocess_runs(self, monkeypatch):
+        """Patch every subprocess.run so config-view returns a username, push succeeds."""
+        monkeypatch.setattr("shutil.which", lambda _: "/usr/local/bin/kaggle")
+        config_view = MagicMock(returncode=0, stdout="- username: alice\n", stderr="")
+        push = MagicMock(returncode=0, stdout="", stderr="")
+        return patch("subprocess.run", side_effect=[config_view, push])
+
+    def test_upload_uses_local_arch_when_no_override(self, compose_file, tmp_path, monkeypatch):
+        monkeypatch.chdir(tmp_path)
+        monkeypatch.setattr("platform.machine", lambda: "x86_64")
+        with self._patch_all_subprocess_runs(monkeypatch):
+            do_kaggle_upload(
+                name="myapp",
+                compose_file=str(compose_file),
+                registry_auth=None,
+            )
+        text = (tmp_path / ".kaggle" / "myapp" / "rdocker.py").read_text(encoding="utf-8")
+        assert 'ARCH = "amd64"' in text
+
+    def test_upload_arch_override_writes_override_into_notebook(self, compose_file, tmp_path, monkeypatch):
+        monkeypatch.chdir(tmp_path)
+        monkeypatch.setattr("platform.machine", lambda: "x86_64")
+        with self._patch_all_subprocess_runs(monkeypatch):
+            do_kaggle_upload(
+                name="myapp",
+                compose_file=str(compose_file),
+                registry_auth=None,
+                arch="arm64",
+            )
+        text = (tmp_path / ".kaggle" / "myapp" / "rdocker.py").read_text(encoding="utf-8")
+        assert 'ARCH = "arm64"' in text
+        assert 'ARCH = "amd64"' not in text
+
+    def test_upload_arch_override_accepts_exotic_values(self, compose_file, tmp_path, monkeypatch):
+        """All standard OCI arch names should pass through verbatim."""
+        monkeypatch.chdir(tmp_path)
+        for exotic in ("ppc64le", "s390x", "386", "arm"):
+            with self._patch_all_subprocess_runs(monkeypatch):
+                do_kaggle_upload(
+                    name="myapp",
+                    compose_file=str(compose_file),
+                    registry_auth=None,
+                    arch=exotic,
+                )
+            text = (tmp_path / ".kaggle" / "myapp" / "rdocker.py").read_text(encoding="utf-8")
+            assert f'ARCH = "{exotic}"' in text
+
+    def test_plan_uses_local_arch_when_no_override(self, compose_file, tmp_path, monkeypatch, capsys):
+        monkeypatch.chdir(tmp_path)
+        monkeypatch.setattr("platform.machine", lambda: "x86_64")
+        config_view = MagicMock(returncode=0, stdout="- username: alice\n", stderr="")
+        with patch("subprocess.run", return_value=config_view):
+            print_kaggle_upload_plan(
+                name="myapp",
+                compose_file=str(compose_file),
+                registry_auth=None,
+            )
+        out = capsys.readouterr().out
+        assert "Arch (from local): amd64" in out
+        assert "Arch (override)" not in out
+        assert 'ARCH = "amd64"' in out
+        # Plan must not write any files.
+        assert not (tmp_path / ".kaggle").exists()
+
+    def test_plan_arch_override_replaces_local_arch(self, compose_file, tmp_path, monkeypatch, capsys):
+        monkeypatch.chdir(tmp_path)
+        monkeypatch.setattr("platform.machine", lambda: "x86_64")
+        config_view = MagicMock(returncode=0, stdout="- username: alice\n", stderr="")
+        with patch("subprocess.run", return_value=config_view):
+            print_kaggle_upload_plan(
+                name="myapp",
+                compose_file=str(compose_file),
+                registry_auth=None,
+                arch="arm64",
+            )
+        out = capsys.readouterr().out
+        assert "Arch (override): arm64" in out
+        assert "Arch (from local)" not in out
+        assert 'ARCH = "arm64"' in out
+        assert 'ARCH = "amd64"' not in out
+
+
+# ── --arch CLI flag (Click command surface) ───────────────────────────
+
+class TestKaggleUploadArchCliFlag:
+    def test_cli_flag_wires_arch_through_in_try_mode(self, compose_file, monkeypatch, tmp_path):
+        monkeypatch.chdir(tmp_path)
+        monkeypatch.setattr("platform.machine", lambda: "x86_64")
+        monkeypatch.setattr("shutil.which", lambda _: "/usr/local/bin/kaggle")
+        config_view = MagicMock(returncode=0, stdout="- username: alice\n", stderr="")
+        with patch("subprocess.run", return_value=config_view) as run:
+            runner = CliRunner()
+            result = runner.invoke(
+                cli,
+                [
+                    "kaggle", "upload", str(compose_file),
+                    "--name", "myapp",
+                    "--arch", "arm64",
+                    "--try",
+                ],
+            )
+        assert result.exit_code == 0, result.output
+        assert "Arch (override): arm64" in result.output
+        assert 'ARCH = "arm64"' in result.output
+        assert 'ARCH = "amd64"' not in result.output
+        # No push should have happened (--try): only `kaggle config view` was invoked.
+        assert run.call_count == 1
+        assert run.call_args[0][0][0:2] == ["kaggle", "config"]
+        # No files should have been written.
+        assert not (tmp_path / ".kaggle").exists()
+
+    def test_cli_flag_absent_uses_local_arch_in_try_mode(self, compose_file, monkeypatch, tmp_path):
+        monkeypatch.chdir(tmp_path)
+        monkeypatch.setattr("platform.machine", lambda: "x86_64")
+        monkeypatch.setattr("shutil.which", lambda _: "/usr/local/bin/kaggle")
+        config_view = MagicMock(returncode=0, stdout="- username: alice\n", stderr="")
+        with patch("subprocess.run", return_value=config_view):
+            runner = CliRunner()
+            result = runner.invoke(
+                cli,
+                ["kaggle", "upload", str(compose_file), "--name", "myapp", "--try"],
+            )
+        assert result.exit_code == 0, result.output
+        assert "Arch (from local): amd64" in result.output
+        assert "Arch (override)" not in result.output
+
+    def test_cli_flag_help_text_mentions_arch(self):
+        runner = CliRunner()
+        result = runner.invoke(cli, ["kaggle", "upload", "--help"])
+        assert result.exit_code == 0
+        assert "--arch" in result.output

{remote_docker_cli-0.3.0 → remote_docker_cli-0.3.1}/src/remote_docker/tests/test_load.py

@@ -42,12 +42,7 @@ class TestLoadCommand:
         runner = CliRunner()
         result = runner.invoke(cli, ["load", "--name", "myapp", str(fake)])
         assert result.exit_code != 0
-        # Click 7.x prints `No such option '--name'`, Click 8.x prints
-        # `No such option: --name` (no quotes around the option name).
-        assert (
-            "No such option '--name'" in result.output
-            or "No such option: --name" in result.output
-        )
+        assert "No such option '--name'" in result.output
 
     def test_dry_run_prints_extract_and_load_plan(self, tmp_path):
         fake = tmp_path / "myapp.tar.gz"