File tree 2 files changed +5
-2
lines changed
2 files changed +5
-2
lines changed Original file line number Diff line number Diff line change @@ -41,6 +41,8 @@ doc/_build
41
41
dist
42
42
# Egg metadata
43
43
* .egg-info
44
+ .eggs
45
+
44
46
# tox testing tool
45
47
.tox
46
48
# rope
Original file line number Diff line number Diff line change @@ -1722,6 +1722,7 @@ def _concat_compat(to_concat, axis=0):
1722
1722
----------
1723
1723
to_concat : array of arrays
1724
1724
axis : axis to provide concatenation
1725
+ in the current impl this is always 0, e.g. we only have 1-d categoricals
1725
1726
1726
1727
Returns
1727
1728
-------
@@ -1744,7 +1745,7 @@ def convert_categorical(x):
1744
1745
1745
1746
# convert to object type and perform a regular concat
1746
1747
from pandas .core .common import _concat_compat
1747
- return _concat_compat ([ np .array (x ,copy = False ).astype ('object' ) for x in to_concat ],axis = axis )
1748
+ return _concat_compat ([ np .array (x ,copy = False ).astype ('object' ) for x in to_concat ],axis = 0 )
1748
1749
1749
1750
# we could have object blocks and categorical's here
1750
1751
# if we only have a single cateogoricals then combine everything
@@ -1761,4 +1762,4 @@ def convert_categorical(x):
1761
1762
raise ValueError ("incompatible categories in categorical concat" )
1762
1763
1763
1764
# concat them
1764
- return Categorical (np .concatenate ([ convert_categorical (x ) for x in to_concat ],axis = axis ), categories = categories )
1765
+ return Categorical (np .concatenate ([ convert_categorical (x ) for x in to_concat ],axis = 0 ), categories = categories )
You can’t perform that action at this time.
0 commit comments