-
-
Notifications
You must be signed in to change notification settings - Fork 18.4k
Catch Exception in combine #22936
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Catch Exception in combine #22936
Changes from 13 commits
fdd43c4
ce94bf9
0c53f08
9059c0d
85fc5d8
2183f7b
0eef0cf
be63feb
a4a2933
b9c7e4b
ce1a3c6
5372134
01f7366
1921c6f
7714e79
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
from .array import DecimalArray, DecimalDtype, to_decimal, make_data | ||
|
||
|
||
__all__ = ['DecimalArray', 'DecimalDtype', 'to_decimal', 'make_data'] |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
from .array import JSONArray, JSONDtype, make_data | ||
|
||
__all__ = ['JSONArray', 'JSONDtype', 'make_data'] |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -13,6 +13,8 @@ | |
import collections | ||
import itertools | ||
import numbers | ||
import random | ||
import string | ||
import sys | ||
|
||
import numpy as np | ||
|
@@ -179,3 +181,10 @@ def _values_for_argsort(self): | |
# cast them to an (N, P) array, instead of an (N,) array of tuples. | ||
frozen = [()] + [tuple(x.items()) for x in self] | ||
return np.array(frozen, dtype=object)[1:] | ||
|
||
|
||
def make_data(): | ||
# TODO: Use a regular dict. See _NDFrameIndexer._setitem_with_indexer | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. this is pretty odd here There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @jorisvandenbossche requested these be exported, since they're useful for creating datasets. It'd be more strange to import it from the test file. |
||
return [collections.UserDict([ | ||
(random.choice(string.ascii_letters), random.randint(0, 100)) | ||
for _ in range(random.randint(0, 10))]) for _ in range(100)] |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hmm, this looks like it's in the wrong place.
Right now with
coerce_to_dtype=False
we'd return an list, not an ndarray. I assume we want an ndarray of objects regardless ofcoerce_to_dtype
? I don't want the return type to beUnion[ExtensionArray, List, ndarray]
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Grr... ok what do to here?
If we do
we'll start failing some other tests like
Series[DecimalArray] == 1
, since we get an object dtype instead of bool. So we just leave it up to NumPy's regular inference then,res = np.asarray(res)
?