pyinfra 3.6__py3-none-any.whl → 3.6.1__py3-none-any.whl

pyinfra/api/arguments.py

@@ -70,12 +70,12 @@ class ConnectorArguments(TypedDict, total=False):
     _success_exit_codes: Iterable[int]
     _timeout: int
     _get_pty: bool
-    _stdin: Union[str, Iterable[str]]
+    _stdin: Union[str, list[str], Iterable[str]]
 
     # Retry arguments
     _retries: int
     _retry_delay: Union[int, float]
-    _retry_until: Optional[Callable[[dict], bool]]
+    _retry_until: Callable[[dict], bool]
 
     # Temp directory argument
     _temp_dir: str

pyinfra/api/arguments_typed.py

@@ -1,16 +1,6 @@
 from __future__ import annotations
 
-from typing import (
-    TYPE_CHECKING,
-    Callable,
-    Generator,
-    Generic,
-    Iterable,
-    List,
-    Mapping,
-    Optional,
-    Union,
-)
+from typing import TYPE_CHECKING, Callable, Generator, Generic, Iterable, List, Mapping, Union
 
 from typing_extensions import ParamSpec, Protocol
 
@@ -36,36 +26,41 @@ class PyinfraOperation(Generic[P], Protocol):
         #
         # Auth
         _sudo: bool = False,
-        _sudo_user: Optional[str] = None,
+        _sudo_user: None | str = None,
         _use_sudo_login: bool = False,
-        _sudo_password: Optional[str] = None,
+        _sudo_password: None | str = None,
         _preserve_sudo_env: bool = False,
-        _su_user: Optional[str] = None,
+        _su_user: None | str = None,
         _use_su_login: bool = False,
         _preserve_su_env: bool = False,
-        _su_shell: Optional[str] = None,
+        _su_shell: None | str = None,
         _doas: bool = False,
-        _doas_user: Optional[str] = None,
+        _doas_user: None | str = None,
         # Shell arguments
-        _shell_executable: Optional[str] = None,
-        _chdir: Optional[str] = None,
-        _env: Optional[Mapping[str, str]] = None,
+        _shell_executable: None | str = None,
+        _chdir: None | str = None,
+        _env: None | Mapping[str, str] = None,
         # Connector control
         _success_exit_codes: Iterable[int] = (0,),
-        _timeout: Optional[int] = None,
+        _timeout: None | int = None,
         _get_pty: bool = False,
-        _stdin: Union[None, str, list[str], tuple[str, ...]] = None,
+        _stdin: None | Union[str, list[str], Iterable[str]] = None,
+        # Retry arguments
+        _retries: None | int = None,
+        _retry_delay: None | Union[int, float] = None,
+        _retry_until: None | Callable[[dict], bool] = None,
+        _temp_dir: None | str = None,
         #
         # MetaArguments
         #
-        name: Optional[str] = None,
+        name: None | str = None,
         _ignore_errors: bool = False,
         _continue_on_error: bool = False,
         _if: Union[List[Callable[[], bool]], Callable[[], bool], None] = None,
         #
         # ExecutionArguments
         #
-        _parallel: Optional[int] = None,
+        _parallel: None | int = None,
         _run_once: bool = False,
         _serial: bool = False,
         #

pyinfra/api/command.py

@@ -242,13 +242,19 @@ class FunctionCommand(PyinfraCommand):
             self.function(*self.args, **self.kwargs)
             return
 
-        def execute_function() -> None:
+        def execute_function() -> None | Exception:
             with ctx_config.use(state.config.copy()):
                 with ctx_host.use(host):
-                    self.function(*self.args, **self.kwargs)
+                    try:
+                        self.function(*self.args, **self.kwargs)
+                    except Exception as e:
+                        return e
+            return None
 
         greenlet = gevent.spawn(execute_function)
-        return greenlet.get()
+        exception = greenlet.get()
+        if exception is not None:
+            raise exception
 
 
 class RsyncCommand(PyinfraCommand):

pyinfra/api/deploy.py

@@ -41,7 +41,7 @@ def add_deploy(state: "State", deploy_func: Callable[..., Any], *args, **kwargs)
             ).format(get_call_location()),
         )
 
-    hosts = kwargs.pop("host", state.inventory.iter_active_hosts())
+    hosts = kwargs.pop("host", state.inventory.get_active_hosts())
     if isinstance(hosts, Host):
         hosts = [hosts]
 

pyinfra/api/exceptions.py

@@ -54,6 +54,12 @@ class OperationValueError(OperationError, ValueError):
     """
 
 
+class NestedOperationError(OperationError):
+    """
+    Exception raised when a nested (immediately executed) operation fails.
+    """
+
+
 class DeployError(PyinfraError):
     """
     User exception for raising in deploys or sub deploys.

pyinfra/api/facts.py

@@ -14,7 +14,7 @@ import inspect
 import re
 from inspect import getcallargs
 from socket import error as socket_error, timeout as timeout_error
-from typing import TYPE_CHECKING, Any, Callable, Generic, Iterable, Optional, Type, TypeVar, cast
+from typing import TYPE_CHECKING, Any, Callable, Generic, Optional, Type, TypeVar, cast
 
 import click
 import gevent
@@ -87,7 +87,7 @@ class FactBase(Generic[T]):
 
         return cast(T, None)
 
-    def process(self, output: Iterable[str]) -> T:
+    def process(self, output: list[str]) -> T:
         # NOTE: TypeVar does not support a default, so we have to cast this str -> T
         return cast(T, "\n".join(output))
 
@@ -152,7 +152,7 @@ def get_facts(state, *args, **kwargs):
     with ctx_state.use(state):
         greenlet_to_host = {
             state.pool.spawn(get_host_fact, host, *args, **kwargs): host
-            for host in state.inventory.iter_active_hosts()
+            for host in state.inventory.get_active_hosts()
         }
 
     results = {}

pyinfra/api/inventory.py

@@ -158,11 +158,11 @@ class Inventory:
 
         return iter(self.hosts.values())
 
-    def iter_active_hosts(self) -> Iterator["Host"]:
+    def get_active_hosts(self) -> list["Host"]:
         """
         Iterates over active inventory hosts.
         """
-        return iter(self.state.active_hosts)
+        return list(self.state.active_hosts)
 
     def len_active_hosts(self) -> int:
         """

pyinfra/api/operation.py

@@ -22,7 +22,7 @@ from pyinfra.context import ctx_host, ctx_state
 from .arguments import EXECUTION_KWARG_KEYS, AllArguments, pop_global_arguments
 from .arguments_typed import PyinfraOperation
 from .command import PyinfraCommand, StringCommand
-from .exceptions import OperationValueError, PyinfraError
+from .exceptions import NestedOperationError, OperationValueError, PyinfraError
 from .host import Host
 from .operations import run_host_op
 from .state import State, StateOperationHostData, StateOperationMeta, StateStage
@@ -221,7 +221,7 @@ def add_op(state: State, op_func, *args, **kwargs):
             ),
         )
 
-    hosts = kwargs.pop("host", state.inventory.iter_active_hosts())
+    hosts = kwargs.pop("host", state.inventory.get_active_hosts())
     if isinstance(hosts, Host):
         hosts = [hosts]
 
@@ -266,7 +266,9 @@ def _wrap_operation(func: Callable[P, Generator], _set_in_op: bool = True) -> Py
         state = context.state
         host = context.host
 
-        if state.current_stage < StateStage.Prepare or state.current_stage > StateStage.Execute:
+        if pyinfra.is_cli and (
+            state.current_stage < StateStage.Prepare or state.current_stage > StateStage.Execute
+        ):
             raise Exception("Cannot call operations outside of Prepare/Execute stages")
 
         if host.in_op:
@@ -470,8 +472,11 @@ def execute_immediately(state, host, op_hash):
     op_meta = state.get_op_meta(op_hash)
     op_data = state.get_op_data_for_host(host, op_hash)
     op_data.parent_op_hash = host.executing_op_hash
+
     log_operation_start(op_meta, op_types=["nested"], prefix="")
-    run_host_op(state, host, op_hash)
+
+    if run_host_op(state, host, op_hash) is False:
+        raise NestedOperationError(op_hash)
 
 
 def _get_arg_value(arg):

pyinfra/api/operations.py

@@ -4,7 +4,7 @@ import time
 import traceback
 from itertools import product
 from socket import error as socket_error, timeout as timeout_error
-from typing import TYPE_CHECKING, Optional, cast
+from typing import TYPE_CHECKING, cast
 
 import click
 import gevent
@@ -17,7 +17,7 @@ from pyinfra.progress import progress_spinner
 
 from .arguments import CONNECTOR_ARGUMENT_KEYS, ConnectorArguments
 from .command import FunctionCommand, PyinfraCommand, StringCommand
-from .exceptions import PyinfraError
+from .exceptions import NestedOperationError, PyinfraError
 from .util import (
     format_exception,
     log_error_or_warning,
@@ -35,7 +35,7 @@ if TYPE_CHECKING:
 #
 
 
-def run_host_op(state: "State", host: "Host", op_hash: str) -> Optional[bool]:
+def run_host_op(state: "State", host: "Host", op_hash: str) -> bool:
     state.trigger_callbacks("operation_host_start", host, op_hash)
 
     if op_hash not in state.ops[host]:
@@ -59,7 +59,7 @@ def run_host_op(state: "State", host: "Host", op_hash: str) -> Optional[bool]:
             host.executing_op_hash = None
 
 
-def _run_host_op(state: "State", host: "Host", op_hash: str) -> Optional[bool]:
+def _run_host_op(state: "State", host: "Host", op_hash: str) -> bool:
     op_data = state.get_op_data_for_host(host, op_hash)
     global_arguments = op_data.global_arguments
 
@@ -104,6 +104,8 @@ def _run_host_op(state: "State", host: "Host", op_hash: str) -> Optional[bool]:
             if isinstance(command, FunctionCommand):
                 try:
                     status = command.execute(state, host, connector_arguments)
+                except NestedOperationError:
+                    host.log_styled("Error in nested operation", fg="red", log_func=logger.error)
                 except Exception as e:
                     # Custom functions could do anything, so expect anything!
                     logger.warning(traceback.format_exc())
@@ -278,7 +280,7 @@ def _run_serial_ops(state: "State"):
     Run all ops for all servers, one server at a time.
     """
 
-    for host in list(state.inventory.iter_active_hosts()):
+    for host in list(state.inventory.get_active_hosts()):
         host_operations = product([host], state.get_op_order())
         with progress_spinner(host_operations) as progress:
             try:
@@ -296,7 +298,7 @@ def _run_no_wait_ops(state: "State"):
     Run all ops for all servers at once.
     """
 
-    hosts_operations = product(state.inventory.iter_active_hosts(), state.get_op_order())
+    hosts_operations = product(state.inventory.get_active_hosts(), state.get_op_order())
     with progress_spinner(hosts_operations) as progress:
         # Spawn greenlet for each host to run *all* ops
         if state.pool is None:
@@ -308,7 +310,7 @@ def _run_no_wait_ops(state: "State"):
                 host,
                 progress=progress,
             )
-            for host in state.inventory.iter_active_hosts()
+            for host in state.inventory.get_active_hosts()
         ]
         gevent.joinall(greenlets)
 
@@ -326,9 +328,9 @@ def _run_single_op(state: "State", op_hash: str):
     failed_hosts = set()
 
     if op_meta.global_arguments["_serial"]:
-        with progress_spinner(state.inventory.iter_active_hosts()) as progress:
+        with progress_spinner(state.inventory.get_active_hosts()) as progress:
             # For each host, run the op
-            for host in state.inventory.iter_active_hosts():
+            for host in state.inventory.get_active_hosts():
                 result = _run_host_op_with_context(state, host, op_hash)
                 progress(host)
 
@@ -337,12 +339,12 @@ def _run_single_op(state: "State", op_hash: str):
 
     else:
         # Start with the whole inventory in one batch
-        batches = [list(state.inventory.iter_active_hosts())]
+        batches = [list(state.inventory.get_active_hosts())]
 
         # If parallel set break up the inventory into a series of batches
         parallel = op_meta.global_arguments["_parallel"]
         if parallel:
-            hosts = list(state.inventory.iter_active_hosts())
+            hosts = list(state.inventory.get_active_hosts())
             batches = [hosts[i : i + parallel] for i in range(0, len(hosts), parallel)]
 
         for batch in batches:

pyinfra/connectors/sshuserclient/client.py

@@ -28,15 +28,17 @@ HOST_KEYS_LOCK = BoundedSemaphore()
 class StrictPolicy(MissingHostKeyPolicy):
     @override
     def missing_host_key(self, client, hostname, key):
-        logger.error("No host key for {0} found in known_hosts".format(hostname))
-        raise SSHException(
-            "StrictPolicy: No host key for {0} found in known_hosts".format(hostname),
-        )
+        logger.error("No host key for %s found in known_hosts", hostname)
+        raise SSHException(f"StrictPolicy: No host key for {hostname} found in known_hosts")
 
 
 def append_hostkey(client, hostname, key):
     """Append hostname to the clients host_keys_file"""
 
+    if client._host_keys_filename is None:
+        logger.warning("No host keys filename, not saving key for: %s", hostname)
+        return
+
     with HOST_KEYS_LOCK:
         # The paramiko client saves host keys incorrectly whereas the host keys object does
         # this correctly, so use that with the client filename variable.
@@ -67,30 +69,28 @@ class AcceptNewPolicy(MissingHostKeyPolicy):
         )
 
         append_hostkey(client, hostname, key)
-        logger.warning("Added host key for {0} to known_hosts".format(hostname))
+        logger.warning("Added host key for %s to known_hosts", hostname)
 
 
 class AskPolicy(MissingHostKeyPolicy):
     @override
     def missing_host_key(self, client, hostname, key):
         should_continue = input(
-            "No host key for {0} found in known_hosts, do you want to continue [y/n] ".format(
-                hostname,
-            ),
+            f"No host key for {hostname} found in known_hosts, do you want to continue [y/n] ",
         )
         if should_continue.lower() != "y":
             raise SSHException(
-                "AskPolicy: No host key for {0} found in known_hosts".format(hostname),
+                f"AskPolicy: No host key for {hostname} found in known_hosts",
             )
         append_hostkey(client, hostname, key)
-        logger.warning("Added host key for {0} to known_hosts".format(hostname))
+        logger.warning("Added host key for %s to known_hosts", hostname)
         return
 
 
 class WarningPolicy(MissingHostKeyPolicy):
     @override
     def missing_host_key(self, client, hostname, key):
-        logger.warning("No host key for {0} found in known_hosts".format(hostname))
+        logger.warning("No host key for %s found in known_hosts", hostname)
 
 
 def get_missing_host_key_policy(policy):
@@ -102,7 +102,7 @@ def get_missing_host_key_policy(policy):
         return StrictPolicy()
     if policy == "accept-new":
         return AcceptNewPolicy()
-    raise SSHException("Invalid value StrictHostKeyChecking={}".format(policy))
+    raise SSHException(f"Invalid value StrictHostKeyChecking={policy}")
 
 
 @memoize
@@ -120,17 +120,24 @@ def get_ssh_config(user_config_file=None):
 
 
 @memoize
-def get_host_keys(filename):
+def get_host_keys(filenames):
+    """
+    Load host keys from one or more files.
+
+    Args:
+        filenames: A tuple of filenames to load host keys from.
+    """
     with HOST_KEYS_LOCK:
         host_keys = HostKeys()
 
-        try:
-            host_keys.load(filename)
-        # When paramiko encounters a bad host keys line it sometimes bails the
-        # entire load incorrectly.
-        # See: https://github.com/paramiko/paramiko/pull/1990
-        except Exception as e:
-            logger.warning("Failed to load host keys from {0}: {1}".format(filename, e))
+        for filename in filenames:
+            try:
+                host_keys.load(filename)
+            # When paramiko encounters a bad host keys line it sometimes bails the
+            # entire load incorrectly.
+            # See: https://github.com/paramiko/paramiko/pull/1990
+            except Exception as e:
+                logger.warning("Failed to load host keys from %s: %s", filename, e)
 
         return host_keys
 
@@ -157,7 +164,7 @@ class SSHClient(ParamikoClient):
             config,
             forward_agent,
             missing_host_key_policy,
-            host_keys_file,
+            host_keys_files,
             keep_alive,
         ) = self.parse_config(
             hostname,
@@ -169,11 +176,13 @@ class SSHClient(ParamikoClient):
         config.update(kwargs)
 
         if _pyinfra_ssh_known_hosts_file:
-            host_keys_file = _pyinfra_ssh_known_hosts_file
+            host_keys_files = (path.expanduser(_pyinfra_ssh_known_hosts_file),)
 
         # Overwrite paramiko empty defaults with @memoize-d host keys object
-        self._host_keys = get_host_keys(host_keys_file)
-        self._host_keys_filename = host_keys_file
+        self._host_keys = get_host_keys(host_keys_files)
+        # Use the first file for writing new host keys
+        if len(host_keys_files) > 0:
+            self._host_keys_filename = host_keys_files[0]
 
         if _pyinfra_ssh_paramiko_connect_kwargs:
             config.update(_pyinfra_ssh_paramiko_connect_kwargs)
@@ -217,11 +226,18 @@ class SSHClient(ParamikoClient):
         keep_alive = 0
         forward_agent = False
         missing_host_key_policy = get_missing_host_key_policy(strict_host_key_checking)
-        host_keys_file = path.expanduser("~/.ssh/known_hosts")  # OpenSSH default
+        host_keys_files = (path.expanduser("~/.ssh/known_hosts"),)
 
         ssh_config = get_ssh_config(ssh_config_file)
         if not ssh_config:
-            return hostname, cfg, forward_agent, missing_host_key_policy, host_keys_file, keep_alive
+            return (
+                hostname,
+                cfg,
+                forward_agent,
+                missing_host_key_policy,
+                host_keys_files,
+                keep_alive,
+            )
 
         host_config = ssh_config.lookup(hostname)
         forward_agent = host_config.get("forwardagent") == "yes"
@@ -233,7 +249,10 @@ class SSHClient(ParamikoClient):
             )
 
         if "userknownhostsfile" in host_config:
-            host_keys_file = path.expanduser(host_config["userknownhostsfile"])
+            # OpenSSH supports multiple space-separated known hosts files
+            host_keys_files = tuple(
+                path.expanduser(f) for f in host_config["userknownhostsfile"].split()
+            )
 
         if "hostname" in host_config:
             hostname = host_config["hostname"]
@@ -275,7 +294,7 @@ class SSHClient(ParamikoClient):
                 sock = c.gateway(hostname, cfg["port"], target, target_config["port"])
             cfg["sock"] = sock
 
-        return hostname, cfg, forward_agent, missing_host_key_policy, host_keys_file, keep_alive
+        return hostname, cfg, forward_agent, missing_host_key_policy, host_keys_files, keep_alive
 
     @staticmethod
     def derive_shorthand(ssh_config, host_string):

pyinfra/facts/crontab.py

@@ -52,9 +52,11 @@ class CrontabFile:
 
         name_comment = "# pyinfra-name={0}".format(name)
         for cmd in self.commands:
+            if "command" not in cmd:
+                continue
             if cmd.get("command") == command:
                 return cmd
-            if cmd.get("comments") and name_comment in cmd["comments"]:
+            if name_comment in cmd.get("comments", []):
                 return cmd
         return None
 

pyinfra/facts/files.py

@@ -547,6 +547,8 @@ class FindFilesBase(FactBase):
             command.append("-regex")
             command.append(maybe_quote(regex))
 
+        command.extend(args)
+
         command.append("||")
         command.append("true")
 
@@ -664,13 +666,21 @@ class Block(FactBase):
 
 class FileContents(FactBase):
     """
