clan/clan-core
12
4
Fork 19
Code Issues 108 Pull Requests 2 Actions Packages Projects 1 Releases Wiki Activity

Merge pull request 'flake.lock: Update' (#132) from Mic92-mic92 into main
All checks were successful
build / test (push) Successful in 20s
Details

Browse Source
This commit is contained in:
clan-bot 2023-08-11 15:12:51 +00:00
commit eb4eacfac1
3 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
flake.lock
View File

@ -7,11 +7,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1691423834, "lastModified": 1691743546,
"narHash": "sha256-xcjbbK7j0xbX6VvYg03mI0DbcpjtVC6FuoO5SRYLPe4=", "narHash": "sha256-nS2uWOeEmMgUBEMDCvwLlXBBCLkW7agDcMtOXuf9PDc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "5a9bfa9fa612cc1888a886f6900bf7afcdfd8d92", "rev": "241c878d4b542fea7c61ed4421e9224af054ff56",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -98,11 +98,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1691472822, "lastModified": 1691654369,
"narHash": "sha256-XVfYZ2oB3lNPVq6sHCY9WkdQ8lHoIDzzbpg8bB6oBxA=", "narHash": "sha256-gSILTEx1jRaJjwZxRlnu3ZwMn1FVNk80qlwiCX8kmpo=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "41c7605718399dcfa53dd7083793b6ae3bc969ff", "rev": "ce5e4a6ef2e59d89a971bc434ca8ca222b9c7f5e",
"type": "github" "type": "github"
}, },
"original": { "original": {

1
pkgs/clan-cli/clan_cli/update.py
View File

@ -94,7 +94,6 @@ def update(args: argparse.Namespace) -> None:
def register_parser(parser: argparse.ArgumentParser) -> None: def register_parser(parser: argparse.ArgumentParser) -> None:
parser.add_mutually_exclusive_group(required=True)
# TODO pass all args we don't parse into ssh_args, currently it fails if arg starts with - # TODO pass all args we don't parse into ssh_args, currently it fails if arg starts with -
parser.add_argument("--flake-uri", type=str, default=".#", help="nix flake uri") parser.add_argument("--flake-uri", type=str, default=".#", help="nix flake uri")
parser.add_argument( parser.add_argument(

11
pkgs/clan-cli/tests/test_update.py → pkgs/clan-cli/tests/test_update_cli.py
View File

@ -1,12 +1,21 @@
import argparse
import os import os
import shutil import shutil
from pathlib import Path from pathlib import Path
from tempfile import TemporaryDirectory from tempfile import TemporaryDirectory
import pytest
from environment import mock_env from environment import mock_env
from host_group import HostGroup from host_group import HostGroup
from clan_cli.update import deploy_nixos from clan_cli.update import deploy_nixos, register_parser
def test_cli() -> None:
parser = argparse.ArgumentParser()
register_parser(parser)
with pytest.raises(SystemExit):
parser.parse_args(["--help"])
def test_update(clan_flake: Path, host_group: HostGroup) -> None: def test_update(clan_flake: Path, host_group: HostGroup) -> None: