From ce00c63721ce2364303fe0f1cbcbd8f36c9ded9b Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 21 May 2025 11:35:13 +0200 Subject: [PATCH] clan-cli: clan_cli.bwrap -> clan_lib.bwrap --- pkgs/clan-cli/clan_cli/facts/generate.py | 2 +- pkgs/clan-cli/clan_cli/vars/generate.py | 2 +- pkgs/clan-cli/{clan_cli => clan_lib}/bwrap/__init__.py | 0 pkgs/clan-cli/{clan_cli => clan_lib}/bwrap/tests/test_bwrap.py | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) rename pkgs/clan-cli/{clan_cli => clan_lib}/bwrap/__init__.py (100%) rename pkgs/clan-cli/{clan_cli => clan_lib}/bwrap/tests/test_bwrap.py (89%) diff --git a/pkgs/clan-cli/clan_cli/facts/generate.py b/pkgs/clan-cli/clan_cli/facts/generate.py index 640fb5e23..3ef68427e 100644 --- a/pkgs/clan-cli/clan_cli/facts/generate.py +++ b/pkgs/clan-cli/clan_cli/facts/generate.py @@ -104,7 +104,7 @@ def generate_service_facts( service, machine.facts_data[service]["generator"]["prompt"] ) env["prompt_value"] = prompt_value - from clan_cli import bwrap + from clan_lib import bwrap if sys.platform == "linux" and bwrap.bubblewrap_works(): cmd = bubblewrap_cmd(generator, facts_dir, secrets_dir) diff --git a/pkgs/clan-cli/clan_cli/vars/generate.py b/pkgs/clan-cli/clan_cli/vars/generate.py index 4781181b0..45ff1b3cf 100644 --- a/pkgs/clan-cli/clan_cli/vars/generate.py +++ b/pkgs/clan-cli/clan_cli/vars/generate.py @@ -218,7 +218,7 @@ def execute_generator( prompt_file = tmpdir_prompts / prompt.name value = get_prompt_value(prompt.name) prompt_file.write_text(value) - from clan_cli import bwrap + from clan_lib import bwrap final_script = generator.final_script() diff --git a/pkgs/clan-cli/clan_cli/bwrap/__init__.py b/pkgs/clan-cli/clan_lib/bwrap/__init__.py similarity index 100% rename from pkgs/clan-cli/clan_cli/bwrap/__init__.py rename to pkgs/clan-cli/clan_lib/bwrap/__init__.py diff --git a/pkgs/clan-cli/clan_cli/bwrap/tests/test_bwrap.py b/pkgs/clan-cli/clan_lib/bwrap/tests/test_bwrap.py similarity index 89% rename from pkgs/clan-cli/clan_cli/bwrap/tests/test_bwrap.py rename to pkgs/clan-cli/clan_lib/bwrap/tests/test_bwrap.py index 1886712a4..b376e3266 100644 --- a/pkgs/clan-cli/clan_cli/bwrap/tests/test_bwrap.py +++ b/pkgs/clan-cli/clan_lib/bwrap/tests/test_bwrap.py @@ -1,7 +1,7 @@ import sys import pytest -from clan_cli.bwrap import bubblewrap_works +from clan_lib.bwrap import bubblewrap_works @pytest.mark.skipif(sys.platform != "linux", reason="bubblewrap only works on linux")