pyinfra 3.0b0__py2.py3-none-any.whl → 3.0b2__py2.py3-none-any.whl

pyinfra/operations/apt.py

@@ -2,6 +2,8 @@
 Manage apt packages and repositories.
 """
 
+from __future__ import annotations
+
 from datetime import timedelta
 from urllib.parse import urlparse
 
@@ -19,7 +21,7 @@ from .util.packaging import ensure_packages
 APT_UPDATE_FILENAME = "/var/lib/apt/periodic/update-success-stamp"
 
 
-def noninteractive_apt(command, force=False):
+def noninteractive_apt(command: str, force=False):
     args = ["DEBIAN_FRONTEND=noninteractive apt-get -y"]
 
     if force:
@@ -37,7 +39,7 @@ def noninteractive_apt(command, force=False):
 
 
 @operation()
-def key(src=None, keyserver=None, keyid=None):
+def key(src: str | None = None, keyserver: str | None = None, keyid: str | list[str] | None = None):
     """
     Add apt gpg keys with ``apt-key``.
 
@@ -103,7 +105,7 @@ def key(src=None, keyserver=None, keyid=None):
 
 
 @operation()
-def repo(src, present=True, filename=None):
+def repo(src: str, present=True, filename: str | None = None):
     """
     Add/remove apt repositories.
 
@@ -162,7 +164,7 @@ def repo(src, present=True, filename=None):
 
 
 @operation(is_idempotent=False)
-def ppa(src, present=True):
+def ppa(src: str, present=True):
     """
     Add/remove Ubuntu ppa repositories.
 
@@ -192,7 +194,7 @@ def ppa(src, present=True):
 
 
 @operation()
-def deb(src, present=True, force=False):
+def deb(src: str, present=True, force=False):
     """
     Add/remove ``.deb`` file packages.
 
@@ -233,18 +235,14 @@ def deb(src, present=True, force=False):
         src = temp_filename
 
     # Check for file .deb information (if file is present)
-    info = host.get_fact(DebPackage, name=src)
+    info = host.get_fact(DebPackage, package=src)
     current_packages = host.get_fact(DebPackages)
 
     exists = False
 
     # We have deb info! Check against installed packages
-    if info:
-        if (
-            info["name"] in current_packages
-            and info.get("version") in current_packages[info["name"]]
-        ):
-            exists = True
+    if info and info.get("version") in current_packages.get(info.get("name"), {}):
+        exists = True
 
     # Package does not exist and we want?
     if present:
@@ -277,7 +275,7 @@ def deb(src, present=True, force=False):
         "unless the ``cache_time`` argument is provided."
     ),
 )
-def update(cache_time=None):
+def update(cache_time: int | None = None):
     """
     Updates apt repositories.
 
@@ -335,7 +333,7 @@ def upgrade(auto_remove: bool = False):
 
         # Upgrade all packages and remove unneeded transitive dependencies
         apt.upgrade(
-            name="Upgrade apt packages and remove unneeded dependencies"
+            name="Upgrade apt packages and remove unneeded dependencies",
             auto_remove=True
         )
     """
@@ -370,17 +368,17 @@ def dist_upgrade():
 
 @operation()
 def packages(
-    packages=None,
+    packages: str | list[str] | None = None,
     present=True,
     latest=False,
     update=False,
-    cache_time=None,
+    cache_time: int | None = None,
     upgrade=False,
     force=False,
     no_recommends=False,
     allow_downgrades=False,
-    extra_install_args=None,
-    extra_uninstall_args=None,
+    extra_install_args: str | None = None,
+    extra_uninstall_args: str | None = None,
 ):
     """
     Install/remove/update packages & update apt.

pyinfra/operations/brew.py

@@ -2,7 +2,9 @@
 Manage brew packages on mac/OSX. See https://brew.sh/
 """
 
-import urllib
+from __future__ import annotations
+
+import urllib.parse
 
 from pyinfra import host
 from pyinfra.api import operation
@@ -37,7 +39,7 @@ _upgrade = upgrade  # noqa: E305
 
 @operation()
 def packages(
-    packages=None,
+    packages: str | list[str] | None = None,
     present=True,
     latest=False,
     update=False,
@@ -93,7 +95,7 @@ def packages(
     )
 
 
-def cask_args(host):
+def cask_args():
     return ("", " --cask") if new_cask_cli(host.get_fact(BrewVersion)) else ("cask ", "")
 
 
@@ -103,12 +105,12 @@ def cask_upgrade():
     Upgrades all brew casks.
     """
 
