use more absolute

Author: mzuenni

bin/config.py

@@ -93,10 +93,10 @@
 SEED_DEPENDENCY_RETRIES: Final[int] = 10
 
 # The root directory of the BAPCtools repository.
-TOOLS_ROOT: Final[Path] = Path(__file__).resolve().parent.parent
+TOOLS_ROOT: Final[Path] = Path(__file__).absolute().parent.parent
 
 # The directory from which BAPCtools is invoked.
-current_working_directory: Final[Path] = Path.cwd().resolve()
+current_working_directory: Final[Path] = Path.cwd().absolute()
 
 # Add third_party/ to the $PATH for checktestdata.
 os.environ["PATH"] += os.pathsep + str(TOOLS_ROOT / "third_party")

bin/problem.py

@@ -317,7 +317,7 @@ class Problem:
 
     def __init__(self, path: Path, tmpdir: Path, label: Optional[str] = None):
         # The problem name/shortname, which is the name of the directory and used as a display name.
-        self.name = path.resolve().name
+        self.name = path.name
         # The Path of the problem directory.
         self.path = path
         self.tmpdir: Path = tmpdir / self.name

bin/program.py

@@ -141,10 +141,7 @@ def __init__(
         # Set self.name and self.tmpdir.
         # Ideally they are the same as the path inside the problem, but fallback to just the name.
         try:
-            # Only resolve the parent of the program. This preserves programs that are symlinks to other directories.
-            relpath = (path.parent.resolve() / path.name).relative_to(
-                problem.path.resolve() / self.subdir
-            )
+            relpath = path.absolute().relative_to(problem.path.absolute() / self.subdir)
             self.short_path = relpath
             self.name: str = str(relpath)
             self.tmpdir = problem.tmpdir / self.subdir / relpath

bin/skel.py

@@ -330,16 +330,16 @@ def copy_skel_dir(problems):
 
 # NOTE: This is one of few places that prints to stdout instead of stderr.
 def create_gitlab_jobs(contest: str, problems: list[Problem]):
-    git_root_path = Path(os.popen("git rev-parse --show-toplevel").read().strip()).resolve()
+    git_root_path = Path(os.popen("git rev-parse --show-toplevel").read().strip()).absolute()
 
     def problem_source_dir(problem: Problem):
-        return problem.path.resolve().relative_to(git_root_path)
+        return problem.path.absolute().relative_to(git_root_path)
 
     header_yml = (config.TOOLS_ROOT / "skel/gitlab_ci/header.yaml").read_text()
     print(header_yml)
 
     contest_yml = (config.TOOLS_ROOT / "skel/gitlab_ci/contest.yaml").read_text()
-    contest_path = Path(".").resolve().relative_to(git_root_path)
+    contest_path = Path(".").absolute().relative_to(git_root_path)
     changes = "".join(
         f"      - {problem_source_dir(problem)}/{pdf_type.path().parent}/**/*\n"
         for problem in problems

bin/tools.py

@@ -85,12 +85,12 @@ def is_problem_directory(path):
     level: Optional[Literal["problem", "problemset"]] = None
     if config.args.contest:
         # TODO #102: replace cast with typed Namespace field
-        contest = cast(Path, config.args.contest).resolve()
+        contest = cast(Path, config.args.contest).absolute()
         os.chdir(contest)
         level = "problemset"
     if config.args.problem:
         # TODO #102: replace cast with typed Namespace field
-        problem = cast(Path, config.args.problem).resolve()
+        problem = cast(Path, config.args.problem).absolute()
         level = "problem"
         os.chdir(problem.parent)
     elif is_problem_directory(Path(".")):

bin/upgrade.py

@@ -180,11 +180,11 @@ def upgrade_output_validators(problem_path: Path, bar: ProgressBar) -> None:
 
             def move(src: str, dst: str) -> None:
                 if Path(src).is_symlink():
-                    src_dst = Path(src).resolve()
+                    src_dst = Path(src).absolute()
                     if src_dst.is_relative_to(content[0]):  # local symlink
                         Path(src).rename(dst)
                     else:  # link outside output_validators/
-                        dst_pos = Path(dst).resolve()
+                        dst_pos = Path(dst).absolute()
                         common = [
                             a
                             for a, b in zip(reversed(src_dst.parents), reversed(dst_pos.parents))

bin/util.py

@@ -1046,7 +1046,7 @@ def copytree_and_substitute(
         pass
     elif preserve_symlinks and os.path.islink(src):
         shutil.copy(src, dst, follow_symlinks=False)
-    elif os.path.islink(src) and src.resolve().is_relative_to(base):
+    elif os.path.islink(src) and src.absolute().is_relative_to(base.absolute()):
         shutil.copy(src, dst, follow_symlinks=False)
     elif os.path.isdir(src):
         names = os.listdir(src)