-
-
Notifications
You must be signed in to change notification settings - Fork 2.7k
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.
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
Fix regression due to different cases on Windows #5840
Merged
nicoddemus
merged 4 commits into
pytest-dev:master
from
nicoddemus:uppercase-regression
Sep 13, 2019
Merged
Fix regression due to different cases on Windows #5840
nicoddemus
merged 4 commits into
pytest-dev:master
from
nicoddemus:uppercase-regression
Sep 13, 2019
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
nicoddemus
changed the title
Fix regressions due to different cases on Windows
Fix regression due to different cases on Windows
Sep 12, 2019
nicoddemus
force-pushed
the
uppercase-regression
branch
from
September 12, 2019 01:31
8f09215
to
d631abb
Compare
Oberon00
approved these changes
Sep 12, 2019
blueyed
approved these changes
Sep 12, 2019
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
👍 (after fixing the docstring)
Using Path().resolve() is better than py.path.realpath because it resolves to the correct path/drive in case-insensitive file systems (pytest-dev#5792): >>> from py.path import local >>> from pathlib import Path >>> >>> local('d:\\projects').realpath() local('d:\\projects') >>> Path('d:\\projects').resolve() WindowsPath('D:/projects') Fix pytest-dev#5819
The introduction was reverted by cd29d56
nicoddemus
force-pushed
the
uppercase-regression
branch
from
September 12, 2019 11:05
d631abb
to
5c3b4a6
Compare
blueyed
approved these changes
Sep 12, 2019
@nicoddemus thanks for fixing this! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR reverts #5792 to introduce a simpler fix: instead of changing all conftest paths to a unique representation, which unfortunately introduced #5819, it only uses a resolved
Path
object as key to the avoid importingconftest
files more than once.I would have taken the commits from #5823 (Sorry @Oberon00!), but unfortunately the fork seems to be gone, so I introduced the changes manually: a new test and the CHANGELOG.
Supersedes #5823.