DOC: consistent imports (GH9886) part V #10934
Closed
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
springcoil
force-pushed
the
euroscipy_sprint
branch
from
72fb86b to
537128a
Compare
|
Ok updated the commit by rebasing. |
springcoil
force-pushed
the
euroscipy_sprint
branch
from
537128a to
0d149c1
Compare
|
Ok this should be all the changes done in the merging.rst file. |
BUG: 10633 - some last errors removed ENH: pickle support for Period pandas-dev#10439 update legacy_storage for pickles update pickles/msgpack for 0.16.2 Added tests for ABC Types, Issue pandas-dev#10828 TST: pandas-dev#10822, skip tests on windows for odd error message in to_datetime with unicode COMPAT:Allow multi-indexes to be written to excel. (Even though they cannot be read back in.) Closes pandas-dev#10564 DOC: typo A few changes in docs TST: Changes in test ENH: pickle support for Period pandas-dev#10439 update legacy_storage for pickles update pickles/msgpack for 0.16.2 Added tests for ABC Types, Issue pandas-dev#10828 TST: pandas-dev#10822, skip tests on windows for odd error message in to_datetime with unicode COMPAT:Allow multi-indexes to be written to excel. (Even though they cannot be read back in.) Closes pandas-dev#10564 DOC: typo ENH: pickle support for Period pandas-dev#10439 update legacy_storage for pickles update pickles/msgpack for 0.16.2 Added tests for ABC Types, Issue pandas-dev#10828 TST: pandas-dev#10822, skip tests on windows for odd error message in to_datetime with unicode COMPAT:Allow multi-indexes to be written to excel. (Even though they cannot be read back in.) Closes pandas-dev#10564 DOC: typo A few changes in docs ERR: 10720 BUG: 10633 and 10800 fix merging ENH: pickle support for Period pandas-dev#10439 update legacy_storage for pickles update pickles/msgpack for 0.16.2 Added tests for ABC Types, Issue pandas-dev#10828 TST: pandas-dev#10822, skip tests on windows for odd error message in to_datetime with unicode COMPAT:Allow multi-indexes to be written to excel. (Even though they cannot be read back in.) Closes pandas-dev#10564 DOC: typo A few changes in docs TST: Changes in test Fixing a slight messup DOC:Updating consistent imports in the merging.rst file pandas-dev#9886 DOC: GH9886 Part V DOC: GH9886 Part V - some merging issues
| @@ -724,15 +724,40 @@ Performance Improvements | |||
|
|
|||
| Bug Fixes | |||
| ~~~~~~~~~ | |||
|
|
|||
| - Bug in incorrection computation of ``.mean()`` on ``timedelta64[ns]`` because of overflow (:issue:`9442`) | |||
There was a problem hiding this comment.
remove all of these files that have conflicts
|
@springcoil if behooves you to keep your master up to date and clean, e.g. don't make changes on it. so then when checking out will keep things clean |
jreback
added
the
Compat
springcoil
force-pushed
the
euroscipy_sprint
branch
from
0d149c1 to
f2b1bbc
Compare
jorisvandenbossche
removed
the
Compat
|
Reopening this branch. |
|
This is deprecated by #10941 |
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.
I made a few alterations to the consistent imports in the merging.rst file.
Does anyone have any objections to what I did?
I notice a few problems with the rebase though first - that's 12 commits rather than one.