Visitar URL original
Fix PySide6 stylesheet usage by C-Achard · Pull Request #3371 · DeepLabCut/DeepLabCut · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
3b8c44a
fix path resolution on network drives. Replace Path(..).resolve() wi…
deruyter92 May 29, 2026
fddcbaa
Add safe_resolve helper for path resolution
deruyter92 May 29, 2026
65f8dfb
fix redundant resolution of resolved path in memory_replay.py
deruyter92 May 29, 2026
6bbe26d
fix open -> os.stat
deruyter92 May 29, 2026
3f93a76
replace os.stat -> open for files, listdir for dirs.
deruyter92 May 29, 2026
87cd6aa
fix TestReadConfigProjectPath
deruyter92 May 29, 2026
8be1c26
Update deeplabcut/utils/auxiliaryfunctions.py
deruyter92 May 29, 2026
5ec1023
Merge remote-tracking branch 'upstream/main' into jaap/safe_resolve_p…
deruyter92 Jun 26, 2026
f422dcc
Merge branch 'main' into jaap/safe_resolve_paths
C-Achard Jun 29, 2026
9d2732b
Adjust config path tests for Path objects
C-Achard Jun 29, 2026
bb23a34
address remaining `.resolve()` cases: prefer `.absolute()`, or otherw…
deruyter92 Jul 6, 2026
831cb1d
update `safe_resolve`: add logging, use os.stat (more efficient)
deruyter92 Jul 6, 2026
77bf7f0
update test safe_resolve: allow fallback and test open/closing instead
deruyter92 Jul 6, 2026
ca63582
Merge remote-tracking branch 'upstream/main' into jaap/safe_resolve_p…
deruyter92 Jul 6, 2026
205b550
fix remaining Path.resolve()
deruyter92 Jul 7, 2026
8c6c722
Add GUI asset helper utilities
C-Achard Jun 15, 2026
32c12e7
Use gui_assets for icons and pixmaps
C-Achard Jun 15, 2026
a7f2643
Use get_style_qss and update qdarkstyle deps
C-Achard Jun 15, 2026
2a59325
Update uv.lock
C-Achard Jun 15, 2026
4dec33a
Fallback to PySide2 qdarkstyle stylesheet
C-Achard Jun 15, 2026
5275139
Remove unused imports and tidy spacing
C-Achard Jul 16, 2026
e6aab6a
Remove outdated comments
C-Achard Jul 17, 2026
b5c2c91
Merge remote-tracking branch 'upstream/main' into cy/fix-pyside6-theme
deruyter92 Jul 17, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
fix path resolution on network drives. Replace Path(..).resolve() wit…
…h Path(..).absolute()
  • Loading branch information
deruyter92 committed May 29, 2026
commit 3b8c44a6f79fbb85c1b57f118090582d54e8346d
2 changes: 1 addition & 1 deletion deeplabcut/create_project/new.py
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ def create_new_project(
date = dt.today().strftime("%Y-%m-%d")
if working_directory is None:
working_directory = "."
wd = Path(working_directory).resolve()
wd = Path(working_directory).absolute()
project_name = f"{project}-{experimenter}-{date}"
project_path = wd / project_name

Expand Down
2 changes: 1 addition & 1 deletion deeplabcut/create_project/new_3d.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ def create_new_project_3d(project, experimenter, num_cameras=2, working_director
if working_directory is None:
working_directory = "."

wd = Path(working_directory).resolve()
wd = Path(working_directory).absolute()
project_name = "{pn}-{exp}-{date}-{triangulate}".format(pn=project, exp=experimenter, date=date, triangulate="3d")
project_path = wd / project_name
# Create project and sub-directories
Expand Down
4 changes: 2 additions & 2 deletions deeplabcut/generate_training_dataset/frame_extraction.py
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ def extract_frames(

from deeplabcut.utils import auxiliaryfunctions, frameselectiontools

config_file = Path(config).resolve()
config_file = Path(config)
cfg = auxiliaryfunctions.read_config(config_file)
print("Config file read successfully.")

Expand Down Expand Up @@ -456,7 +456,7 @@ def extract_frames(
elif mode == "match":
import cv2

config_file = Path(config).resolve()
config_file = Path(config)
cfg = auxiliaryfunctions.read_config(config_file)
print("Config file read successfully.")
videos = sorted(cfg["video_sets"].keys())
Expand Down
2 changes: 1 addition & 1 deletion deeplabcut/gui/tabs/analyze_videos.py
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@ def _get_unique_video_parent_folders(self, batches: list[tuple[str, list[str]]])

for _, videos in batches:
for video in videos:
parent = str(Path(video).parent.resolve())
parent = str(Path(video).parent.absolute())
if parent not in seen:
seen.add(parent)
folders.append(parent)
Expand Down
4 changes: 2 additions & 2 deletions deeplabcut/utils/auxiliaryfunctions.py
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ def read_config(configname):
try:
with open(path) as f:
cfg = ruamelFile.load(f)
curr_dir = str(Path(configname).parent.resolve())
curr_dir = Path(configname).parent.absolute()

if cfg.get("engine") is None:
cfg["engine"] = Engine.TF.aliases[0]
Expand All @@ -221,7 +221,7 @@ def read_config(configname):
cfg["detector_batch_size"] = 1

if cfg["project_path"] != curr_dir:
cfg["project_path"] = curr_dir
cfg["project_path"] = str(curr_dir)
write_config(configname, cfg)
except Exception as err:
if len(err.args) > 2:
Expand Down