-    Returns the contents of a file as a list of lines. Returns ``None`` if the file does not exist.
+    Returns the contents of a file as a list of lines, or ``None`` if the file does not exist.
     """
 
     @override
     def command(self, path):
-        return make_formatted_string_command("cat {0}", QuoteString(path))
+        self.missing_flag = "{0}{1}".format(MISSING, path)
+        return make_formatted_string_command(
+            "( test -e {0} && cat {0} ) || echo {1}",
+            QuoteString(path),
+            QuoteString(self.missing_flag),
+        )
 
     @override
     def process(self, output):
+        # If output is the missing flag, the file doesn't exist
+        if output and output[0] == self.missing_flag:
+            return None
         return output

pyinfra/facts/flatpak.py

@@ -74,4 +74,4 @@ class FlatpakPackages(FlatpakBaseFact):
 
     @override
     def process(self, output):
-        return [flatpak for flatpak in output[1:]]
+        return [flatpak for i, flatpak in enumerate(output) if i > 1 or flatpak != "Application ID"]

pyinfra/operations/docker.py

@@ -32,6 +32,8 @@ def container(
     present: bool = True,
     force: bool = False,
     start: bool = True,
+    restart_policy: str | None = None,
+    auto_remove: bool = False,
 ):
     """
     Manage Docker containers
