Fix macOS CI failures (#172)

* Fix macOS CI failures

1. Change `cd path;pwd` to `cd path && pwd` so pwd only runs if cd
   succeeds. On macOS, the shell returns the current directory when
   cd fails, causing incorrect --link-dest paths.

2. Add encoding="utf-8", errors="surrogateescape" when reading rsync
   log files. Log files may contain non-UTF8 filenames which cause
   UnicodeDecodeError on macOS.

* Re-fetch previous_dest after resume handler renames folder

* Skip PID check when it matches current process (allows re-entrancy)

* Add trailing newline to exclusion file in test (macOS rsync compatibility)

* Remove unnecessary PID re-entrancy check

* Remove re-fetch previous_dest (testing if needed)

* Add Python 3.13 and 3.14 to CI matrix

Author: basnijholt

.github/workflows/pytest.yml

@@ -8,7 +8,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest]
-        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]  # skip unsupported versions (3.7)
+        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13", "3.14"]
 
     steps:
       - uses: actions/checkout@v6

rsync_time_machine.py

@@ -460,7 +460,7 @@ def find(path: str, ssh: SSH | None = None, maxdepth: int | None = None) -> str:
 
 def get_absolute_path(path: str, ssh: SSH | None = None) -> str:
     """Get the absolute path of the given path."""
-    return run_cmd(f"cd '{path}';pwd", ssh).stdout
+    return run_cmd(f"cd '{path}' && pwd", ssh).stdout
 
 
 def mkdir(path: str, ssh: SSH | None = None) -> None:
@@ -694,7 +694,7 @@ def deal_with_no_space_left(
     auto_expire: bool,
 ) -> bool:
     """Deal with no space left on device."""
-    with open(log_file) as f:
+    with open(log_file, encoding="utf-8", errors="surrogateescape") as f:
         log_data = f.read()
 
     no_space_left = re.search(
@@ -727,7 +727,7 @@ def check_rsync_errors(
     auto_delete_log: bool,  # noqa: FBT001
 ) -> None:
     """Check rsync errors."""
-    with open(log_file) as f:
+    with open(log_file, encoding="utf-8", errors="surrogateescape") as f:
         log_data = f.read()
     if "rsync error:" in log_data:
         log_error(

tests/test_app.py

@@ -435,7 +435,7 @@ def test_backup(tmp_path: Path, capsys: pytest.CaptureFixture) -> None:  # noqa:
     (src_folder / "file2.txt").write_text("Hello, World!")
     (src_folder / "file3.txt").write_text("Hello, World!")
     exclusion_file = tmp_path / "exclusion_file.txt"
-    exclusion_file.write_text("file2.txt")
+    exclusion_file.write_text("file2.txt\n")
     with patch_now_str(seconds=0):
         new_kw = dict(kw, exclusion_file=str(tmp_path / "exclusion_file.txt"))
         backup(**new_kw)  # type: ignore[arg-type]