Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Workaround issue with os.path.relpath on win32 #1430

Merged
merged 2 commits into from Aug 6, 2022
Merged

Workaround issue with os.path.relpath on win32 #1430

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
088ce36
fix: don't fail if can't find a relative path to a data file on anoth…
lorenzomicodxc Aug 3, 2022
e54a1a4
Merge branch 'nedbat:master' into master
lormico Aug 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 7 additions & 1 deletion coverage/data.py
View file
Open in desktop
Expand Up @@ -132,7 +132,13 @@ def combine_parallel_data(
data.update(new_data, aliases=aliases)
files_combined += 1
if message:
message(f"Combined data file {os.path.relpath(f)}")
try:
message(f"Combined data file {os.path.relpath(f)}")
except ValueError:
# ValueError can be raised under Windows when os.getcwd() returns a
# folder from a different drive than the drive of f, in which case
# we print the original value of f instead of its relative path
message(f"Combined data file {f!r}")
if not keep:
if data._debug.should('dataio'):
data._debug.write(f"Deleting combined data file {f!r}")
Expand Down