Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-07-05 03:21:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

[upstream_utils] Use pathlib instead of os.path (#7983)

Browse Source 
A noteworthy change is the replacement of the `dp.startswith(os.path.join(".", "subdir"))` pattern. pathlib doesn't offer something with similar semantics besides `match` and `full_match`, so there's now a helper function that replicates the behavior.

Other notable changes include the addition of type annotations to ensure code correctness, using == to check file names instead of `endswith` for clarity (`endswith` is still used to check extensions), manual walking and copying being refactored in googletest, json, memory, nanopb, protobuf, and sleipnir to use `walk_cwd_and_copy_if`, and matching functions being shortened to the point where they can just be inlined into the lambda.

Co-authored-by: Tyler Veness <calcmogul@gmail.com>
Co-authored-by: David Vo <auscompgeek@users.noreply.github.com>
This commit is contained in:
Gold856
2025-05-29 22:05:22 +00:00
committed by GitHub
parent de718f7ae5
commit ca05ffa1b9
26 changed files with 625 additions and 1045 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
upstream_utils/fmt.py
View File

@@ -1,33 +1,33 @@
#!/usr/bin/env python3
import os
import shutil
from pathlib import Path
from upstream_utils import Lib, walk_cwd_and_copy_if
from upstream_utils import Lib, has_prefix, walk_cwd_and_copy_if
def copy_upstream_src(wpilib_root):
wpiutil = os.path.join(wpilib_root, "wpiutil")
def copy_upstream_src(wpilib_root: Path):
wpiutil = wpilib_root / "wpiutil"
# Delete old install
for d in [
"src/main/native/thirdparty/fmtlib/src",
"src/main/native/thirdparty/fmtlib/include",
]:
shutil.rmtree(os.path.join(wpiutil, d), ignore_errors=True)
shutil.rmtree(wpiutil / d, ignore_errors=True)
# Copy fmt source files into allwpilib
walk_cwd_and_copy_if(
lambda dp, f: dp.startswith(os.path.join(".", "src"))
lambda dp, f: has_prefix(dp, Path("src"))
and f.endswith(".cc")
and f != "fmt.cc",
os.path.join(wpiutil, "src/main/native/thirdparty/fmtlib"),
wpiutil / "src/main/native/thirdparty/fmtlib",
)
# Copy fmt header files into allwpilib
walk_cwd_and_copy_if(
lambda dp, f: dp.startswith(os.path.join(".", "include", "fmt")),
os.path.join(wpiutil, "src/main/native/thirdparty/fmtlib"),
lambda dp, f: has_prefix(dp, Path("include/fmt")),
wpiutil / "src/main/native/thirdparty/fmtlib",
)