Skip to content

Conversation

@reshamas
Copy link
Contributor

@alimcmaster1 alimcmaster1 added the Testing pandas testing functions or related to the test suite label Nov 14, 2020
@alimcmaster1 alimcmaster1 added this to the 1.2 milestone Nov 14, 2020
@MarcoGorelli
Copy link
Member

Can you drop the first commit?

So

git fetch --all --prune
git rebase -i upstream/master

then, in the interactive window, change the first pick to drop. Then (you may need to run this one twice)

pre-commit run --files pandas/tests/arithmetic/test_interval.py

Then,

git add pandas/tests/arithmetic/test_interval.py
git commit -m "fixup"  # or whatever message you like
git push origin namespace -f

Let me know if anything trips you up here

expected = self.elementwise_comparison(op, array, nulls_fixture)

if nulls_fixture is pd.NA and array.dtype != pd.IntervalDtype("int64"):
if nulls_fixture is pd.NA and array.dtype != IntervalDtype("int64"):
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you revert this change? Only pd.Interval needed changing, not pd.IntervalDtype

Copy link
Member

@MarcoGorelli MarcoGorelli left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks good now, thanks!

@MarcoGorelli MarcoGorelli added Code Style Code style, linting, code_checks and removed Testing pandas testing functions or related to the test suite labels Nov 15, 2020
@MarcoGorelli MarcoGorelli merged commit 80b4be8 into pandas-dev:master Nov 15, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Code Style Code style, linting, code_checks

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants