-
-
Notifications
You must be signed in to change notification settings - Fork 17.9k
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
TST: tests for maybe_promote (precursor to #23982) #25637
Merged
jreback
merged 26 commits into
pandas-dev:master
from
h-vetinari:tst_maybe_promote_precursor
Jun 21, 2019
Merged
Changes from 1 commit
Commits
Show all changes
26 commits
Select commit
Hold shift + click to select a range
ca8f96b
TST: tests for maybe_promote (precursor to #23982)
h-vetinari a881929
Merge remote-tracking branch 'upstream/master' into tst_maybe_promote…
h-vetinari e14d8a2
Fix tabs vs. spaces
h-vetinari bc10a87
Merge remote-tracking branch 'upstream/master' into tst_maybe_promote…
h-vetinari ab328c0
fix conftest
h-vetinari 80d4081
more conftest merge conflict artefact fixes
h-vetinari 4a2327c
lint
h-vetinari a205ea9
Merge remote-tracking branch 'upstream/master' into tst_maybe_promote…
h-vetinari 79299af
Review (jreback)
h-vetinari 1b18fde
Add docstring to _check_promote
h-vetinari ff3be04
Merge remote-tracking branch 'upstream/master' into tst_maybe_promote…
h-vetinari 9fec7f9
doc improvements
h-vetinari bf8c02d
fix c&p artefact
h-vetinari 595012c
Introduce parametrized fixture for box-variants; override where required
h-vetinari f89e8b4
improve docstring for box-fixture
h-vetinari 4317f77
fix comments
h-vetinari c0b4a3f
fix fixture docstrings
h-vetinari d6001a7
docstring updates
h-vetinari f73740b
add ids for box-fixture
h-vetinari 895fcb5
Merge remote-tracking branch 'upstream/master' into tst_maybe_promote…
h-vetinari 200365e
lint
h-vetinari bb36925
Merge remote-tracking branch 'upstream/master' into tst_maybe_promote…
h-vetinari a97d29b
break out function to make _check_promote even more branchless
h-vetinari 8c982f2
Merge remote-tracking branch 'upstream/master' into tst_maybe_promote…
h-vetinari a1add65
Refactor with reduced any_numpy_dtype fixture (review jreback)
h-vetinari 636b1f1
Merge remote-tracking branch 'upstream/master' into tst_maybe_promote…
h-vetinari File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
Oops, something went wrong.
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.
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.
Rationale for renames?
Is this necessary given how massive the diff is already?
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.
I can split off the conftest-related things, of course.
Regarding your specific point: The rename is really important IMO, because the
DATETIME_DTYPES
(as-is) have nothing to do withdatetime.dateime
or other such things.However, when reading a test that is being fed by a
datetime_dtype
fixture, one could easily think that this testsdatetime.datetime
.The current state in conftest specifically contains only
DATETIME64_DTYPES
, and I believe this distinction is used in many parts of the code base as well.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.
Got it. I'm thinking that we should separate this out. The more we can condense this PR, the better.
But hold off on making that PR for the moment (just one more question re: some of other things you've changed for
conftest.py
)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.
I can change the
DATETIME_DTYPES
->DATETIME64_DTYPES
in a precursor of course, but the actual change that precipitates the necessity is the introduction ofdatetime64_dtype
, which wouldn't be used before this PR. Would you want me to introduce the fixtures with the conftest-precursor, or in this PR?