Backport PR #32166 on branch 1.0.x #32269
Merged
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
jbrockmendel
changed the title
simonjayhawkins
requested changes
Feb 27, 2020
There was a problem hiding this comment.
Thanks @jbrockmendel. Should the backport mirror the original PR more closely?
| assert cols.dtype == joined.dtype | ||
| tm.assert_index_equal(cols, joined) | ||
|
|
||
| def test_join_preserves_freq(self): |
There was a problem hiding this comment.
only this test should be backported
| aware.join(naive) | ||
|
|
||
| @pytest.mark.parametrize("tz", [None, "US/Pacific"]) | ||
| def test_join_preserves_freq(self, tz): |
There was a problem hiding this comment.
only this test should be backported
| return self._simple_new(joined, name, **kwargs) | ||
|
|
||
| freq = self.freq if self._can_fast_union(other) else None | ||
| new_data = type(self._data)._simple_new( # type: ignore |
There was a problem hiding this comment.
can you add a comment why the type:ignore has been added.
jreback
added
Reshaping
|
this is fine, has some extra tests which are nbd. |
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.
#32166