pyinfra 3.3__py2.py3-none-any.whl → 3.4__py2.py3-none-any.whl

pyinfra/operations/server.py

@@ -20,6 +20,7 @@ from pyinfra.facts.server import (
     Groups,
     Home,
     Hostname,
+    Kernel,
     KernelModules,
     Locales,
     Mounts,
@@ -335,7 +336,15 @@ def mount(
         mounted_options = mounts[path]["options"]
         needed_options = set(options) - set(mounted_options)
         if needed_options:
-            yield "mount -o remount,{0} {1}".format(options_string, path)
+            if host.get_fact(Kernel).strip() == "FreeBSD":
+                fs_type = mounts[path]["type"]
+                device = mounts[path]["device"]
+
+                yield "mount -o update,{options} -t {fs_type} {device} {path}".format(
+                    options=options_string, fs_type=fs_type, device=device, path=path
+                )
+            else:
+                yield "mount -o remount,{0} {1}".format(options_string, path)
 
     else:
         host.noop(
@@ -890,22 +899,29 @@ def user(
 
         if create_home:
             args.append("-m")
-        else:
+        elif os_type != "FreeBSD":
             args.append("-M")
 
-        if password:
+        if password and os_type != "FreeBSD":
             args.append("-p '{0}'".format(password))
 
         # Users are often added by other operations (package installs), so check
         # for the user at runtime before adding.
         add_user_command = "useradd"
+
         if os_type == "FreeBSD":
             add_user_command = "pw useradd"
-            yield "{0} -n {2} {1}".format(
-                add_user_command,
-                " ".join(args),
-                user,
-            )
+
+            if password:
+                yield "echo '{3}' | {0} -n {2} -H 0 {1}".format(
+                    add_user_command, " ".join(args), user, password
+                )
+            else:
+                yield "{0} -n {2} {1}".format(
+                    add_user_command,
+                    " ".join(args),
+                    user,
+                )
         else:
             yield "{0} {1} {2}".format(
                 add_user_command,
@@ -930,16 +946,22 @@ def user(
             args.append("-g {0}".format(group))
 
         # Check secondary groups, if defined
-        if groups and set(existing_user["groups"]) != set(groups):
+        if groups:
             if append:
-                args.append("-a")
-            args.append("-G {0}".format(",".join(groups)))
+                if not set(groups).issubset(existing_user["groups"]):
+                    args.append("-a")
+                    args.append("-G {0}".format(",".join(groups)))
+            elif set(existing_user["groups"]) != set(groups):
+                args.append("-G {0}".format(",".join(groups)))
 
         if comment and existing_user["comment"] != comment:
             args.append("-c '{0}'".format(comment))
 
         if password and existing_user["password"] != password:
-            args.append("-p '{0}'".format(password))
+            if os_type == "FreeBSD":
+                yield "echo '{0}' | pw usermod -n {1} -H 0".format(password, user)
+            else:
+                args.append("-p '{0}'".format(password))
 
         # Need to mod the user?
         if args:
@@ -947,18 +969,6 @@ def user(
                 yield "pw usermod -n {1} {0}".format(" ".join(args), user)
             else:
                 yield "usermod {0} {1}".format(" ".join(args), user)
-            if comment:
-                existing_user["comment"] = comment
-            if home:
-                existing_user["home"] = home
-            if shell:
-                existing_user["shell"] = shell
-            if group:
-                existing_user["group"] = group
-            if groups:
-                existing_user["groups"] = groups
-            if password:
-                existing_user["password"] = password
 
     # Ensure home directory ownership
     if ensure_home and home:

pyinfra/operations/util/docker.py

@@ -117,6 +117,7 @@ def _remove_volume(**kwargs):
 
 def _create_network(**kwargs):
     command = []
+    aux_addresses = kwargs["aux_addresses"] if kwargs["aux_addresses"] else {}
     opts = kwargs["opts"] if kwargs["opts"] else []
     ipam_opts = kwargs["ipam_opts"] if kwargs["ipam_opts"] else []
     labels = kwargs["labels"] if kwargs["labels"] else []
@@ -146,6 +147,9 @@ def _create_network(**kwargs):
     if kwargs["attachable"]:
         command.append("--attachable")
 
+    for host, address in aux_addresses.items():
+        command.append("--aux-address '{0}={1}'".format(host, address))
+
     for opt in opts:
         command.append("--opt {0}".format(opt))
 

pyinfra/operations/util/files.py

@@ -2,6 +2,7 @@ from __future__ import annotations
 
 import re
 from datetime import datetime
+from typing import Callable
 
 from pyinfra.api import QuoteString, StringCommand
 
@@ -32,6 +33,34 @@ def get_timestamp() -> str:
     return datetime.now().strftime("%y%m%d%H%M")
 
 
+_sed_ignore_case = re.compile("[iI]")
+
+
+def _sed_delete_builder(line: str, replace: str, flags: str, interpolate_variables: bool) -> str:
+    return (
+        '"/{0}/{1}d"' if interpolate_variables else  # fmt: skip
+        "'/{0}/{1}d'"
+    ).format(line, "I" if _sed_ignore_case.search(flags) else "")
+
+
+def sed_delete(
+    filename: str,
+    line: str,
+    replace: str,
+    flags: list[str] | None = None,
+    backup=False,
+    interpolate_variables=False,
+) -> StringCommand:
+    return _sed_command(**locals(), sed_script_builder=_sed_delete_builder)
+
+
+def _sed_replace_builder(line: str, replace: str, flags: str, interpolate_variables: bool) -> str:
+    return (
+        '"s/{0}/{1}/{2}"' if interpolate_variables else  # fmt: skip
+        "'s/{0}/{1}/{2}'"
+    ).format(line, replace, flags)
+
+
 def sed_replace(
     filename: str,
     line: str,
@@ -39,6 +68,20 @@ def sed_replace(
     flags: list[str] | None = None,
     backup=False,
     interpolate_variables=False,
+) -> StringCommand:
+    return _sed_command(**locals(), sed_script_builder=_sed_replace_builder)
+
+
+def _sed_command(
+    filename: str,
+    line: str,
+    replace: str,
+    flags: list[str] | None = None,
+    backup=False,
+    interpolate_variables=False,
+    # Python requires a default value here, so use _sed_replace_builder for
+    # backwards compatibility.
+    sed_script_builder: Callable[[str, str, str, bool], str] = _sed_replace_builder,
 ) -> StringCommand:
     flags_str = "".join(flags) if flags else ""
 
@@ -51,15 +94,13 @@ def sed_replace(
     if interpolate_variables:
         line = line.replace('"', '\\"')
         replace = replace.replace('"', '\\"')
-        sed_script_formatter = '"s/{0}/{1}/{2}"'
     else:
         # Single quotes cannot contain other single quotes, even when escaped , so turn
         # each ' into '"'"' (end string, double quote the single quote, (re)start string)
         line = line.replace("'", "'\"'\"'")
         replace = replace.replace("'", "'\"'\"'")
-        sed_script_formatter = "'s/{0}/{1}/{2}'"
 
-    sed_script = sed_script_formatter.format(line, replace, flags_str)
+    sed_script = sed_script_builder(line, replace, flags_str, interpolate_variables)
 
     sed_command = StringCommand(
         "sed",

{pyinfra-3.3.dist-info → pyinfra-3.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyinfra
-Version: 3.3
+Version: 3.4
 Summary: pyinfra automates/provisions/manages/deploys infrastructure.
 Home-page: https://pyinfra.com
 Author: Nick / Fizzadar
@@ -31,7 +31,6 @@ Requires-Dist: paramiko <4,>=2.7
 Requires-Dist: click >2
 Requires-Dist: jinja2 <4,>2
 Requires-Dist: python-dateutil <3,>2
-Requires-Dist: setuptools
 Requires-Dist: pywinrm
 Requires-Dist: typeguard
 Requires-Dist: distro <2,>=1.6
@@ -40,9 +39,11 @@ Requires-Dist: importlib-metadata >=3.6 ; python_version < "3.10"
 Requires-Dist: typing-extensions ; python_version < "3.11"
 Requires-Dist: graphlib-backport ; python_version < "3.9"
 Provides-Extra: dev
+Requires-Dist: click >=8.2 ; extra == 'dev'
 Requires-Dist: pytest ==8.3.5 ; extra == 'dev'
 Requires-Dist: coverage ==7.7.1 ; extra == 'dev'
 Requires-Dist: pytest-cov ==6.0.0 ; extra == 'dev'
+Requires-Dist: pytest-testinfra ==10.2.2 ; extra == 'dev'
 Requires-Dist: black ==25.1.0 ; extra == 'dev'
 Requires-Dist: isort ==6.0.1 ; extra == 'dev'
 Requires-Dist: flake8 ==7.1.2 ; extra == 'dev'
@@ -54,7 +55,6 @@ Requires-Dist: types-cryptography ; extra == 'dev'
 Requires-Dist: types-paramiko ; extra == 'dev'
 Requires-Dist: types-python-dateutil ; extra == 'dev'
 Requires-Dist: types-PyYAML ; extra == 'dev'
-Requires-Dist: types-setuptools ; extra == 'dev'
 Requires-Dist: pyinfra-guzzle-sphinx-theme ==0.17 ; extra == 'dev'
 Requires-Dist: myst-parser ==4.0.1 ; extra == 'dev'
 Requires-Dist: sphinx ==8.2.3 ; extra == 'dev'
@@ -70,9 +70,11 @@ Requires-Dist: pyinfra-guzzle-sphinx-theme ==0.17 ; extra == 'docs'
 Requires-Dist: myst-parser ==4.0.1 ; extra == 'docs'
 Requires-Dist: sphinx ==8.2.3 ; extra == 'docs'
 Provides-Extra: test
+Requires-Dist: click >=8.2 ; extra == 'test'
 Requires-Dist: pytest ==8.3.5 ; extra == 'test'
 Requires-Dist: coverage ==7.7.1 ; extra == 'test'
 Requires-Dist: pytest-cov ==6.0.0 ; extra == 'test'
+Requires-Dist: pytest-testinfra ==10.2.2 ; extra == 'test'
 Requires-Dist: black ==25.1.0 ; extra == 'test'
 Requires-Dist: isort ==6.0.1 ; extra == 'test'
 Requires-Dist: flake8 ==7.1.2 ; extra == 'test'
@@ -84,7 +86,6 @@ Requires-Dist: types-cryptography ; extra == 'test'
 Requires-Dist: types-paramiko ; extra == 'test'
 Requires-Dist: types-python-dateutil ; extra == 'test'
 Requires-Dist: types-PyYAML ; extra == 'test'
-Requires-Dist: types-setuptools ; extra == 'test'
 
 <p align="center">
     <a href="https://pyinfra.com">

{pyinfra-3.3.dist-info → pyinfra-3.4.dist-info}/RECORD

@@ -1,66 +1,66 @@
 pyinfra/__init__.py,sha256=7ZcKHGWk7_nYxsYrbFBB_vJr-J-Ddbc56ZS4sk5ArVw,535
 pyinfra/__main__.py,sha256=aVd00glLz5CMJGXgt1XxbOvC2HluqaowoTOjxgIpBaA,47
-pyinfra/context.py,sha256=CLUKJxvZm3VGtxMp6OlZnhYvZBGevSnJYemSDhQRd6E,3534
+pyinfra/context.py,sha256=HyJCarfQmbrdJ9Re_CNuzMwnfwINB3UFNz3chGatAdQ,3828
 pyinfra/local.py,sha256=wT84xkJc9UBN5isvIVbNpm2fzZaadwE-dkbAwaFQdZk,2808
 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=suGbKKM-qCduuXFYBEcyswlTqozewtYpdLRhK63PVn0,942
-pyinfra/api/arguments.py,sha256=GdkwOpBOUKCDer6gxXtChKmRD8iDr_1pQMXXv7jzfDw,10266
+pyinfra/api/arguments.py,sha256=-R1qdnwLZ79gJL8ggHTxQjz2vJgJDZN_ds42RjdcYBA,10014
 pyinfra/api/arguments_typed.py,sha256=IZuhpmDfW9CP6ASS5Ie-3Wcnxl6bDNR3egU4Mfhbsb4,2303
 pyinfra/api/command.py,sha256=NwF2syxV3zxCbBdHzvJ6ve5G-xwdNTjPHFPwguKVcYs,7741
 pyinfra/api/config.py,sha256=LhmMKOoAaawSsrSnl55BBj63oT-U-Wn8nwgbe43kzd0,9113
 pyinfra/api/connect.py,sha256=Z9wusMLR_jBkKKk5D4AUOj8LHl3H5MsNO5FxAeR4jac,1416
 pyinfra/api/connectors.py,sha256=nie7JuLxMSC6gqPjmjuCisQ11R-eAQDtMMWF6YbSQ48,659
-pyinfra/api/deploy.py,sha256=CllKp1QYLseeMStj35waZazB0hUuy3iGvDt7b_lH31M,3138
+pyinfra/api/deploy.py,sha256=Upd92oThQN0zhKbKW8vyPvBuoYiEGStuiEy7kNhZ00Y,3167
 pyinfra/api/exceptions.py,sha256=cCbUp1qN1QO0d9aAvOAbRgYpLi0vUI5j7ZqSjcD1_P8,1861
-pyinfra/api/facts.py,sha256=CoUtBfn5_O9oFHqwVEghQftH-Hc2XUBJI8LCEpn0nPc,9516
-pyinfra/api/host.py,sha256=KZr2ZvcCM3asrFkpKL25tQIGCr8lZFKTh1aoC2wIpyE,14002
-pyinfra/api/inventory.py,sha256=nPITdNEJ7q71adIqS_OKHsMjD7amUuHEuTl6xzgh1Gk,7734
-pyinfra/api/operation.py,sha256=tyslPCFmHDGydxf0Sv-QfDq1DzGGul9oOgKCXYEfusM,15194
+pyinfra/api/facts.py,sha256=Hh9YCrqOppHdeUegOzmg6qbik5X6EyHPzhg8O_oF_Sg,9146
+pyinfra/api/host.py,sha256=4a1bFR8vX8mUuXRZttXlzp2_ARzrg-xsH7n8uOxaaqQ,14098
+pyinfra/api/inventory.py,sha256=i_LBI-Gn5FF-9SVDBH6xefTtvFzjuz12QQiFPGK2TrQ,7864
+pyinfra/api/operation.py,sha256=_7R2piJDpkcUnC6rxbZjgkeGcWuwTHS5Aruboc8S-wI,15207
 pyinfra/api/operations.py,sha256=jvz9ISfwmQnAQVUKLnbrRdD9QHIAAfypo9l5b3fYG1w,10894
 pyinfra/api/state.py,sha256=IqdWT1Uwf_Rd5piqYLrf7y8HsXPs1hY6wCmxoRGqPTE,12630
-pyinfra/api/util.py,sha256=K4aFjGW7KAz2ZQqfRriRqyHMCQFFrX06WPola3epjaE,12410
+pyinfra/api/util.py,sha256=62l3eLUhbcHm5N-Y58i7g8-NtAxuXakeOymDBptTjQ4,12838
 pyinfra/connectors/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyinfra/connectors/base.py,sha256=0-BKInwTpjbnTakJhMTn_8LUOl81vUmC-q-HzVrwhkw,4703
 pyinfra/connectors/chroot.py,sha256=sQIM1nOLzyIvv7FsqgAZsZ71jJtWLAQB_uaeB4m4GqE,6007
-pyinfra/connectors/docker.py,sha256=bPbw9g9y5-WreD9drTRbDJ1x-CKuO-hgIDUZxuGc86s,9284
-pyinfra/connectors/dockerssh.py,sha256=sJxnmZ-xG19C9BSw6jx54zJhM3PH5ucmdTCZR2ywbrk,9007
-pyinfra/connectors/local.py,sha256=E57xCdBibo2M0IJQ7o6V5nTeBCCn_Bg6vmhydDhHagI,6976
-pyinfra/connectors/ssh.py,sha256=RF_0R8Vy8MFO8A6Eq-F3VjvZXVVWiN7dXVKaWt_5cww,21328
+pyinfra/connectors/docker.py,sha256=At68g9Fx62Wm9dum0GLmQRkk0sr5NCYHWM6Zlfxx1Gc,11960
+pyinfra/connectors/dockerssh.py,sha256=NGG6hSZ3z66RRKt6T0hnG2jiXFLR4P5uudi1COcGnY0,9021
+pyinfra/connectors/local.py,sha256=DJMmZiPgeYvZyW0ANvWjCxF3elmDlmolkY0ktTW3rcg,6990
+pyinfra/connectors/ssh.py,sha256=HmYHvPXVZKFsqWTtHzVrplyouk1ziv99hJN04ZUGeaY,21342
 pyinfra/connectors/ssh_util.py,sha256=CN_5AdTA3RpiWCnXTrRBjez1NsN59hITDzQmXIkZvoE,3683
-pyinfra/connectors/terraform.py,sha256=92KwojQKQhqRYuX3UE9ANRvj0Diwg3EEi6blTgu_LPk,4235
+pyinfra/connectors/terraform.py,sha256=j-a2yStBLdw1QLZRVnl_9TanDtdyujyCxBO2Oa00rPM,4289
 pyinfra/connectors/util.py,sha256=Up7kToERfcyjoayY9K6-Xdwjg4-SO2THAy7jzzcznJ8,11651
-pyinfra/connectors/vagrant.py,sha256=oEeRglzRmemRXW3vilsp_Xg9qnZMRprRJO9fd_C-f5M,4759
+pyinfra/connectors/vagrant.py,sha256=0TT73ks64I4Yl-JSZjMBbpWA3VYBkqqLB-fUS8pS8GY,4813
 pyinfra/connectors/sshuserclient/__init__.py,sha256=Qc4RO2wknSWIiNTwOeQ0y2TeiuKHmyWDW2Dz4MOo9CE,44
-pyinfra/connectors/sshuserclient/client.py,sha256=z4FpWJ9zX3TNdb1SM4g53m5XByADVSyu2A_oPcalj3I,10489
+pyinfra/connectors/sshuserclient/client.py,sha256=Ei2_mzCMNJopbpvpeLsdSiNb98rxEEy7uCOmpJbfd2o,10506
 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
 pyinfra/facts/apt.py,sha256=RYPqGgdH0QpDIoMNhBY9nKtMu-baQNX4DIYNrsllcLQ,4026
-pyinfra/facts/brew.py,sha256=vkl3tr9U6gyx3UDZzanz3WXmvpZ3HqBpUGUxkxdnjU4,2778
+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=yCpBzBqgXt2BjAGCIttuQ2xKKtuhzg0VQ9WCDV46eV8,5754
 pyinfra/facts/deb.py,sha256=1dR1puwY5wyyhhYYwaEBLjKU9sIyaNBNBlamVZ2KQg0,2074
 pyinfra/facts/dnf.py,sha256=IFOJWeXMLYxSZEgleOCMZaBIZOzJzklwCmemZIUwDmk,1059
-pyinfra/facts/docker.py,sha256=KCHz0onAHXOtMlF8ljG7AOrDS57ajhE5RJ34qnTT1VA,2626
+pyinfra/facts/docker.py,sha256=78jYZNUT6_9YFpECiULiBgSyt2stpqrnsrtL20zElx8,2772
 pyinfra/facts/efibootmgr.py,sha256=JPJSokE_RV9JstEPJRECnqSU-B0JCxmrocY8zBOva7M,3555
 pyinfra/facts/files.py,sha256=bnu3JSoWRdOR1Uxv9nBn1DbanBeF3kWet_rc-3Aj63s,15363
 pyinfra/facts/flatpak.py,sha256=ovi3duwTqqwvt5GoDRN7R-PpkvR6sQ1SmgEADcSnkUE,1646
 pyinfra/facts/freebsd.py,sha256=z7ZJRK8NV5HL-BfAdQs6pQKLEdrfdv7dVUmmOtVKUbA,2248
 pyinfra/facts/gem.py,sha256=aX2-vcEqkxUIP0UJ_SVp9bf4B944oyDjsuujjs5q_9w,654
-pyinfra/facts/git.py,sha256=os8zA2F8UbdX444VUedfL3zYFN_sKsumMjEo-H3isc4,1485
+pyinfra/facts/git.py,sha256=Zfzpdccsz2InviirJO17EkEFTVNqYQclSlXJIRFkD_s,1699
 pyinfra/facts/gpg.py,sha256=8fvC9AglzmO08SAT_Py6H6G0i73soO1D2cSCbw-O9JA,3923
-pyinfra/facts/hardware.py,sha256=JKyz3gZxSXPcVaMuH7iKHOww5a4kbZTiLIQbNmvkF2Q,12217
+pyinfra/facts/hardware.py,sha256=mta8hXPTlJ5j_5IdrXUfsDZAo4_89QjInuiT7DIxRYQ,12219
 pyinfra/facts/iptables.py,sha256=ORRExNnPR5ysymDbkUjeQWt9mzjSI7su4uQfsu3FlJQ,3506
 pyinfra/facts/launchd.py,sha256=Nl4EFbGwlXTj8GNWlS9UMZODHr63bve73xmMeqyf2gc,849
 pyinfra/facts/lxd.py,sha256=A2LQN5armY_nI6gV-m1j4l2J2_mMZnvVa1X2RntDnDk,548
 pyinfra/facts/mysql.py,sha256=ZVN6eN0Xetidvq_RAntSCzHgy4jmf8Enrm2mPXxO488,6247
 pyinfra/facts/npm.py,sha256=WzZHCfgWwY9WsPPzL0njlazwiBHI0gpvyZV93Nfu428,838
 pyinfra/facts/openrc.py,sha256=wB4fjzgWCgX6wexBm4jlWv4YH6b4z5_tAqQAO1qO9Kg,1614
-pyinfra/facts/opkg.py,sha256=o11yGcox2q5O8K_pvCxPqNywiV2lET9WJrgkeCU0Ahs,7390
+pyinfra/facts/opkg.py,sha256=yTPuzoUyDDn-o7H97lPtyPe-FOkYg5zqkVmfKt9HwY4,7404
 pyinfra/facts/pacman.py,sha256=SPI3jpzZbq_VnJ0z5q7A2Rw___EHVntOz6M19ErGpmQ,1324
 pyinfra/facts/pip.py,sha256=MA2yed2_kVzLNjCulnCJEz4GeQ5dbGVtaAv4Bqm9fLw,820
 pyinfra/facts/pipx.py,sha256=3-oP0yHWvi__RGRlgkQzRKQBMwZN3Ke9A-z8oYB5upM,1854
@@ -72,9 +72,9 @@ pyinfra/facts/postgresql.py,sha256=4nusMVvGhtku86KX4O4vjSxh_MamxZy_kmTQvvy0GhE,2
 pyinfra/facts/rpm.py,sha256=ikuKYiUmjgvPA84qfE-gbq4Iv4AB5cvor1uKU6uHbXQ,2391
 pyinfra/facts/runit.py,sha256=qok1FTSshiNrN603vjYTKOeM-NIlxwLbwOp-vPbPySo,2131
 pyinfra/facts/selinux.py,sha256=8OylQ3H-huktRS34g5FYwivlp1wb4mKP0EFVf1LtMEE,4679
-pyinfra/facts/server.py,sha256=peaK4q2MGhFoKkQGTJ20rU1P9_YPrLQKNPmmw2VqYbA,19678
+pyinfra/facts/server.py,sha256=_Th60Ya-P6Q89i7JDklzCn_jJ2Rb28i45riUbwTEjUM,21958
 pyinfra/facts/snap.py,sha256=2-c3z1qpOG7prmKJssLpOXmKo_wwdfROryro6gif2vo,2137
-pyinfra/facts/systemd.py,sha256=ua5ACLINcCwXv39gnU6HJuIYhQB896yi6-M6hSuUtsU,4309
+pyinfra/facts/systemd.py,sha256=meHXURtnoxeJbmPzWFTwvhjQBZ2NlQCY8Tj-oHTG_dI,4320
 pyinfra/facts/sysvinit.py,sha256=q1OpHATFJxjLwatcnYRfpTR7_K2c29b4ppmZu-wgC-4,1589
 pyinfra/facts/upstart.py,sha256=GcreN0mIM6_qRgqzFaA7PnX45RtbBpvVC00J6bKujyA,717
 pyinfra/facts/vzctl.py,sha256=lUacmyakn2sJ2tD2FDAh1eeX3sxEVq7aRRwWM4QTguQ,760
@@ -94,13 +94,13 @@ pyinfra/operations/brew.py,sha256=aghLE4qyuhhRbt6fgSPV6_5fyWgTohA77Dc0gol19UU,51
 pyinfra/operations/bsdinit.py,sha256=okQUQDr2H8Z-cAdfdbPJiuGujsHLuV5gpuMZ1UlICEM,1648
 pyinfra/operations/cargo.py,sha256=mXWd6pb0IR6kzJMmPHwXZN-VJ-B_y8AdOFlrRzDQOZI,1104
 pyinfra/operations/choco.py,sha256=8nG0wc1tZEA0L0HTIjgR00IDiONARokyzHyKj-R3xmo,1515
-pyinfra/operations/crontab.py,sha256=qhYzj9xh-A6p95sJ0i_DDKOIm7WoNgiPjcR43ZB9iv8,6454
+pyinfra/operations/crontab.py,sha256=tdgOSKTO71Nxto6rcBbuDZQRfzBYrR-ucp73M0hadS8,6551
 pyinfra/operations/dnf.py,sha256=3154Rer6dejVB1AK-CqyJhpMVn_djaSDJrVMs62GNcE,5599
-pyinfra/operations/docker.py,sha256=lU0AQqfIQYPHniruu770ClQODUSMuPVhFdIKy9gGmbw,8455
-pyinfra/operations/files.py,sha256=Hs_HKU2STE0Byt-fZHdsfcrhM6m82mzAELMA22b_X_c,56215
-pyinfra/operations/flatpak.py,sha256=c2OAyuAvt3alVm9D8W6gCfmk5JFydcZD36gO_OhB8Bc,1891
+pyinfra/operations/docker.py,sha256=39MFhUs1edbzbG8ejR-r3-xczeV8op7kFerk6qQieoU,8520
+pyinfra/operations/files.py,sha256=ZnHsZ-qcvVO_boHnpAT-yvzL_F8j4NTiFY5KkeFCzIE,57814
+pyinfra/operations/flatpak.py,sha256=QEJpzSXLyMQFk1XPAPHAfJVWcYWHnKA-tQr2hX6sB9o,2319
 pyinfra/operations/gem.py,sha256=2C85sOwIRMHGvmPg4uAlUVf6MokhiA7LLPqzdJRHsBg,1132
-pyinfra/operations/git.py,sha256=ajyusK8rFeU_u3piR3glzJGLhomKF0IuzlbR667eyts,13035
+pyinfra/operations/git.py,sha256=ETENOkGfs9Io27mguK8tlRn0Zbw0eTvtFvRaE2H6Bsk,13236
 pyinfra/operations/iptables.py,sha256=brYa4kMhZKFTu24BNds_1b6sOaG94EfqWEoWrScx-Ck,9341
 pyinfra/operations/launchd.py,sha256=6HWvqoQ74idV_NStOEmFXwu0dmTv7YDvFtsK8An2Lu4,1177
 pyinfra/operations/lxd.py,sha256=bKm9gsgZaruKYSL7OYFMiou-wGP4BzwIMWzjW4AZYrk,1742
@@ -119,7 +119,7 @@ pyinfra/operations/puppet.py,sha256=eDe8D9jQbHYQ4_r4-dmEZfMASKQvj36BR8z_h8aDfw8,
 pyinfra/operations/python.py,sha256=u569cdPrPesrmzU09nwIPA3bk6TZ-Qv2QP0lJLcO_bw,2021
 pyinfra/operations/runit.py,sha256=-K0GhORE56J4Gjh7PCriSx9zZI7XJV-cIb-LnnSuKdY,5162
 pyinfra/operations/selinux.py,sha256=imZ4dbY4tl0GpBSkUgV983jbDDihWNs_OQkOBulT7FQ,5948
-pyinfra/operations/server.py,sha256=6OkfbEH5jWltXjiQkXoq_82UidHPB551dL6TyxCfzr8,30733
+pyinfra/operations/server.py,sha256=EFZ1QYnySpe0ufVzJC6x-Jj3Xt_XPIic0IkCzdcIUws,31248
 pyinfra/operations/snap.py,sha256=a-QtNE4Dlsavqq425TUIwpEJu4oGw8UlLRkdTFyT1F8,3049
 pyinfra/operations/ssh.py,sha256=wocoaYDlOhhItItAVQCEfnVowTtkg3AP0hQ3mnpUnl0,5634
 pyinfra/operations/systemd.py,sha256=hPHTjASj6N_fRAzLr3DNHnxxIbiiTIIT9UStSxKDkTk,3984
@@ -136,52 +136,52 @@ 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=WUyn2BZGClBwQDNTNNM3UNOX64YkpD4JMGk3lBufMTg,5285
-pyinfra/operations/util/files.py,sha256=Zcet3ydNVbdT9jss0BDm6RJFyR_s6XTr0isDR60Zubw,3622
+pyinfra/operations/util/docker.py,sha256=LetDzYhB4jgNPT5ccYf6Wk1--XQuwN_pcNBe8tcJJIU,5485
+pyinfra/operations/util/files.py,sha256=BH2My7PeB9OWoW6UYhRSEwCm9_y6G6qa6BTdSxbf0YA,4817
 pyinfra/operations/util/packaging.py,sha256=xFtOlEX46ms7g3gDvOOInRVR1RVfgsmhLzFzsJAL_eU,9381
 pyinfra/operations/util/service.py,sha256=kJd1zj4-sAaGIp5Ts7yAJznogWaGr8oQTztwenLAr7Y,1309
 pyinfra_cli/__init__.py,sha256=G0X7tNdqT45uWuK3aHIKxMdDeCgJ7zHo6vbxoG6zy_8,284
 pyinfra_cli/__main__.py,sha256=WlW7eP0rrL06eguuD_q2RAqgUjg3SW-QnmrayAh2mBQ,887
 pyinfra_cli/commands.py,sha256=J-mCJYvDebJ8M7o3HreB2zToa871-xO6_KjVhPLeHho,1832
 pyinfra_cli/exceptions.py,sha256=RRaOprL7SmVv--FLy4x7fxeTitx9wYI0Y3_h01LfhJA,4901
-pyinfra_cli/inventory.py,sha256=05Z0LpMW8Qt3c2X2sx-roYCQGxNlEDD0RgZILpXCcJs,11768
+pyinfra_cli/inventory.py,sha256=JYSixJZKY8GNWlOxh-nGDsAknCdaAktlWAmdg13kvNk,11771
 pyinfra_cli/log.py,sha256=mD96MH2owQQ5AsYRw7osCKENdp-E3Wum5IDr6qhSIa4,2268
-pyinfra_cli/main.py,sha256=PyofivS-dRF8Sfq-PIy7_GrJKKAdmucZ0IbtkNlcHy4,20085
+pyinfra_cli/main.py,sha256=_cW7PNVxMjwEl8IA8GSU15XrMCvFapFurnqDVCHgt2E,20111
 pyinfra_cli/prints.py,sha256=eaLRQAdiVGmPR2GsHF_fCY706aSt5JyXxz42z6qLAFM,10299
 pyinfra_cli/util.py,sha256=9ehdJQ8pDNBLHXoFst9p696VDT-b_qo8UFMJrqdE1rE,6424
 pyinfra_cli/virtualenv.py,sha256=wRNxOPcUkbD_Pzuj-Lnrz1KxGmsLlb2ObmCTFrdD-S8,2474
 tests/test_api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/test_api/test_api.py,sha256=Ig2ebkNACYbHcC4_zRkxS9vj5ZEogoPqGx30ErIKChg,2413
-tests/test_api/test_api_arguments.py,sha256=5k7w0_x5cnABEFOk0LQBCt5gU9iTN9lo2XS6MlJTnhQ,1961
+tests/test_api/test_api_arguments.py,sha256=w9hEL0M_2Ob0VV11DvbjGuq_NvwNMuQcMOB2_ZlZ_ao,2181
 tests/test_api/test_api_command.py,sha256=OW0ESMyS5vo38u17DHeCrSIaIkW9gMU5PSkXL7mRrq0,3204
 tests/test_api/test_api_config.py,sha256=bf0mDrUie3On6zGC_hJBpv-wvSf3LHBIBzUDvkopEt0,708
 tests/test_api/test_api_deploys.py,sha256=h_zbI6CK4K8SdzEr3LEAMPxOf9hnQBdi_suqiNPqHHQ,4200
-tests/test_api/test_api_facts.py,sha256=WnKwgLq7sk2LNO5IgIZbO5HRkDr-2GdUWO_EFfTjhO8,10695
+tests/test_api/test_api_facts.py,sha256=_Z3g5mN3PJdqVGHYxwNUBqPoe6FZBiJEjBEJ0zS9EtY,11047
 tests/test_api/test_api_host.py,sha256=U_VW2vTl35vR8EdyIGMKr4y0ydsDLbvHSjZDa99CyNE,1119
 tests/test_api/test_api_inventory.py,sha256=rqXd3e_Wwc-SxCzxgR5eLd7ZOdrF8CcHbcTZndLy5gE,2744
-tests/test_api/test_api_operations.py,sha256=GUfnuHK2NoTAGdOT4AbytT9R8i3ZZIvGP7KBfoYcYUQ,20134
+tests/test_api/test_api_operations.py,sha256=5x4UJspW12_z3HNe5NcivnPXeGfLdmgC13V5iUTUxyw,20385
 tests/test_api/test_api_util.py,sha256=uHv4oLpoy1_tzOoqFA1zpdvC74SvjitZbxQwp0dmjTs,1716
 tests/test_cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tests/test_cli/test_cli.py,sha256=IeWuhkhLzIkRbOEx5-yaW6xV5l4Y8fxaGaDGlMcOyYE,6016
+tests/test_cli/test_cli.py,sha256=I9QMrp0xI_5p2N3ZyeNBBcPTUNkPVDdQvlWM860YIwM,6016
 tests/test_cli/test_cli_deploy.py,sha256=vZC7twj8sPCy05loO50P-D_Xf73r6XN4m7yVj7TIFmo,5243
 tests/test_cli/test_cli_exceptions.py,sha256=QaUv40q6Tp0HdcVEvPggFF4dsP2qdy57y9VAcGcR1So,3060
-tests/test_cli/test_cli_inventory.py,sha256=feYSyxGBUsDGriOaqs0CBMbAIW7yUfoT1mktLwqMI0w,4036
+tests/test_cli/test_cli_inventory.py,sha256=FD4Hc4MzOfnrZTugVeNPOBf7bvE1degpDWQf5s6LZAg,4036
 tests/test_cli/test_cli_util.py,sha256=Fqn_9fnG6xNfw8OMHSZs9hQoW260aSt409S1bUAJs-Q,2500
-tests/test_cli/test_context_objects.py,sha256=JiUTwQP7yvcqA47Kq9jtdsB_Z8nxGMZN46d9pR--FYA,2130
+tests/test_cli/test_context_objects.py,sha256=dTr7WPewTk-Z8ZbPRPX5o5DKBne1-jUwOncFWjTWhII,2259
 tests/test_cli/util.py,sha256=kp_-XsGnTyDgG6IHWorYzl5VD_WLe77dKOH007TDOUE,338
 tests/test_connectors/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/test_connectors/test_chroot.py,sha256=QK7YgFPXzHh8y363-tmHvzZ0Ok5PVJWFTDAvwt91eac,5907
-tests/test_connectors/test_docker.py,sha256=0EjkfhCHpLCfL4X-AIdMNw5ASaseY0tbRAn7T_TAkMQ,6566
+tests/test_connectors/test_docker.py,sha256=vYt-rZl05uXi5fH6IgkcP7EGtR1FRDQQdwyquk1ygoc,8313
 tests/test_connectors/test_dockerssh.py,sha256=MaC9IK1OZDiqoIsuLOZBJnPDglsMoPDoL19LQtXsyCE,9303
 tests/test_connectors/test_local.py,sha256=N_FkejDZKu7XLnKeApqfBARYMyxf-hRXCQJrXLHvwRg,7442
-tests/test_connectors/test_ssh.py,sha256=YeCZtYDogm6M8xSFXjNXXmfgMGOH-0fzTeRaNXyOAtU,42995
-tests/test_connectors/test_sshuserclient.py,sha256=Rm1zxSODDXQXuQ3qdkCA12FCUj7Zkgwwe-s2UrsZAoE,8599
+tests/test_connectors/test_ssh.py,sha256=XsfzS1OGzPtkzswThkUw6JR8osFCRvMI9_6OgLziYSM,44856
+tests/test_connectors/test_sshuserclient.py,sha256=_anSd1cVQGIQkn08RdRbWjnSEkSS5InVkp6_HVvoVYk,8714
 tests/test_connectors/test_terraform.py,sha256=RZInSjes394eR5CrGGEjzZEFY-UpQj47n4MZH0_ExyY,3779
 tests/test_connectors/test_util.py,sha256=hQir0WyjH0LEF6xvIyHNyqdI5pkJX6qUR9287MgO2bY,4647
 tests/test_connectors/test_vagrant.py,sha256=27qRB7ftjEPaj4ejBNZ-rR4Ou1AD1VyVcf2XjwZPG3M,3640
-pyinfra-3.3.dist-info/LICENSE.md,sha256=BzCnRYLJv0yb-FJuEd_XOrrQSOEQKzIVo0yHT8taNnM,1076
-pyinfra-3.3.dist-info/METADATA,sha256=altc2EhdZvDuH_4Nbn_T4yocK5cA7feHsKONJBvEm4E,8054
-pyinfra-3.3.dist-info/WHEEL,sha256=DZajD4pwLWue70CAfc7YaxT1wLUciNBvN_TTcvXpltE,110
-pyinfra-3.3.dist-info/entry_points.txt,sha256=BraEFyquy05M8ch33HZXOHoH_m2BTqejL3xX3NrpzOM,471
-pyinfra-3.3.dist-info/top_level.txt,sha256=2K6D1mK35JTSEBgOfEPV-N-uA2SDErxGiE0J-HUMMVI,26
-pyinfra-3.3.dist-info/RECORD,,
+pyinfra-3.4.dist-info/LICENSE.md,sha256=BzCnRYLJv0yb-FJuEd_XOrrQSOEQKzIVo0yHT8taNnM,1076
+pyinfra-3.4.dist-info/METADATA,sha256=OgZy8dxZfcjuGsrJM8J_aZVOHOX0O8M4GxycFOhUyxo,8135
+pyinfra-3.4.dist-info/WHEEL,sha256=DZajD4pwLWue70CAfc7YaxT1wLUciNBvN_TTcvXpltE,110
+pyinfra-3.4.dist-info/entry_points.txt,sha256=MT4cxTreOa_MzKgyPXk2BkeQ-KKcF1P8PJQe4vLQDaw,522
+pyinfra-3.4.dist-info/top_level.txt,sha256=2K6D1mK35JTSEBgOfEPV-N-uA2SDErxGiE0J-HUMMVI,26
+pyinfra-3.4.dist-info/RECORD,,

{pyinfra-3.3.dist-info → pyinfra-3.4.dist-info}/entry_points.txt

@@ -6,6 +6,7 @@ chroot = pyinfra.connectors.chroot:ChrootConnector
 docker = pyinfra.connectors.docker:DockerConnector
 dockerssh = pyinfra.connectors.dockerssh:DockerSSHConnector
 local = pyinfra.connectors.local:LocalConnector
+podman = pyinfra.connectors.docker:PodmanConnector
 ssh = pyinfra.connectors.ssh:SSHConnector
 terraform = pyinfra.connectors.terraform:TerraformInventoryConnector
 vagrant = pyinfra.connectors.vagrant:VagrantInventoryConnector

pyinfra_cli/inventory.py

@@ -172,7 +172,7 @@ def make_inventory(
         # The inventory is either an inventory file or a (list of) hosts
         return make_inventory_from_files(inventory, override_data, cwd, group_data_directories)
     elif inventory_func is None:
-        logger.warn(
+        logger.warning(
             f"{inventory} is neither an inventory file, a (list of) hosts or connectors "
             "nor refers to a python module"
         )

pyinfra_cli/main.py

@@ -515,10 +515,12 @@ def _set_verbosity(state, verbosity):
         state.print_noop_info = True
 
     if verbosity > 1:
-        state.print_input = state.print_fact_input = True
+        state.print_input = True
+        state.print_fact_input = True
 
     if verbosity > 2:
-        state.print_output = state.print_fact_output = True
+        state.print_output = True
+        state.print_fact_output = True
 
     return state
 

tests/test_api/test_api_arguments.py

@@ -1,7 +1,8 @@
+from typing import cast
 from unittest import TestCase
 
-from pyinfra.api import Config, Inventory, State
-from pyinfra.api.arguments import pop_global_arguments
+from pyinfra.api import Config, Host, Inventory, State
+from pyinfra.api.arguments import AllArguments, pop_global_arguments
 
 
 class TestOperationKwargs(TestCase):
@@ -10,46 +11,50 @@ class TestOperationKwargs(TestCase):
         inventory = Inventory((("somehost",), {}))
 
         state = State(config=config, inventory=inventory)
+        host = inventory.get_host("somehost")
 
-        kwargs, keys = pop_global_arguments({}, state=state, host=inventory.get_host("somehost"))
-        assert kwargs["_sudo"] == "config-value"
+        kwargs, _ = pop_global_arguments(state, host, {})
+        assert kwargs.get("_sudo") == "config-value"
 
     def test_get_from_host(self):
         config = Config(SUDO="config-value")
         inventory = Inventory(([("somehost", {"_sudo": True})], {}))
 
         state = State(config=config, inventory=inventory)
+        host = inventory.get_host("somehost")
 
-        kwargs, keys = pop_global_arguments({}, state=state, host=inventory.get_host("somehost"))
-        assert kwargs["_sudo"] is True
+        kwargs, _ = pop_global_arguments(state, host, {})
+        assert kwargs.get("_sudo") is True
 
     def test_get_from_state_deploy_kwargs(self):
         config = Config(SUDO="config-value")
         inventory = Inventory(([("somehost", {"_sudo": False})], {}))
         somehost = inventory.get_host("somehost")
+        assert isinstance(somehost, Host)
 
         state = State(config=config, inventory=inventory)
-        somehost.current_deploy_kwargs = {"_sudo": True}
+        host = inventory.get_host("somehost")
+        somehost.current_deploy_kwargs = cast(AllArguments, {"_sudo": True})
 
-        kwargs, keys = pop_global_arguments({}, state=state, host=somehost)
-        assert kwargs["_sudo"] is True
+        kwargs, keys = pop_global_arguments(state, host, {})
+        assert kwargs.get("_sudo") is True
 
     def test_get_from_kwargs(self):
         config = Config(SUDO="config-value")
         inventory = Inventory(([("somehost", {"_sudo": False})], {}))
         somehost = inventory.get_host("somehost")
+        assert isinstance(somehost, Host)
 
         state = State(config=config, inventory=inventory)
-        somehost.current_deploy_kwargs = {
-            "_sudo": False,
-            "_sudo_user": "deploy-kwarg-user",
-        }
-
-        kwargs, keys = pop_global_arguments(
-            {"_sudo": True},
-            state=state,
-            host=somehost,
+        somehost.current_deploy_kwargs = cast(
+            AllArguments,
+            {
+                "_sudo": False,
+                "_sudo_user": "deploy-kwarg-user",
+            },
         )
-        assert kwargs["_sudo"] is True
-        assert kwargs["_sudo_user"] == "deploy-kwarg-user"
+
+        kwargs, keys = pop_global_arguments(state, somehost, {"_sudo": True})
+        assert kwargs.get("_sudo") is True
+        assert kwargs.get("_sudo_user") == "deploy-kwarg-user"
         assert "_sudo" in keys