@@ -47,6 +49,8 @@ def container(
     + force: remove a container with same name and create a new one
     + present: whether the container should be up and running
     + start: start or stop the container
+    + restart_policy: restart policy to apply when a container exits
+    + auto_remove: automatically remove the container and its associated anonymous volumes when it exits
 
     **Examples:**
 
@@ -64,6 +68,8 @@ def container(
             networks=["proxy", "services"],
             volumes=["nginx_data:/usr/share/nginx/html"],
             pull_always=True,
+            restart_policy="unless-stopped",
+            auto_remove=True,
         )
 
         # Stop a container
@@ -89,6 +95,8 @@ def container(
         env_vars or list(),
         labels or list(),
         pull_always,
+        restart_policy,
+        auto_remove,
     )
     existent_container = host.get_fact(DockerContainer, object_id=container)
 

pyinfra/operations/postgres.py

@@ -53,7 +53,12 @@ def sql(
     )
 
 
-@operation()
+@operation(
+    idempotent_notice=(
+        "This operation will always execute commands when a password is provided, "
+        "as pyinfra cannot reliably validate the current password."
+    ),
+)
 def role(
     role: str,
     present: bool = True,

pyinfra/operations/util/docker.py

@@ -165,6 +165,8 @@ class ContainerSpec:
     env_vars: list[str] = field(default_factory=list)
     labels: list[str] = field(default_factory=list)
     pull_always: bool = False
+    restart_policy: str | None = None
+    auto_remove: bool = False
 
     def container_create_args(self):
         args = []
@@ -186,6 +188,12 @@ class ContainerSpec:
         if self.pull_always:
             args.append("--pull always")
 
+        if self.restart_policy:
+            args.append("--restart {0}".format(self.restart_policy))
+
+        if self.auto_remove:
+            args.append("--rm")
+
         args.append(self.image)
 
         return args

{pyinfra-3.6.dist-info → pyinfra-3.6.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyinfra
-Version: 3.6
+Version: 3.6.1
 Summary: pyinfra automates/provisions/manages/deploys infrastructure.
 Project-URL: homepage, https://pyinfra.com
 Project-URL: documentation, https://docs.pyinfra.com

{pyinfra-3.6.dist-info → pyinfra-3.6.1.dist-info}/RECORD

@@ -6,20 +6,20 @@ pyinfra/progress.py,sha256=X3hXZ4Flh_L9FE4ZEWxWoG0R4dA5UPd1FCO-Exd5Xtc,4193
 pyinfra/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyinfra/version.py,sha256=LZf50PHDzEZv65w0G-iMICoQ9US0U5LWHAOEmNtkF3I,216
 pyinfra/api/__init__.py,sha256=89brynFpoKWCE513go2pK2wfbGaU1V1gajX3UMm9LVA,964
-pyinfra/api/arguments.py,sha256=mG6A2JgDL6RSFIibjKaocVxbWuFZEtzJ_Is8r6OZ4Mc,12438
-pyinfra/api/arguments_typed.py,sha256=IZuhpmDfW9CP6ASS5Ie-3Wcnxl6bDNR3egU4Mfhbsb4,2303
-pyinfra/api/command.py,sha256=NwF2syxV3zxCbBdHzvJ6ve5G-xwdNTjPHFPwguKVcYs,7741
+pyinfra/api/arguments.py,sha256=0c_xENyzPlAyD41lXpL5rPbxU8Rny-uWyXgd8izcg9w,12439
+pyinfra/api/arguments_typed.py,sha256=8a3vPKkz28i9Q1Byo3DDJRLL2CuM8dbPGH-12Afh0ZY,2434
+pyinfra/api/command.py,sha256=X-gK2K8oyoHAPu4HE4tI93G57mkY4nGx7GmQZwEgV3M,7949
 pyinfra/api/config.py,sha256=gVDV-aGh6LYOnHtBaivICrd3RBfjFRWy3-K9sG__eP8,9321
 pyinfra/api/connect.py,sha256=jkx07iUL29u9pHHKH4WcNtvxwOA4DIbF7ixguFyuFjo,1984
 pyinfra/api/connectors.py,sha256=nie7JuLxMSC6gqPjmjuCisQ11R-eAQDtMMWF6YbSQ48,659
-pyinfra/api/deploy.py,sha256=Upd92oThQN0zhKbKW8vyPvBuoYiEGStuiEy7kNhZ00Y,3167
-pyinfra/api/exceptions.py,sha256=dp11JB5OUn48slAldVN8l8m8F8DpUXULIy0-VonzMS0,2004
-pyinfra/api/facts.py,sha256=kT9KPKnDoBnz8Gck21yYDuYXzRzHio-B5ZwSqyj89Iw,9885
+pyinfra/api/deploy.py,sha256=xR5VRGkRoax3dBVLX8vn_pS2x9RL0u3IrCWCPeJ_SFQ,3166
+pyinfra/api/exceptions.py,sha256=Nf6QFRzQBLfqb1kmVY0JXwLZ0YAIZE4nxUcxBEgRSqA,2141
+pyinfra/api/facts.py,sha256=u_8M4ijdZnQszdRpIWPTGtZ_fSWt_Zv_jUIq-uJsBAA,9870
 pyinfra/api/host.py,sha256=192rj8fsrHXudfnxzPlYxljXU24pReeWjXtrcCe9Kj4,14214
-pyinfra/api/inventory.py,sha256=i_LBI-Gn5FF-9SVDBH6xefTtvFzjuz12QQiFPGK2TrQ,7864
+pyinfra/api/inventory.py,sha256=tMvnAstPqAGdj8bAxCeH27KxlueUHj7VnBNVBRXqWZM,7859
 pyinfra/api/metadata.py,sha256=73BjwxKKA4mgP7D60K7Z8YIwPC11YN4IXaq26d209BI,1884
-pyinfra/api/operation.py,sha256=WtZyVwPoh9_AytqcCf_W6sMHhWEfSex9RE54aMBHU5M,17053
-pyinfra/api/operations.py,sha256=JEVLcLeVO81PXd4Vmvn3XuAovZguURoNXBexYQWBnyo,13718
+pyinfra/api/operation.py,sha256=Ae_V_8ObPEQntU5_vXbOn2KeMvKTBYO1LSvjJFT2zQ0,17176
+pyinfra/api/operations.py,sha256=kUGpC9ytA7Zaw9cJZ7zFTtLFFuyMqr2PAWaOmyAzeD0,13846
 pyinfra/api/state.py,sha256=cj-JvxOljeDshWvRpq8AMQxdGaUaht8KyuyR3mEsI-Y,12859
 pyinfra/api/util.py,sha256=fwlgiFGFpHPQQ6BVT3SRDDunZBS3fZ7ApTEFuRI6r5M,13276
 pyinfra/connectors/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -36,7 +36,7 @@ pyinfra/connectors/vagrant.py,sha256=0TT73ks64I4Yl-JSZjMBbpWA3VYBkqqLB-fUS8pS8GY
 pyinfra/connectors/scp/__init__.py,sha256=jnO-_8GfkKWhsFcDjAxjOkuUT2RbS22b8P_xPrX889U,44
 pyinfra/connectors/scp/client.py,sha256=l_fPsbgz-7U6Y50ssuKKPFxD_cFoIPtaVXMCYDotbDI,6399
 pyinfra/connectors/sshuserclient/__init__.py,sha256=Qc4RO2wknSWIiNTwOeQ0y2TeiuKHmyWDW2Dz4MOo9CE,44
-pyinfra/connectors/sshuserclient/client.py,sha256=Ei2_mzCMNJopbpvpeLsdSiNb98rxEEy7uCOmpJbfd2o,10506
+pyinfra/connectors/sshuserclient/client.py,sha256=WUmpo2LUOSXucUwVHb3EgLVxQIoCJ7pBFqFiCynjlMI,11069
 pyinfra/connectors/sshuserclient/config.py,sha256=FZkPrUYXkURZcFUHBGWw9lLC9uiH3DJ0rBYXJePchxw,2774
 pyinfra/facts/__init__.py,sha256=myTXSOZmAqmU88Fyifn035h9Lr6Gj2mlka_jDcXyKGw,347
 pyinfra/facts/apk.py,sha256=UEMHzhx2Wx3qq-OcjetWgE2iZ7_EjI-bszLxSN6PJa0,799
@@ -45,13 +45,13 @@ pyinfra/facts/brew.py,sha256=nE6YVc2S9zasyJPZmPR5FMeGKPViZYEcpnnBQlDf1EU,2792
 pyinfra/facts/bsdinit.py,sha256=SVY4hagjyy1yz8FKWhIbX9fHm5AugvTFl4xQh2FFO74,631
 pyinfra/facts/cargo.py,sha256=qgOClhwZm4COcncDzOZccCzs67nPBi_x6VGiF2UA0sA,687
 pyinfra/facts/choco.py,sha256=mpLleSqNqiaGRgyrhgceno2iPB1_1yjn8UJ90pvOZCs,886
-pyinfra/facts/crontab.py,sha256=mEY7bWvvjir23aUhNwm1mjCmFYHjVsWqrgbAXu1wt3M,5774
+pyinfra/facts/crontab.py,sha256=mm5eHCA0jL0zDflZKUyEk3V1j_opVZLvEezgwEXrucs,5820
 pyinfra/facts/deb.py,sha256=1dR1puwY5wyyhhYYwaEBLjKU9sIyaNBNBlamVZ2KQg0,2074
 pyinfra/facts/dnf.py,sha256=wXatfZWVrrdLY7LM-vHKMg8Md1FiwkqHxmgRYbQqw90,1208
 pyinfra/facts/docker.py,sha256=fqIqMR6HwSYpTUAjhCX8Hk57pcyL6ShIl98H32Ly6HM,3233
 pyinfra/facts/efibootmgr.py,sha256=JPJSokE_RV9JstEPJRECnqSU-B0JCxmrocY8zBOva7M,3555
-pyinfra/facts/files.py,sha256=xLMXbmYQ8x6Cri44Nh9BOGU0o5OAX39BtXzoOgoZyMM,19462
-pyinfra/facts/flatpak.py,sha256=ovi3duwTqqwvt5GoDRN7R-PpkvR6sQ1SmgEADcSnkUE,1646
+pyinfra/facts/files.py,sha256=y6aOC8k2UH6421t3NXgc01BfPmcy7pLFdQACJYlHFWE,19798
+pyinfra/facts/flatpak.py,sha256=Fwyaq2YP0SL_ChlGk3cTvujtb7bg1XBdICaEY1dzbBY,1696
 pyinfra/facts/freebsd.py,sha256=za42Di2M2-hcSTPei1YE6BsJxqapm9jysshs9hKJZaY,2161
 pyinfra/facts/gem.py,sha256=aX2-vcEqkxUIP0UJ_SVp9bf4B944oyDjsuujjs5q_9w,654
 pyinfra/facts/git.py,sha256=Zfzpdccsz2InviirJO17EkEFTVNqYQclSlXJIRFkD_s,1699
@@ -99,7 +99,7 @@ pyinfra/operations/cargo.py,sha256=mXWd6pb0IR6kzJMmPHwXZN-VJ-B_y8AdOFlrRzDQOZI,1
 pyinfra/operations/choco.py,sha256=nIj4bWhChOd5DkybpbD-oupaoODgS7lYx6Vrou5ksuc,1547
 pyinfra/operations/crontab.py,sha256=L1U_fBvgXkbfbpzb6OzUBrrY-RuvvPlbW5FqDmAT8rI,6644
 pyinfra/operations/dnf.py,sha256=wMFUoUB679bVydt01N7Sd7Cs16RhAaLca-zsmQU86rk,5727
-pyinfra/operations/docker.py,sha256=J_vQwQmCZEuNASFrRjeudrr_ZrpbStdXybGGej4VMxc,14161
+pyinfra/operations/docker.py,sha256=vsNm8PVh7_oIi8RmnpHeOekX-1gliNTwvzo9-2zVJY8,14525
 pyinfra/operations/files.py,sha256=jqkYIPn94z4MRqH1eU-ooOJzuQyle8wYiyDvFfXDMPI,68492
 pyinfra/operations/flatpak.py,sha256=Eif5KZkWOVElKF4hL5xOyk_oZEOziHqyyDxGHZ1KPYk,2366
 pyinfra/operations/gem.py,sha256=YtVUKVp1zYPAxy2t1ryw-vgucBVYJASOxhauLOvRj6U,1175
@@ -116,7 +116,7 @@ pyinfra/operations/pip.py,sha256=uTfK36_vBNqCXsWMU4iypOLhnhKduJK6f0b9srlMEqg,603
 pyinfra/operations/pipx.py,sha256=oWcJXKogC43cKNsf625FU4ClIAV6KZA26o2cRoa3avQ,2844
 pyinfra/operations/pkg.py,sha256=m5okKIXU1xIIcNQXQnFKXbL97ZcokmGn-hnruokE7is,2341
 pyinfra/operations/pkgin.py,sha256=6bZyvdjYDqn-0a-r23O_122r1QSjHP8SkJiWZ_k231A,2037
-pyinfra/operations/postgres.py,sha256=GlIn5aAVNOjs7cSyF3CFY6LO3dC0ZQQ0wAs_y0JJHis,13417
+pyinfra/operations/postgres.py,sha256=FN7wDYgtjqShbzSr-_CKbYY0PSlj2XdVijzaveUYols,13601
 pyinfra/operations/postgresql.py,sha256=agZjL2W4yxigk9ThIC0V_3wvmcWVdX308aJO24WkN6g,833
 pyinfra/operations/puppet.py,sha256=e9vO6SQnkMoyVWjy3oP08GaXgyIPajoA2QJ4g4ib4-M,907
 pyinfra/operations/python.py,sha256=5IXcywwhwITPRJAs8BEL5H5vSPvk_QFMbhF8Iuexp_s,2067
@@ -139,22 +139,22 @@ pyinfra/operations/freebsd/pkg.py,sha256=3AyfI0-_9F4ho47KqZsOMQocwNtTF2q9g0i6Tff
 pyinfra/operations/freebsd/service.py,sha256=1f7nTHELnhs3HBSrMFsmopVgYFMIwB8Se88yneRQ8Rw,3198
 pyinfra/operations/freebsd/sysrc.py,sha256=eg7u_JsCge_uKq3Ysc_mohUc6qgJrOZStp_B_l2Hav4,2330
 pyinfra/operations/util/__init__.py,sha256=ZAHjeCXtLo0TIOSfZ9h0Sh5IXXRCspfHs3RR1l8tQCE,366
-pyinfra/operations/util/docker.py,sha256=OCjlyxjuNP6Ki8zU6-cQkhgM-FgKsylD-dEhR7JNc8Y,11920
+pyinfra/operations/util/docker.py,sha256=aOL8iEOPlg5LpC1ix37_XbzwEG5V05wz-PhyrsBKWQI,12152
 pyinfra/operations/util/files.py,sha256=PFJDccNTwXK4tIoFB8ycRj7yD1x7LpSflBy7mPQtJCg,7148
 pyinfra/operations/util/packaging.py,sha256=RXZgUlWqEBtArK7wJfXE2Ndvl_aP0YjjksxxCnPpexk,12086
 pyinfra/operations/util/service.py,sha256=kJd1zj4-sAaGIp5Ts7yAJznogWaGr8oQTztwenLAr7Y,1309
 pyinfra_cli/__init__.py,sha256=G0X7tNdqT45uWuK3aHIKxMdDeCgJ7zHo6vbxoG6zy_8,284
-pyinfra_cli/cli.py,sha256=vlD9YyJaSy0mZu2J6pvDvBxka6cu6pRCvDj_ZZUDqXY,21285
+pyinfra_cli/cli.py,sha256=xD24zgSB1VdOx9F8avD405lj-ASWsTsZ21TC_nYdTkY,21418
 pyinfra_cli/commands.py,sha256=J-mCJYvDebJ8M7o3HreB2zToa871-xO6_KjVhPLeHho,1832
 pyinfra_cli/exceptions.py,sha256=RRaOprL7SmVv--FLy4x7fxeTitx9wYI0Y3_h01LfhJA,4901
-pyinfra_cli/inventory.py,sha256=JYSixJZKY8GNWlOxh-nGDsAknCdaAktlWAmdg13kvNk,11771
+pyinfra_cli/inventory.py,sha256=tU0qaF5jFlYu0tbs961QLdjHU0wJL3Tr7Sk9TM36Ggw,12648
 pyinfra_cli/log.py,sha256=mD96MH2owQQ5AsYRw7osCKENdp-E3Wum5IDr6qhSIa4,2268
 pyinfra_cli/main.py,sha256=1CR3IS-O6BkAzkn7UW6pdKktTmN4Qnt0_jPdkhueRM8,936
 pyinfra_cli/prints.py,sha256=1h6vgKVRKUxcGz_HdyEEDUvkp-lgiiVGwx3hc9rw24A,10434
-pyinfra_cli/util.py,sha256=8KKW5LTHX4ebbwbHqMvLqwjZ11mOHI-xIYn-cZCWltg,6722
+pyinfra_cli/util.py,sha256=P5ULsCweyNc7OkqmQTEplNfzNtNyxhQWfcp2540YeE0,6721
 pyinfra_cli/virtualenv.py,sha256=wRNxOPcUkbD_Pzuj-Lnrz1KxGmsLlb2ObmCTFrdD-S8,2474
-pyinfra-3.6.dist-info/METADATA,sha256=8nSBGBw02ni-nBp6iJsQ6hzoHPoytQcD8jKptRxm4Jg,5771
-pyinfra-3.6.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-pyinfra-3.6.dist-info/entry_points.txt,sha256=b1nLI6oVRvkeQDS00xcYGdGl4XVR_3tMbKs6T58-NW4,507
-pyinfra-3.6.dist-info/licenses/LICENSE.md,sha256=BzCnRYLJv0yb-FJuEd_XOrrQSOEQKzIVo0yHT8taNnM,1076
-pyinfra-3.6.dist-info/RECORD,,
+pyinfra-3.6.1.dist-info/METADATA,sha256=CbbyXsZMgFh0FnvreQoIElKZRPl-UzFiDupEpWsGMPQ,5773
+pyinfra-3.6.1.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+pyinfra-3.6.1.dist-info/entry_points.txt,sha256=b1nLI6oVRvkeQDS00xcYGdGl4XVR_3tMbKs6T58-NW4,507
+pyinfra-3.6.1.dist-info/licenses/LICENSE.md,sha256=BzCnRYLJv0yb-FJuEd_XOrrQSOEQKzIVo0yHT8taNnM,1076
+pyinfra-3.6.1.dist-info/RECORD,,

pyinfra_cli/cli.py

@@ -595,10 +595,6 @@ def _set_config(
     if path.exists(config_filename):
         exec_file(config_filename)
 
-    # Lock the current config, this allows us to restore this version after
-    # executing deploy files that may alter them.
-    config.lock_current_state()
-
     # Arg based config overrides
     if sudo:
         config.SUDO = True
@@ -632,6 +628,11 @@ def _set_config(
     if retry_delay is not None:
         config.RETRY_DELAY = retry_delay
 
+    # Lock the current config, this allows us to restore this version after
+    # executing deploy files that may alter them. This must happen after CLI
+    # args are applied so they persist across multiple deploy files.
+    config.lock_current_state()
+
     return config
 
 
@@ -772,6 +773,8 @@ def _prepare_exec_operations(state, config, operations):
 def _prepare_deploy_operations(state, config, operations):
     # Number of "steps" to make = number of files * number of hosts
     for i, filename in enumerate(operations):
+        config.lock_current_state()
+
         _log_styled_msg = click.style(filename, bold=True)
         logger.info("Loading: {0}".format(_log_styled_msg))
 

pyinfra_cli/inventory.py

@@ -177,8 +177,11 @@ def make_inventory(
             "nor refers to a python module"
         )
         return Inventory.empty()
-    else:
+    elif callable(inventory_func):
         return make_inventory_from_func(inventory_func, override_data)
+    else:
+        # The inventory is an iterable (list/tuple) of hosts from a module attribute
+        return make_inventory_from_iterable(inventory_func, override_data)
 
 
 def make_inventory_from_func(
@@ -235,6 +238,28 @@ def make_inventory_from_func(
     )
 
 
+def make_inventory_from_iterable(
+    hosts: List[HostType],
+    override_data: Optional[Dict[Any, Any]] = None,
+):
+    """
+    Builds a ``pyinfra.api.Inventory`` from an iterable of hosts loaded from a module attribute.
+    """
+    logger.warning("Loading inventory via module attribute is in alpha!")
+
+    if not isinstance(hosts, (list, tuple)):
+        raise TypeError(f"Inventory attribute is not a list or tuple: {type(hosts).__name__}")
+
+    for host in hosts:
+        if not isinstance(host, ALLOWED_HOST_TYPES):
+            raise TypeError(f"Invalid host in inventory: {host}")
+
+    return Inventory(
+        (list(hosts), {}),
+        override_data=override_data,
+    )
+
+
 def make_inventory_from_files(
     inventory_filename: str,
     override_data=None,

pyinfra_cli/util.py

@@ -218,7 +218,7 @@ def _parallel_load_hosts(state: "State", callback: Callable, name: str):
             return e
 
     greenlet_to_host = {
-        state.pool.spawn(load_file, host): host for host in state.inventory.iter_active_hosts()
+        state.pool.spawn(load_file, host): host for host in state.inventory.get_active_hosts()
     }
 
     with progress_spinner(greenlet_to_host.values()) as progress: