fix: Do not resolve paths as this resolves symlinks (#101)

* fix: Do not `resolve` paths as this resolves symlinks

* pin package versions, use absolute path, fix formatting/linting

* fix `requirements.txt`

* fix format

* fix

* bump version

* fix comment

Co-authored-by: Simon Pirsch <95348275+spirsch@users.noreply.github.com>

* fix comment no 2

Co-authored-by: Simon Pirsch <95348275+spirsch@users.noreply.github.com>

---------

Co-authored-by: Simon Pirsch <95348275+spirsch@users.noreply.github.com>

Author: OliLay

homcc/client/__init__.py

@@ -4,4 +4,4 @@
 
 """HOMCC client: homcc"""
 
-__version__: str = "1.0.1"
+__version__: str = "1.0.2"

homcc/client/compilation.py

@@ -260,7 +260,7 @@ def extract_dependencies(line: str) -> List[str]:
         split: List[str] = line.split(":")  # remove preprocessor output targets specified via -MT
         dependency_line: str = split[1] if len(split) == 2 else split[0]  # e.g. ignore "foo.o bar.o:"
         return [
-            str(Path(dependency).resolve())  # normalize paths, e.g. convert /usr/bin/../lib/ to /usr/lib/
+            str(Path(dependency).absolute())  # Always work with absolute paths
             for dependency in dependency_line.rstrip("\\").split()  # remove line break char "\"
         ]
 
@@ -269,7 +269,7 @@ def extract_dependencies(line: str) -> List[str]:
         dependency
         for line in dependency_result.splitlines()
         for dependency in extract_dependencies(line)
-        if not dependency.startswith(EXCLUDED_DEPENDENCY_PREFIXES)  # check sendability
+        if not str(Path(dependency).resolve()).startswith(EXCLUDED_DEPENDENCY_PREFIXES)  # check sendability
     }
 
 

homcc/common/arguments.py

@@ -498,7 +498,7 @@ def map(self, instance_path: str, mapped_cwd: str) -> Arguments:
                     if arg.startswith(path_arg):
                         path: str = next(it) if arg == path_arg else arg[len(path_arg) :]
 
-                        real_path: str = os.path.realpath(path)
+                        real_path: str = str(Path(path).resolve())
                         if real_path.startswith(EXCLUDED_DEPENDENCY_PREFIXES):
                             arg = f"{path_arg}{real_path}"
                         else:

homcc/server/__init__.py

@@ -4,4 +4,4 @@
 
 """HOMCC server: homccd"""
 
-__version__: str = "1.0.1"
+__version__: str = "1.0.2"

homcc/server/cache.py

@@ -63,8 +63,8 @@ def _evict_oldest(self):
             oldest_path.unlink(missing_ok=False)
         except FileNotFoundError:
             logger.error(
-                """Tried to evict cache entry with hash '%s', but corresponding cache file at '%s' did not exist. 
-                This may lead to an invalid cache size calculation.""",
+                """Tried to evict cache entry with hash '%s', but corresponding cache file at '%s' did not exist.
+                 This may lead to an invalid cache size calculation.""",
                 oldest_hash,
                 oldest_path,
             )

homcc/server/parsing.py

@@ -198,9 +198,9 @@ def from_config_section(cls, files: List[str], homccd_config: SectionProxy) -> S
             address=address,
             log_level=log_level,
             verbose=verbose,
-            max_dependency_cache_size_bytes=None
-            if max_dependency_cache_size is None
-            else size_string_to_bytes(max_dependency_cache_size),
+            max_dependency_cache_size_bytes=(
+                None if max_dependency_cache_size is None else size_string_to_bytes(max_dependency_cache_size)
+            ),
         )
 
     def __str__(self):

requirements.txt

@@ -2,10 +2,10 @@ python-lzo==1.12 # see https://packages.ubuntu.com/jammy/python3-lzo
 sysv_ipc==1.0.0 # see https://packages.ubuntu.com/jammy/python3-sysv-ipc
 
 # test, CI, package, formatting, linting, ...
-black
+black==22.6.0
 isort[colors]
 mypy==0.990
-pylint
+pylint==2.14.4
 PySide2~=5.15
 pytest
 pytest-asyncio

tests/client/client_test.py

@@ -2,7 +2,7 @@
 # Covered under the included MIT License:
 #   https://github.com/celonis/homcc/blob/main/LICENSE
 
-""" Tests for client/client.py"""
+"""Tests for client/client.py"""
 
 import os
 import threading

tests/client/compilation_test.py

@@ -2,7 +2,7 @@
 # Covered under the included MIT License:
 #   https://github.com/celonis/homcc/blob/main/LICENSE
 
-""" Tests for client/compilation.py"""
+"""Tests for client/compilation.py"""
 import os
 import subprocess
 from pathlib import Path

tests/client/parsing_test.py

@@ -2,7 +2,7 @@
 # Covered under the included MIT License:
 #   https://github.com/celonis/homcc/blob/main/LICENSE
 
-""" Tests for client/parsing.py"""
+"""Tests for client/parsing.py"""
 import os
 import subprocess
 from pathlib import Path