Merge pull request 'clan-cli: clan_cli.locked_open -> clan_lib.locked_open' (#3719) from clan_lib_locked_open into main

Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/3719

pkgs/clan-cli/clan_cli/tests/fixtures_flakes.py

@@ -10,7 +10,6 @@ from pathlib import Path
 from typing import Any, NamedTuple
 
 import pytest
-from clan_cli.locked_open import locked_open
 from clan_cli.machines.machines import Machine
 from clan_cli.tests import age_keys
 from clan_cli.tests.fixture_error import FixtureError
@@ -23,6 +22,7 @@ from clan_lib.dirs import (
     specific_machine_dir,
 )
 from clan_lib.flake import Flake
+from clan_lib.locked_open import locked_open
 from clan_lib.nix import nix_test_store
 
 log = logging.getLogger(__name__)

pkgs/clan-cli/clan_cli/tests/test_clan_nix_attrset.py

@@ -5,7 +5,6 @@ from pathlib import Path
 from typing import Any
 
 import pytest
-from clan_cli.locked_open import locked_open
 from clan_cli.templates import (
     ClanExports,
     InputName,
@@ -19,6 +18,7 @@ from clan_cli.tests.fixtures_flakes import FlakeForTest
 from clan_lib.cmd import run
 from clan_lib.flake import Flake
 from clan_lib.git import commit_file
+from clan_lib.locked_open import locked_open
 from clan_lib.nix import nix_command
 
 

pkgs/clan-cli/clan_lib/git/__init__.py

@@ -1,10 +1,9 @@
 import os
 from pathlib import Path
 
-from clan_cli.locked_open import locked_open
-
 from clan_lib.cmd import Log, RunOpts, run
 from clan_lib.errors import ClanError
+from clan_lib.locked_open import locked_open
 from clan_lib.nix import nix_shell
 
 

pkgs/clan-cli/clan_lib/locked_open/__init__.py

@@ -5,9 +5,9 @@ from contextlib import contextmanager
 from pathlib import Path
 from typing import Any
 
-from clan_lib.dirs import user_history_file
+from clan_cli.jsonrpc import ClanJSONEncoder
 
-from .jsonrpc import ClanJSONEncoder
+from clan_lib.dirs import user_history_file
 
 
 @contextmanager

pkgs/clan-cli/clan_lib/nix/__init__.py

@@ -7,11 +7,10 @@ from functools import cache
 from pathlib import Path
 from typing import Any
 
-from clan_cli.locked_open import locked_open
-
 from clan_lib.cmd import run
 from clan_lib.dirs import nixpkgs_flake, nixpkgs_source
 from clan_lib.errors import ClanError
+from clan_lib.locked_open import locked_open
 
 log = logging.getLogger(__name__)
 

pkgs/clan-vm-manager/clan_vm_manager/history.py

@@ -6,11 +6,11 @@ import logging
 from typing import Any
 
 from clan_cli.clan.inspect import FlakeConfig, inspect_flake
-from clan_cli.locked_open import read_history_file, write_history_file
 from clan_cli.machines.list import list_machines
 from clan_lib.dirs import user_history_file
 from clan_lib.errors import ClanError
 from clan_lib.flake import Flake
+from clan_lib.locked_open import read_history_file, write_history_file
 
 from clan_vm_manager.clan_uri import ClanURI