Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
4be579e
BUG: CategoricalIndex allowed reindexing duplicate sources, but not d…
batterseapower Sep 2, 2019
cca2565
Restore original CategoricalIndex.reindex test
batterseapower Sep 3, 2019
9fa3ed3
Fix buggy code in doc, pytables test
batterseapower Sep 3, 2019
1c480c2
Fix formatting
batterseapower Sep 3, 2019
3162ce5
Make docs shorter to shut up linter
batterseapower Sep 3, 2019
6ff1105
Fix Index.union and get_indexer_non_unique bugs exposed by my categor…
batterseapower Sep 3, 2019
3051ce5
Small fixes
batterseapower Sep 3, 2019
85fdd7d
series | index still fails, but now only due to a dtype mismatch
batterseapower Sep 3, 2019
78faa9d
Last small issues
batterseapower Sep 3, 2019
5eaf83e
More whatsnew
batterseapower Sep 3, 2019
5ea41c6
Blacker
batterseapower Sep 3, 2019
b23e408
get_indexer_non_unique makes strange dtype choices
batterseapower Sep 3, 2019
06a6580
Address some review comments
batterseapower Sep 4, 2019
ad573ef
More blackening
batterseapower Sep 4, 2019
e260265
Doc changes
batterseapower Sep 10, 2019
7df795a
Docs docs
batterseapower Sep 10, 2019
5d3a861
Address review comments
batterseapower Sep 25, 2019
0ee4f89
Delete test that checks internal method
batterseapower Sep 25, 2019
f07faa3
Strip trailing wspace
batterseapower Sep 25, 2019
2b05a55
Split docs into two blocks??
batterseapower Sep 25, 2019
4ad347c
Check failures
batterseapower Sep 25, 2019
ff13dea
Maybe this is better docs?
batterseapower Sep 25, 2019
c1d2b66
Merge branch 'master' into master
batterseapower Oct 11, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
More blackening
  • Loading branch information
batterseapower committed Sep 25, 2019
commit ad573ef13ce77ab99a17f77a914eacf647c71675
4 changes: 1 addition & 3 deletions pandas/tests/indexing/test_categorical.py
Original file line number Diff line number Diff line change
Expand Up @@ -619,9 +619,7 @@ def test_reindexing(self):
assert_frame_equal(result, expected, check_index_type=True)

# give back the type of categorical that we received
result = df.reindex(
Categorical(["a", "e"], categories=cats, ordered=True)
)
result = df.reindex(Categorical(["a", "e"], categories=cats, ordered=True))
expected = DataFrame(
{"A": [0, np.nan], "B": Series(list("ae")).astype(CDT(cats, ordered=True))}
).set_index("B")
Expand Down
4 changes: 2 additions & 2 deletions pandas/tests/series/test_operators.py
Original file line number Diff line number Diff line change
Expand Up @@ -277,8 +277,8 @@ def test_logical_ops_with_index(self, op):
"op, index_op",
[
(ops.rand_, Index.intersection),
(ops.ror_, Index.union),
(ops.rxor, Index.symmetric_difference),
(ops.ror_, Index.union),
(ops.rxor, Index.symmetric_difference),
],
)
def test_reversed_logical_ops_with_index(self, op, index_op):
Expand Down