[MRG] MNT Rename utils/mocking into utils/_mocking #15039
Closed
+152
−140
Conversation
This file contains hidden or 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
|
@amueller please note that I have used exactly what you recommend #9250 (comment) and this will still create merge conflicts. |
thomasjpfan
approved these changes
Sep 20, 2019
|
possibly b/c squash and merge? hm |
|
No, even just trying locally before any squashing |
|
(Is there an alternative to both import hooks and renames which checks the call stack when the submodule is run??) |
Sorry I don't understand? There's no import hook here and we don't check the call stack |
|
I was wondering if a call stack solution might work, but I might have been
confused. I so far like the ghost files approach.
|
|
Closing since #15071 has been merged |
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.
https://github.com/scikit-learn/scikit-learn/issues/6616#issuecomment-516479413#6616 (comment)
I don't think we need to care about merge conflict for this one.