-
-
Notifications
You must be signed in to change notification settings - Fork 18.5k
Comma cleanup #36082
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
Comma cleanup #36082
Conversation
JonathanShrek
commented
Sep 3, 2020
•
edited
Loading
edited
- pandas/tests/indexes/datetimes/test_datetime.py
- pandas/tests/indexes/datetimes/test_timezones.py
- pandas/tests/indexes/multi/test_constructors.py
- pandas/tests/indexes/multi/test_isin.py
- pandas/tests/indexes/test_base.py
- pandas/tests/indexes/timedeltas/test_scalar_compat.py
- pandas/tests/indexes/timedeltas/test_searchsorted.py
- pandas/tests/indexing/common.py
- pandas/tests/indexing/test_callable.py
- pandas/tests/indexing/test_check_indexer.py
- pandas/tests/indexing/test_coercion.py
- pandas/tests/indexing/test_floats.py
Not sure why I’m getting errors in |
This latest commit passed the Azure checks, but for some reason now fails on the typing validation checks. |
unrelated, xref #36085 |
Thanks @JonathanShrek - can you fetch and merge upstream/master and push to get the CI checks green please? |
Thanks @simonjayhawkins I’ll push another commit tonight. |
@MarcoGorelli I’ll do that tonight. Thanks for the help! |
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.
Wow, that's a lot of files - all looks good to me, thanks!
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.
Actually, I see why it looks like there's so many files changed - you still have commits here from #36058 , likely because you've done this from the same branch.
Could you drop these commits? I'd expect either of the following to work:
git checkout commaCleanup
git fetch upstream master
git rebase -i upstream/master # here you would drop the first three commits
git push origin commaCleanup -f
or
git fetch upstream master
git reset --mixed upstream/master
git add <here, only put the new files you changed>
git commit -m "<some message>"
git push origin commaCleanup -f
(note: I wouldn't normally advise rebasing and force-pushing, I now only do it when I have commits I want to drop).
Whenever I start work on some new development I usually do
git checkout -b <new branch>
git fetch upstream master
git reset --hard upstream/master
to make sure I'm starting from how the code is on upstream/master
Yeah I can do this @MarcoGorelli. I actually noticed all of the other files that had already been merged in the diffs as well, but wasn’t sure how to fix it and nobody had said anything so I was just going with it. I’ll get this done this afternoon. Thanks for the detailed response! |
thanks @JonathanShrek |