BUG: Allow all int types for merge (GH28870) #28875
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
mroeschke
requested changes
Oct 9, 2019
jjlkant
changed the title
mroeschke
reviewed
Oct 9, 2019
doc/source/whatsnew/v0.25.2.rst
Outdated
| @@ -86,7 +86,7 @@ Groupby/resample/rolling | |||
| Reshaping | |||
| ^^^^^^^^^ | |||
|
|
|||
| - | |||
| - Fix to ensure all int dtypes can be used in :meth:`pandas.core.reshape.merge_asof` when using a tolerance value (:issue:`28870`). | |||
There was a problem hiding this comment.
:func:`merge_asof` and maybe clarify that any non-int64 integer previously raised an erroneous MergeError
mroeschke
reviewed
Oct 9, 2019
|
|
||
| left = pd.DataFrame({"a": [0, 100, 200], "left_val": [1, 2, 3]}) | ||
| right = pd.DataFrame({"a": [50, 150, 250], "right_val": [1, 2, 3]}) | ||
| left["a"] = left["a"].astype(np.int32) |
There was a problem hiding this comment.
Could you pytest.mark.parameterize over more int dtypes. e.g. [int, "int64", "int32", "int16", "int8", "uint64", "uint32", "uint16", "uint8"]
mroeschke
approved these changes
Oct 10, 2019
jreback
requested changes
Oct 10, 2019
doc/source/whatsnew/v0.25.2.rst
Outdated
| @@ -86,7 +86,7 @@ Groupby/resample/rolling | |||
| Reshaping | |||
| ^^^^^^^^^ | |||
|
|
|||
| - | |||
| - Fix to ensure all int dtypes can be used in :func:`merge_asof` when using a tolerance value. Before every non-int64 type would raise an erroneous ``MergeError`` (:issue:`28870`). | |||
There was a problem hiding this comment.
moved to 1.0
Before -> Previously
|
|
||
| @pytest.mark.parametrize( | ||
| "dtype", | ||
| [int, "int64", "int32", "int16", "int8", "uint64", "uint32", "uint16", "uint8"], |
There was a problem hiding this comment.
use the any_int_dtype fixture instead
jreback
approved these changes
Oct 11, 2019
|
thanks @jjlkant |
|
a side issue, i suspect we don't have asv (performance tests for all of the int indexers) (and its possible since we don't have implementations for some of the non-int64 indexers they may be non-performant). would you be up to submitting a PR for this? |
proost
pushed a commit
to proost/pandas
that referenced
this pull request
Dec 19, 2019
proost
pushed a commit
to proost/pandas
that referenced
this pull request
Dec 19, 2019
bongolegend
pushed a commit
to bongolegend/pandas
that referenced
this pull request
Jan 1, 2020
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.
black pandasgit diff upstream/master -u -- "*.py" | flake8 --diff