bump versions and modernize

Author: infothrill

.github/workflows/tests.yml

@@ -10,10 +10,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:  # https://github.com/actions/runner-images#available-images
-        os: [macos-10.15, macos-11, macos-12]
+        os: [macos-14, macos-15, macos-26]
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+      - uses: actions/checkout@v6
       - name: Install dependencies
         run: |
           python3 --version

.pre-commit-config.yaml

@@ -1,15 +1,19 @@
 ---
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.4.0
+    rev: v6.0.0
     hooks:
       - id: check-ast
-      - id: check-byte-order-marker
+      - id: fix-byte-order-marker
       - id: check-case-conflict
       - id: check-docstring-first
       - id: check-merge-conflict
       - id: detect-private-key
       - id: end-of-file-fixer
-      - id: fix-encoding-pragma
       - id: mixed-line-ending
       - id: trailing-whitespace
+  - repo: https://github.com/asottile/pyupgrade
+    rev: v3.21.2
+    hooks:
+      - id: pyupgrade
+        args: [--py310-plus]

CHANGELOG.rst

@@ -1,6 +1,12 @@
 Release history
 ---------------
 
+unreleased
++++++++++++++++++
+- Remover old python2 compatibility remnants (six, unicode)
+- Modernize code style for python 3.10+
+- Bump requirements of macOS (14+) as well as Python (3.10+)
+
 0.3.0 (June 2021)
 +++++++++++++++++
 - changed: create directory hierarchy for plist file if not present. issue #6

README.rst

@@ -107,4 +107,4 @@ or, if you want to work using the source tarball:
 Requirements
 ============
 * OS X >= 10.6
-* Python 3.4+
+* Python 3.10+

example.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 Example script showing how to install and remove plist based launchd jobs.
 """
@@ -58,7 +57,7 @@ def main():
         if job.pid is None:
             print("'%s' is loaded but not currently running" % (job.label))  # noqa: T201
         else:
-            print("'%s' is loaded and currently running: PID = %s" % (job.label, job.pid))  # noqa: T201
+            print(f"'{job.label}' is loaded and currently running: PID = {job.pid}")  # noqa: T201
             while job.pid is not None:
                 print("Alive! PID = %s" % job.pid)  # noqa: T201
                 job.refresh()

launchd/__init__.py

@@ -1,8 +1,6 @@
-# -*- coding: utf-8 -*-
-
 __author__ = "Paul Kremer"
 __email__ = "paul@spurious.biz"
-__version__ = "0.3.0"
+__version__ = "1.0.0"
 
 from .launchctl import jobs, LaunchdJob, load, unload  # noqa: F401
 from . import plist  # noqa: F401

launchd/cmd.py

@@ -1,25 +1,21 @@
-# -*- coding: utf-8 -*-
-
 import subprocess  # noqa: S404
 
-import six
-
 
 def launchctl(subcommand, *args):
     """
     Call the launchctl binary and capture the output.
 
     :param subcommand: string
     """
-    if not isinstance(subcommand, six.string_types):
+    if not isinstance(subcommand, str):
         raise ValueError("Argument is invalid: %r" % repr(subcommand))
-    if isinstance(subcommand, six.text_type):
+    if isinstance(subcommand, str):
         subcommand = subcommand.encode("utf-8")
 
     cmd = ["launchctl", subcommand]
     for arg in args:
-        if isinstance(arg, six.string_types):
-            if isinstance(arg, six.text_type):
+        if isinstance(arg, str):
+            if isinstance(arg, str):
                 cmd.append(arg.encode("utf-8"))
             else:
                 cmd.append(arg)

launchd/launchctl.py

@@ -1,17 +1,15 @@
-# -*- coding: utf-8 -*-
-
 import ServiceManagement
 
 from .cmd import launchctl
 from .plist import discover_filename
 from .util import convert_NSDictionary_to_dict
 
 
-class LaunchdJob(object):
+class LaunchdJob:
     """
     Class to lazily query the properties of the LaunchdJob when accessed.
     """
-    def __init__(self, label, pid=-1, laststatus=""):
+    def __init__(self, label: str, pid: int = -1, laststatus=""):
         """
         Instantiate a LaunchdJob instance. Only the label is required.
         If no pid or laststatus are specified, they will be queried when
@@ -88,7 +86,7 @@ def refresh(self):
                 self._laststatus = None
 
     @property
-    def plistfilename(self):
+    def plistfilename(self) -> str | None:
         """
         Lazily detect absolute filename of the property list file.
 

launchd/plist.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 import os
 import plistlib
 
@@ -18,15 +16,15 @@
 }
 
 
-def compute_directory(scope):
+def compute_directory(scope: int) -> str:
     return os.path.expanduser(PLIST_LOCATIONS[scope])
 
 
-def compute_filename(label, scope):
+def compute_filename(label: str, scope: int) -> str:
     return os.path.join(compute_directory(scope), label + ".plist")
 
 
-def discover_filename(label, scopes=None):
+def discover_filename(label: str, scopes: None | tuple[int] | list[int] = None) -> str | None:
     """
     Check the filesystem for the existence of a .plist file matching the job label.
     Optionally specify one or more scopes to search (default all).
@@ -45,12 +43,12 @@ def discover_filename(label, scopes=None):
     return None
 
 
-def read(label, scope=None):
+def read(label: str, scope: int | None = None):
     with open(discover_filename(label, scope), "rb") as f:
         return plistlib.load(f)
 
 
-def write(label, plist, scope=USER):
+def write(label: str, plist, scope=USER) -> str:
     """
     Write the property list to file on disk and return filename.
 

launchd/tests/cmd.py launchd/tests/test_cmd.pylaunchd/tests/cmd.py renamed to launchd/tests/test_cmd.py

@@ -1,9 +1,5 @@
-# -*- coding: utf-8 -*-
-
 import unittest
 
-import six
-
 from launchd import cmd
 
 
@@ -20,9 +16,9 @@ def testlaunchctl_invalid_args(self):
 
     def testlaunchctl_list(self):
         stdout = cmd.launchctl("list").decode("utf-8")
-        self.assertTrue(isinstance(stdout, six.string_types))
+        self.assertTrue(isinstance(stdout, str))
 
     def testlaunchctl_list_x(self):
         label = "com.apple.Finder"
         stdout = cmd.launchctl("list", label).decode("utf-8")
-        self.assertTrue(isinstance(stdout, six.string_types))
+        self.assertTrue(isinstance(stdout, str))