pyinfra 2.9.2__py2.py3-none-any.whl → 3.0b1__py2.py3-none-any.whl

pyinfra/operations/brew.py

@@ -35,7 +35,7 @@ def upgrade():
 _upgrade = upgrade  # noqa: E305
 
 
-@operation
+@operation()
 def packages(
     packages=None,
     present=True,
@@ -75,10 +75,10 @@ def packages(
     """
 
     if update:
-        yield from _update()
+        yield from _update._inner()
 
     if upgrade:
-        yield from _upgrade()
+        yield from _upgrade._inner()
 
     yield from ensure_packages(
         host,
@@ -97,10 +97,7 @@ def cask_args(host):
     return ("", " --cask") if new_cask_cli(host.get_fact(BrewVersion)) else ("cask ", "")
 
 
-@operation(
-    is_idempotent=False,
-    pipeline_facts={"brew_version": ""},
-)
+@operation(is_idempotent=False)
 def cask_upgrade():
     """
     Upgrades all brew casks.
@@ -109,9 +106,7 @@ def cask_upgrade():
     yield "brew %supgrade%s" % cask_args(host)
 
 
-@operation(
-    pipeline_facts={"brew_version": ""},
-)
+@operation()
 def casks(
     casks=None,
     present=True,
@@ -143,7 +138,7 @@ def casks(
     """
 
     if upgrade:
-        yield from cask_upgrade()
+        yield from cask_upgrade._inner()
 
     args = cask_args(host)
 
@@ -160,7 +155,7 @@ def casks(
     )
 
 
-@operation
+@operation()
 def tap(src=None, present=True, url=None):
     """
     Add/remove brew taps.
@@ -219,7 +214,6 @@ def tap(src=None, present=True, url=None):
 
     if already_tapped:
         yield "brew untap {0}".format(src)
-        taps.remove(src)
         return
 
     if not present:
@@ -232,5 +226,4 @@ def tap(src=None, present=True, url=None):
         cmd = " ".join([cmd, url])
 
     yield cmd
-    taps.append(src)
     return

pyinfra/operations/bsdinit.py

@@ -11,7 +11,7 @@ from . import files
 from .util.service import handle_service_control
 
 
-@operation
+@operation()
 def service(
     service,
     running=True,
@@ -49,9 +49,9 @@ def service(
 
     # BSD init is simple, just add/remove <service>_enabled="YES"
     if isinstance(enabled, bool):
-        yield from files.line(
-            "/etc/rc.conf.local",
-            "^{0}_enable=".format(service),
+        yield from files.line._inner(
+            path="/etc/rc.conf.local",
+            line="^{0}_enable=".format(service),
             replace='{0}_enable="YES"'.format(service),
             present=enabled,
         )

pyinfra/operations/cargo.py

@@ -9,7 +9,7 @@ from pyinfra.facts.cargo import CargoPackages
 from .util.packaging import ensure_packages
 
 
-@operation
+@operation()
 def packages(packages=None, present=True, latest=False):
     """
     Install/remove/update cargo packages.

pyinfra/operations/choco.py

@@ -9,7 +9,7 @@ from pyinfra.facts.choco import ChocoPackages
 from .util.packaging import ensure_packages
 
 
-@operation
+@operation()
 def packages(packages=None, present=True, latest=False):
     """
     Add/remove/update ``choco`` packages.

pyinfra/operations/dnf.py

@@ -35,7 +35,7 @@ def key(src):
     yield "rpm --import {0}".format(src)
 
 
-@operation
+@operation()
 def repo(
     src,
     present=True,
@@ -94,7 +94,7 @@ def repo(
     )
 
 
-@operation
+@operation()
 def rpm(src, present=True):
     # NOTE: if updating this docstring also update `yum.rpm`
     """
@@ -130,10 +130,10 @@ def update():
     yield "dnf update -y"
 
 
-_update = update  # noqa: E305 (for use below where update is a kwarg)
+_update = update._inner  # noqa: E305 (for use below where update is a kwarg)
 
 
-@operation
+@operation()
 def packages(
     packages=None,
     present=True,