Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-19 00:41:43 +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

32
upstream_utils/mrcal_java.py
View File

@@ -2,46 +2,30 @@
import os
import shutil
from pathlib import Path
from upstream_utils import Lib, walk_cwd_and_copy_if
def delete_lines_by_range(file_path, start_line, end_line):
# Read all lines from the file
with open(file_path, "r") as file:
lines = file.readlines()
# Filter out lines that are within the specified range
filtered_lines = [
line
for i, line in enumerate(lines, start=1)
if not (start_line <= i <= end_line)
]
# Write the remaining lines back to the file
with open(file_path, "w") as file:
file.writelines(filtered_lines)
def copy_upstream_src(wpilib_root):
wpical = os.path.join(wpilib_root, "wpical")
def copy_upstream_src(wpilib_root: Path):
wpical = wpilib_root / "wpical"
# Delete old install
for d in [
"src/main/native/thirdparty/mrcal_java/src",
"src/main/native/thirdparty/mrcal_java/include",
]:
shutil.rmtree(os.path.join(wpical, d), ignore_errors=True)
shutil.rmtree(wpical / d, ignore_errors=True)
os.chdir("src")
files = walk_cwd_and_copy_if(
lambda dp, f: f.endswith("mrcal_wrapper.h"),
os.path.join(wpical, "src/main/native/thirdparty/mrcal_java/include"),
lambda dp, f: f == "mrcal_wrapper.h",
wpical / "src/main/native/thirdparty/mrcal_java/include",
)
files = walk_cwd_and_copy_if(
lambda dp, f: f.endswith("mrcal_wrapper.cpp"),
os.path.join(wpical, "src/main/native/thirdparty/mrcal_java/src"),
lambda dp, f: f == "mrcal_wrapper.cpp",
wpical / "src/main/native/thirdparty/mrcal_java/src",
)
for f in files: