Allow for dict-like argument to Categorical.rename_categories #17586

alanbato · 2017-09-19T02:26:41Z

closes Allow for dict-like argument to Categorical.rename_categories #17336
tests added / passed
passes git diff upstream/master -u -- "*.py" | flake8 --diff
whatsnew entry

Categorical.rename_categories can now take a dict as new_categories and updates the categories to those found in the mapping.
It will only change the categories found in the dict, and leave all others the same.
The dict can be smaller or larger, and may or may not contain mappings referencing the old categories.

Have a good day/night! 🐼 🐍

jreback

lgtm. some small comments. pls rebase / ping on green.

jreback · 2017-09-19T12:38:21Z

doc/source/whatsnew/v0.21.0.txt

@@ -114,7 +114,7 @@ Other Enhancements
 - :func:`pd.read_sas()` now recognizes much more of the most frequently used date (datetime) formats in SAS7BDAT files (:issue:`15871`).
 - :func:`DataFrame.items` and :func:`Series.items` is now present in both Python 2 and 3 and is lazy in all cases (:issue:`13918`, :issue:`17213`)
 - :func:`Styler.where` has been implemented. It is as a convenience for :func:`Styler.applymap` and enables simple DataFrame styling on the Jupyter notebook (:issue:`17474`).
-
+- :func:`Categorical.rename_categories` now accepts a dict-like argument as `new_categories`, and only updates the categories found in that dict. (:issue:`17336`)


can you update / add to the example in categorical.rst as well

jreback · 2017-09-19T12:39:30Z

pandas/core/categorical.py

@@ -824,7 +824,11 @@ def rename_categories(self, new_categories, inplace=False):
        """
        inplace = validate_bool_kwarg(inplace, 'inplace')
        cat = self if inplace else self.copy()
-        cat.categories = new_categories
+        if isinstance(new_categories, dict):


use is_dict_like, no need to do this as an if

if is_dict_like(new_categories): new_categories = [new_categories.get(item, item).....] cat.categories = new_categories

jreback · 2017-09-19T12:39:55Z

pandas/tests/test_categorical.py

+                                    inplace=True)
+        assert res is None
+        tm.assert_index_equal(cat.categories, expected)
+        # Test for dicts of smaller length


blank lines between sub-tests

TomAugspurger · 2017-09-19T19:17:34Z

Don't worry about the travis failures. They're unrelated and have been fixed. +1 once you change the if isinstance(...) to use is_dict_like.

codecov · 2017-09-19T22:04:29Z

Codecov Report

❗ No coverage uploaded for pull request base (master@21a3800). Click here to learn what that means.
The diff coverage is 100%.

@@            Coverage Diff            @@
##             master   #17586   +/-   ##
=========================================
  Coverage          ?    91.2%           
=========================================
  Files             ?      163           
  Lines             ?    49627           
  Branches          ?        0           
=========================================
  Hits              ?    45263           
  Misses            ?     4364           
  Partials          ?        0

Flag	Coverage Δ
#multiple	`88.99% <100%> (?)`
#single	`40.19% <0%> (?)`

Impacted Files	Coverage Δ
pandas/core/categorical.py	`95.59% <100%> (ø)`

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 21a3800...440105d. Read the comment docs.

codecov · 2017-09-19T22:04:30Z

Codecov Report

Merging #17586 into master will decrease coverage by 0.01%.
The diff coverage is 100%.

@@            Coverage Diff             @@
##           master   #17586      +/-   ##
==========================================
- Coverage   91.19%   91.18%   -0.02%     
==========================================
  Files         163      163              
  Lines       49625    49627       +2     
==========================================
- Hits        45257    45250       -7     
- Misses       4368     4377       +9

Flag	Coverage Δ
#multiple	`88.96% <100%> (ø)`	⬆️
#single	`40.19% <0%> (-0.07%)`	⬇️

Impacted Files	Coverage Δ
pandas/core/categorical.py	`95.59% <100%> (+0.01%)`	⬆️
pandas/io/gbq.py	`25% <0%> (-58.34%)`	⬇️
pandas/core/frame.py	`97.77% <0%> (-0.1%)`	⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 6930f27...8863408. Read the comment docs.

gfyoung · 2017-09-20T04:34:24Z

doc/source/whatsnew/v0.21.0.txt

@@ -115,6 +115,7 @@ Other Enhancements
 - :func:`DataFrame.items` and :func:`Series.items` is now present in both Python 2 and 3 and is lazy in all cases (:issue:`13918`, :issue:`17213`)
 - :func:`Styler.where` has been implemented. It is as a convenience for :func:`Styler.applymap` and enables simple DataFrame styling on the Jupyter notebook (:issue:`17474`).
 - :func:`MultiIndex.is_monotonic_decreasing` has been implemented.  Previously returned ``False`` in all cases. (:issue:`16554`)
+- :func:`Categorical.rename_categories` now accepts a dict-like argument as `new_categories`, and only updates the categories found in that dict. (:issue:`17336`)


Nit: remove the comma before "and only updates"

gfyoung · 2017-09-20T04:34:50Z

pandas/core/categorical.py

@@ -824,7 +825,11 @@ def rename_categories(self, new_categories, inplace=False):
        """
        inplace = validate_bool_kwarg(inplace, 'inplace')
        cat = self if inplace else self.copy()
-        cat.categories = new_categories
+        if is_dict_like(new_categories):


Nit: newline above this one.

gfyoung · 2017-09-20T04:34:55Z

pandas/tests/test_categorical.py

+        res = cat.rename_categories({'a': 4, 'b': 3, 'c': 2, 'd': 1})
+        expected = Index([4, 3, 2, 1])
+        tm.assert_index_equal(res.categories, expected)
+        # Test for inplace


Nit: newline above this one.

gfyoung · 2017-09-20T04:35:02Z

pandas/tests/test_categorical.py

+        assert res is None
+
+        tm.assert_index_equal(cat.categories, expected)
+        # Test for dicts of smaller length


Nit: newline above this one.

gfyoung · 2017-09-20T04:35:10Z

pandas/tests/test_categorical.py

+                                    inplace=True)
+        assert res is None
+
+        tm.assert_index_equal(cat.categories, expected)


Nit: remove newline above this one.

gfyoung · 2017-09-20T04:35:15Z

pandas/tests/test_categorical.py

+        res = cat.rename_categories({'a': 1, 'c': 3})
+        expected = Index([1, 'b', 3, 'd'])
+        tm.assert_index_equal(res.categories, expected)
+        # Test for dicts with bigger length


Nit: newline above this one.

gfyoung · 2017-09-20T04:35:19Z

pandas/tests/test_categorical.py

+                                     'd': 4, 'e': 5, 'f': 6})
+        expected = Index([1, 2, 3, 4])
+        tm.assert_index_equal(res.categories, expected)
+        # Test for dicts with no items from old categories


Nit: newline above this one.

gfyoung · 2017-09-20T04:35:26Z

pandas/tests/test_categorical.py

+        # Test for dicts of smaller length
+        cat = pd.Categorical(['a', 'b', 'c', 'd'])
+        res = cat.rename_categories({'a': 1, 'c': 3})
+        expected = Index([1, 'b', 3, 'd'])


Nit: newline above this one.

gfyoung · 2017-09-20T04:35:32Z

pandas/tests/test_categorical.py

+        # Test for dicts with no items from old categories
+        cat = pd.Categorical(['a', 'b', 'c', 'd'])
+        res = cat.rename_categories({'f': 1, 'g': 3})
+        expected = Index(['a', 'b', 'c', 'd'])


Nit: newline above this one.

gfyoung · 2017-09-20T04:36:30Z

@alanbato : LGTM as well. Bunch of nit-picking to enhance readability is all I've got above.

alanbato · 2017-09-20T16:04:13Z

Done @gfyoung. Do we wait for green again?

gfyoung · 2017-09-20T16:23:14Z

@alanbato : Yes, ping us when it's green.

alanbato · 2017-09-20T22:10:09Z

@TomAugspurger @gfyoung @jreback Ping! 🌵✔️

gfyoung · 2017-09-20T22:12:10Z

Nice! I'll let @jreback look this over and merge just to double check.

jreback

lgtm. merge away

jreback · 2017-09-21T13:34:24Z

pandas/core/categorical.py

-        cat.categories = new_categories
+
+        if is_dict_like(new_categories):
+            cat.categories = [new_categories.get(item, item)


actually make sure the doc string is updated here as well (maybe add a versionchanged tag)

jreback · 2017-09-21T20:10:34Z

pandas/core/categorical.py


        Parameters
        ----------
-        new_categories : Index-like
+        new_categories : Index-like or Dict-like
           The renamed categories.


dict-like (>=0.21.0)

alanbato · 2017-09-21T22:31:29Z

@jreback 🌵 ✔️

jreback · 2017-09-21T22:45:36Z

thanks @alanbato nice patch!

…-dev#17586) closes pandas-dev#17336

jreback requested changes Sep 19, 2017

View reviewed changes

alanbato force-pushed the cat_dict_17336 branch from 0eb33fb to 440105d Compare September 19, 2017 22:04

alanbato force-pushed the cat_dict_17336 branch from 440105d to 16c4a9f Compare September 20, 2017 00:36

Allow for dict-like categorical renaming

d828a44

alanbato force-pushed the cat_dict_17336 branch from 16c4a9f to d828a44 Compare September 20, 2017 00:44

gfyoung added Categorical Categorical Data Type Enhancement labels Sep 20, 2017

gfyoung reviewed Sep 20, 2017

View reviewed changes

Improve readibility

0b05663

gfyoung approved these changes Sep 20, 2017

View reviewed changes

jreback approved these changes Sep 21, 2017

View reviewed changes

jreback requested changes Sep 21, 2017

View reviewed changes

jreback reviewed Sep 21, 2017

View reviewed changes

Update docstring on rename_categories

8863408

alanbato force-pushed the cat_dict_17336 branch from b212672 to 8863408 Compare September 21, 2017 20:52

jreback approved these changes Sep 21, 2017

View reviewed changes

jreback added this to the 0.21.0 milestone Sep 21, 2017

jreback merged commit b3087ef into pandas-dev:master Sep 21, 2017

alanbato deleted the cat_dict_17336 branch September 21, 2017 23:07

This was referenced Oct 25, 2017

PEFR/BUG/API: rename_categories with a series #17981

Closed

Rename categories with Series #17982

Merged

alanbato added a commit to alanbato/pandas that referenced this pull request Nov 10, 2017

Allow for dict-like argument to Categorical.rename_categories (pandas…

cb01dac

…-dev#17586) closes pandas-dev#17336

No-Stream pushed a commit to No-Stream/pandas that referenced this pull request Nov 28, 2017

Allow for dict-like argument to Categorical.rename_categories (pandas…

0c10603

…-dev#17586) closes pandas-dev#17336

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Allow for dict-like argument to Categorical.rename_categories #17586

Allow for dict-like argument to Categorical.rename_categories #17586

alanbato commented Sep 19, 2017

jreback left a comment

jreback Sep 19, 2017

jreback Sep 19, 2017

jreback Sep 19, 2017

TomAugspurger commented Sep 19, 2017

codecov bot commented Sep 19, 2017

codecov bot commented Sep 19, 2017 •

edited

Loading

gfyoung Sep 20, 2017

gfyoung Sep 20, 2017

gfyoung Sep 20, 2017

gfyoung Sep 20, 2017

gfyoung Sep 20, 2017

gfyoung Sep 20, 2017

gfyoung Sep 20, 2017

gfyoung Sep 20, 2017

gfyoung Sep 20, 2017

gfyoung commented Sep 20, 2017

alanbato commented Sep 20, 2017

gfyoung commented Sep 20, 2017

alanbato commented Sep 20, 2017

gfyoung commented Sep 20, 2017

jreback left a comment

jreback Sep 21, 2017

jreback Sep 21, 2017

alanbato commented Sep 21, 2017

jreback commented Sep 21, 2017

Allow for dict-like argument to Categorical.rename_categories #17586

Allow for dict-like argument to Categorical.rename_categories #17586

Conversation

alanbato commented Sep 19, 2017

jreback left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

TomAugspurger commented Sep 19, 2017

codecov bot commented Sep 19, 2017

Codecov Report

codecov bot commented Sep 19, 2017 • edited Loading

Codecov Report

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

gfyoung commented Sep 20, 2017

alanbato commented Sep 20, 2017

gfyoung commented Sep 20, 2017

alanbato commented Sep 20, 2017

gfyoung commented Sep 20, 2017

jreback left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

alanbato commented Sep 21, 2017

jreback commented Sep 21, 2017

codecov bot commented Sep 19, 2017 •

edited

Loading