Skip to content
Merged
Changes from 1 commit
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
ae51cff
ENH: 2D support for MaskedArray
jbrockmendel Jan 6, 2021
f608792
Merge branch 'master' of https://github.com/pandas-dev/pandas into en…
jbrockmendel Jan 6, 2021
125606b
remove Any part of _mask annotation
jbrockmendel Jan 6, 2021
dd5dbbe
xfail for ArrowStringArray
jbrockmendel Jan 6, 2021
577826c
Merge branch 'master' of https://github.com/pandas-dev/pandas into en…
jbrockmendel Feb 3, 2021
17f63d4
absolute import
jbrockmendel Feb 3, 2021
33b2d78
Merge branch 'master' of https://github.com/pandas-dev/pandas into en…
jbrockmendel Feb 4, 2021
a2bd7b1
Merge branch 'master' of https://github.com/pandas-dev/pandas into en…
jbrockmendel Feb 5, 2021
3f14fa3
TST: reductions with axis
jbrockmendel Feb 5, 2021
6600588
Merge branch 'master' of https://github.com/pandas-dev/pandas into en…
jbrockmendel Feb 6, 2021
560279c
Merge branch 'master' into enh-masked-2d
jbrockmendel Feb 7, 2021
553038c
np_version_under1p17 compat
jbrockmendel Feb 7, 2021
b2a26bf
Merge branch 'master' into enh-masked-2d
jbrockmendel Feb 12, 2021
8a40d59
Merge branch 'master' into enh-masked-2d
jbrockmendel Feb 12, 2021
44999d1
xfail syntax
jbrockmendel Feb 12, 2021
7a6c226
typo fixup
jbrockmendel Feb 12, 2021
638bd9c
Merge branch 'master' into enh-masked-2d
jbrockmendel Feb 13, 2021
aca12e6
Merge branch 'master' into enh-masked-2d
jbrockmendel Feb 14, 2021
f27f8c0
Merge branch 'master' into enh-masked-2d
jbrockmendel Feb 15, 2021
3810660
Merge branch 'master' into enh-masked-2d
jbrockmendel Feb 19, 2021
f0957b3
Merge branch 'master' into enh-masked-2d
jbrockmendel Feb 22, 2021
f538868
Merge branch 'master' into enh-masked-2d
jbrockmendel Feb 23, 2021
6664d0d
isort fixup
jbrockmendel Feb 23, 2021
2792724
Merge branch 'master' into enh-masked-2d
jbrockmendel Feb 26, 2021
061a53c
Merge branch 'master' into enh-masked-2d
jbrockmendel Mar 2, 2021
6032ed1
Merge branch 'master' into enh-masked-2d
jbrockmendel Mar 3, 2021
543258d
Merge branch 'master' into enh-masked-2d
jbrockmendel Mar 6, 2021
e96ec33
Merge branch 'master' into enh-masked-2d
jbrockmendel Mar 9, 2021
6ca7f01
Merge branch 'master' into enh-masked-2d
jbrockmendel Mar 10, 2021
6f26c4b
Fix pad/backfill 2d
jbrockmendel Mar 12, 2021
3dedb8f
Merge branch 'master' into enh-masked-2d
jbrockmendel Mar 12, 2021
34fda97
typo fixup
jbrockmendel Mar 12, 2021
2a108ba
Merge branch 'master' into enh-masked-2d
jbrockmendel Mar 15, 2021
2c99e59
Merge branch 'master' into enh-masked-2d
jbrockmendel Mar 16, 2021
ee9c3a0
Merge branch 'master' into enh-masked-2d
jbrockmendel Mar 31, 2021
efd0071
Merge branch 'master' into enh-masked-2d
jbrockmendel Mar 31, 2021
3839b98
Merge branch 'master' into enh-masked-2d
jbrockmendel Apr 8, 2021
0956993
Merge branch 'master' into enh-masked-2d
jbrockmendel Apr 14, 2021
4b75101
comment
jbrockmendel Apr 14, 2021
639fc23
Merge branch 'master' into enh-masked-2d
jbrockmendel May 4, 2021
2989efc
Merge branch 'master' into enh-masked-2d
jbrockmendel May 9, 2021
81cd3e4
Merge branch 'master' into enh-masked-2d
jbrockmendel May 17, 2021
8f315bc
Merge branch 'master' into enh-masked-2d
jbrockmendel Aug 3, 2021
21cf578
fix broken tests
jbrockmendel Aug 4, 2021
6f215d6
Merge branch 'master' into enh-masked-2d
jbrockmendel Sep 28, 2021
e68c797
Merge branch 'master' into enh-masked-2d
jbrockmendel Sep 29, 2021
17dd19a
Merge branch 'master' into enh-masked-2d
jbrockmendel Oct 3, 2021
93d65eb
Merge branch 'master' into enh-masked-2d
jbrockmendel Oct 6, 2021
3bfe60c
comment
jbrockmendel Oct 6, 2021
5c28d69
Merge branch 'master' into enh-masked-2d
jbrockmendel Oct 8, 2021
92d710b
Merge branch 'master' of https://github.com/pandas-dev/pandas into en…
jbrockmendel Oct 10, 2021
5b014c1
troubleshoot windows build
jbrockmendel Oct 11, 2021
db76ca0
Merge branch 'master' into enh-masked-2d
jbrockmendel Oct 11, 2021
8148fcd
Merge branch 'master' into enh-masked-2d
jbrockmendel Oct 13, 2021
15a533f
troubleshoot 32bit builds
jbrockmendel Oct 13, 2021
7a7601e
troubleshoot 32bit builds
jbrockmendel Oct 14, 2021
7c6baaf
troubleshoot 32 bit builds
jbrockmendel Oct 14, 2021
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
Merge branch 'master' into enh-masked-2d
  • Loading branch information
jbrockmendel committed Mar 16, 2021
commit 2c99e594d154e2653cbe5427aaa286049495faa6
3 changes: 2 additions & 1 deletion pandas/core/indexes/extension.py
Original file line number Diff line number Diff line change
Expand Up @@ -250,8 +250,9 @@ def __getitem__(self, key):
result = self._data[key]
if isinstance(result, type(self._data)):
if result.ndim == 1:
return type(self)(result, name=self.name)
return type(self)(result, name=self._name)

# Unpack to ndarray for MPL compat
result = result._ndarray

# Includes cases where we get a 2D ndarray back for MPL compat
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.