-    yield "brew %supgrade%s" % cask_args(host)
+    yield "brew %supgrade%s" % cask_args()
 
 
 @operation()
 def casks(
-    casks=None,
+    casks: str | list[str] | None = None,
     present=True,
     latest=False,
     upgrade=False,
@@ -140,7 +142,7 @@ def casks(
     if upgrade:
         yield from cask_upgrade._inner()
 
-    args = cask_args(host)
+    args = cask_args()
 
     yield from ensure_packages(
         host,
@@ -156,7 +158,7 @@ def casks(
 
 
 @operation()
-def tap(src=None, present=True, url=None):
+def tap(src: str | None = None, present=True, url: str | None = None):
     """
     Add/remove brew taps.
 
@@ -199,7 +201,7 @@ def tap(src=None, present=True, url=None):
         host.noop("no tap was specified")
         return
 
-    src = src or urllib.parse.urlparse(url).path.strip("/")
+    src = src or str(urllib.parse.urlparse(url).path).strip("/")
 
     if len(src.split("/")) != 2:
         host.noop("src '{0}' doesn't have two components.".format(src))

pyinfra/operations/bsdinit.py

@@ -2,6 +2,8 @@
 Manage BSD init services (``/etc/rc.d``, ``/usr/local/etc/rc.d``).
 """
 
+from __future__ import annotations
+
 from pyinfra import host
 from pyinfra.api import operation
 from pyinfra.facts.bsdinit import RcdStatus
@@ -13,12 +15,12 @@ from .util.service import handle_service_control
 
 @operation()
 def service(
-    service,
+    service: str,
     running=True,
     restarted=False,
     reloaded=False,
-    command=None,
-    enabled=None,
+    command: str | None = None,
+    enabled: bool | None = None,
 ):
     """
     Manage the state of BSD init services.

pyinfra/operations/cargo.py

@@ -2,6 +2,8 @@
 Manage cargo (aka Rust) packages.
 """
 
+from __future__ import annotations
+
 from pyinfra import host
 from pyinfra.api import operation
 from pyinfra.facts.cargo import CargoPackages
@@ -10,7 +12,7 @@ from .util.packaging import ensure_packages
 
 
 @operation()
-def packages(packages=None, present=True, latest=False):
+def packages(packages: str | list[str] | None = None, present=True, latest=False):
     """
     Install/remove/update cargo packages.
 

pyinfra/operations/choco.py

@@ -2,6 +2,8 @@
 Manage ``choco`` (Chocolatey) packages (https://chocolatey.org).
 """
 
+from __future__ import annotations
+
 from pyinfra import host
 from pyinfra.api import operation
 from pyinfra.facts.choco import ChocoPackages
@@ -10,7 +12,7 @@ from .util.packaging import ensure_packages
 
 
 @operation()
-def packages(packages=None, present=True, latest=False):
+def packages(packages: str | list[str] | None = None, present=True, latest=False):
     """
     Add/remove/update ``choco`` packages.
 

pyinfra/operations/dnf.py

@@ -2,16 +2,17 @@
 Manage dnf packages and repositories. Note that dnf package names are case-sensitive.
 """
 
+from __future__ import annotations
+
 from pyinfra import host, state
 from pyinfra.api import operation
 from pyinfra.facts.rpm import RpmPackageProvides, RpmPackages
 
-from . import files
 from .util.packaging import ensure_packages, ensure_rpm, ensure_yum_repo
 
 
 @operation(is_idempotent=False)
-def key(src):
+def key(src: str):
     """
     Add dnf gpg keys with ``rpm``.
 
@@ -37,19 +38,19 @@ def key(src):
 
 @operation()
 def repo(
-    src,
+    src: str,
     present=True,
-    baseurl=None,
-    description=None,
+    baseurl: str | None = None,
+    description: str | None = None,
     enabled=True,
     gpgcheck=True,
-    gpgkey=None,
+    gpgkey: str | None = None,
 ):
     # NOTE: if updating this docstring also update `yum.repo`
     """
     Add/remove/update dnf repositories.
 
-    + name: URL or name for the ``.repo``   file
+    + src: URL or name for the ``.repo``   file
     + present: whether the ``.repo`` file should be present
     + baseurl: the baseurl of the repo (if ``name`` is not a URL)
     + description: optional verbose description
@@ -81,9 +82,7 @@ def repo(
     """
 
     yield from ensure_yum_repo(
-        state,
         host,
-        files,
         src,
         baseurl,
         present,
@@ -95,7 +94,7 @@ def repo(
 
 
 @operation()
-def rpm(src, present=True):
+def rpm(src: str, present=True):
     # NOTE: if updating this docstring also update `yum.rpm`
     """
     Add/remove ``.rpm`` file packages.
@@ -118,7 +117,7 @@ def rpm(src, present=True):
         )
     """
 
-    yield from ensure_rpm(state, host, files, src, present, "dnf")
+    yield from ensure_rpm(state, host, src, present, "dnf")
 
 
 @operation(is_idempotent=False)
@@ -135,19 +134,19 @@ _update = update._inner  # noqa: E305 (for use below where update is a kwarg)
 
 @operation()
 def packages(
-    packages=None,
+    packages: str | list[str] | None = None,
     present=True,
     latest=False,
     update=False,
     clean=False,
     nobest=False,
-    extra_install_args=None,
-    extra_uninstall_args=None,
+    extra_install_args: str | None = None,
+    extra_uninstall_args: str | None = None,
 ):
     """
     Install/remove/update dnf packages & updates.
 
-    + packages: list of packages to ensure
+    + packages: packages to ensure
     + present: whether the packages should be installed
     + latest: whether to upgrade packages without a specified version
     + update: run ``dnf update`` before installing packages
@@ -207,8 +206,5 @@ def packages(
         upgrade_command="dnf update -y",
         version_join="=",
         latest=latest,
-        expand_package_fact=lambda package: host.get_fact(
-            RpmPackageProvides,
-            name=package,
-        ),
+        expand_package_fact=lambda package: host.get_fact(RpmPackageProvides, package=package),
     )