BUG: merging with a boolean/int categorical column #17841
Merged
Conversation
This file contains 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
Codecov Report
@@ Coverage Diff @@
## master #17841 +/- ##
==========================================
- Coverage 91.22% 91.21% -0.02%
==========================================
Files 163 163
Lines 50014 50014
==========================================
- Hits 45627 45618 -9
- Misses 4387 4396 +9
Continue to review full report at Codecov.
|
Codecov Report
@@ Coverage Diff @@
## master #17841 +/- ##
==========================================
- Coverage 91.22% 91.21% -0.01%
==========================================
Files 163 163
Lines 50014 50075 +61
==========================================
+ Hits 45627 45678 +51
- Misses 4387 4397 +10
Continue to review full report at Codecov.
|
jschendel
reviewed
Oct 10, 2017
pandas/tests/reshape/test_merge.py
Outdated
| @@ -1546,6 +1546,49 @@ def test_dtype_on_categorical_dates(self): | |||
| result_inner = pd.merge(df, df2, how='inner', on=['date']) | |||
| assert_frame_equal(result_inner, expected_inner) | |||
|
|
|||
| def test_merging_with_boolean_cateorical_column(self): | |||
| df1 = pd.DataFrame({'id': [1, 2, 3, 4], | |||
There was a problem hiding this comment.
Can you add the github issue number here as a comment? And for the other tests you wrote too?
jreback
requested changes
Oct 13, 2017
| @@ -1546,6 +1546,55 @@ def test_dtype_on_categorical_dates(self): | |||
| result_inner = pd.merge(df, df2, how='inner', on=['date']) | |||
| assert_frame_equal(result_inner, expected_inner) | |||
|
|
|||
There was a problem hiding this comment.
can you parametrize this and make it a single test (with 3 cases)
jreback
approved these changes
Oct 14, 2017
|
thanks @jdrudolph nice patch! keep em coming |
ghost
pushed a commit
to reef-technologies/pandas
that referenced
this pull request
Oct 16, 2017
* BUG: merging with a boolean/int categorical column pandas-dev#17187
ghost
pushed a commit
to reef-technologies/pandas
that referenced
this pull request
Oct 16, 2017
* upstream/master: (76 commits) CategoricalDtype construction: actually use fastpath (pandas-dev#17891) DEPR: Deprecate tupleize_cols in to_csv (pandas-dev#17877) BUG: Fix wrong column selection in drop_duplicates when duplicate column names (pandas-dev#17879) DOC: Adding examples to update docstring (pandas-dev#16812) (pandas-dev#17859) TST: Skip if no openpyxl in test_excel (pandas-dev#17883) TST: Catch read_html slow test warning (pandas-dev#17874) flake8 cleanup (pandas-dev#17873) TST: remove moar warnings (pandas-dev#17872) ENH: tolerance now takes list-like argument for reindex and get_indexer. (pandas-dev#17367) ERR: Raise ValueError when week is passed in to_datetime format witho… (pandas-dev#17819) TST: remove some deprecation warnings (pandas-dev#17870) Refactor index-as-string groupby tests and fix spurious warning (Bug 17383) (pandas-dev#17843) BUG: merging with a boolean/int categorical column (pandas-dev#17841) DEPR: Deprecate read_csv arguments fully (pandas-dev#17865) BUG: to_json - prevent various segfault conditions (GH14256) (pandas-dev#17857) CLN: Use pandas.core.common for None checks (pandas-dev#17816) BUG: set tz on DTI from fixed format HDFStore (pandas-dev#17844) RLS: v0.21.0rc1 Whatsnew cleanup (pandas-dev#17858) DEPR: Deprecate the convert parameter completely (pandas-dev#17831) ...
alanbato
pushed a commit
to alanbato/pandas
that referenced
this pull request
Nov 10, 2017
* BUG: merging with a boolean/int categorical column pandas-dev#17187
No-Stream
pushed a commit
to No-Stream/pandas
that referenced
this pull request
Nov 28, 2017
* BUG: merging with a boolean/int categorical column pandas-dev#17187
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.
Additional check prevents trying to change types of categorical blocks.
git diff upstream/master -u -- "*.py" | flake8 --diff