8000 Catch Exception in combine by TomAugspurger · Pull Request #22936 · pandas-dev/pandas · GitHub
[go: up one dir, main page]
Skip to content

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.

Sign up for GitHub

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

Merged
merged 15 commits into from
Oct 4, 2018
Merged

Catch Exception in combine #22936

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
fdd43c4
Closes https://github.com/pandas-dev/pandas/issues/22850
TomAugspurger Oct 2, 2018
ce94bf9
Moves
TomAugspurger Oct 2, 2018
0c53f08
Imports
TomAugspurger Oct 2, 2018
9059c0d
Note
TomAugspurger Oct 2, 2018
85fc5d8
Merge remote-tracking branch 'upstream/master' into combine-exception
TomAugspurger Oct 2, 2018
2183f7b
api
TomAugspurger Oct 2, 2018
0eef0cf
move back
TomAugspurger Oct 2, 2018
be63feb
move test
TomAugspurger Oct 2, 2018
a4a2933
handle test
TomAugspurger Oct 2, 2018
b9c7e4b
remove old note
TomAugspurger Oct 2, 2018
ce1a3c6
fixed move
TomAugspurger Oct 2, 2018
5372134
fixed move
TomAugspurger Oct 2, 2018
01f7366
Merge remote-tracking branch 'upstream/master' into combine-exception
TomAugspurger Oct 2, 2018
1921c6f
Merge remote-tracking branch 'upstream/master' into combine-exception
TomAugspurger Oct 3, 2018
7714e79
Always return ndarray
TomAugspurger Oct 3, 2018
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
Imports
  • Loading branch information
@TomAugspurger
TomAugspurger committed Oct 2, 2018
commit 0c53f080b419151286b6991acff540150f13fccc
5 changes: 4 additions & 1 deletion pandas/tests/extension/decimal_array/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
from .array import DecimalArray, DecimalDtype
from .array import DecimalArray, DecimalDtype


__all__ = ['DecimalArray', 'DecimalDtype']
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you add here make_data ? (that are typically the ones that I use to test things out locally)

3 changes: 3 additions & 0 deletions pandas/tests/extension/json_array/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
from .array import JSONArray, JSONDtype

__all__ = ['JSONArray', 'JSONDtype']
0