Skip to content

Class to read OpenDocument Tables #25427

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

Merged
merged 63 commits into from
Jul 3, 2019
Merged
Changes from 1 commit
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
479e639
Class to read OpenDocument Tables
detrout Feb 27, 2019
8be4b67
Remove unneeded assignments
detrout Feb 28, 2019
77d9033
Rename filepath_or_stream to filepath_or_buffer
detrout Feb 28, 2019
47b2ffb
Use compat.string_types instead of str
detrout Feb 28, 2019
0fa2ac9
Use pd as name as pandas
detrout Feb 28, 2019
e6e2365
Use single underscore for private functions
detrout Feb 28, 2019
1bbf284
Return an unparsed sheet.
detrout Feb 28, 2019
d5c7ec0
Move ODFReader get_sheet exception testing code to its own function
detrout Feb 28, 2019
691f1e9
Append _raises to end of function name that tests exceptions
detrout Feb 28, 2019
93c2b66
Remove test docstrings that include no useful information
detrout Feb 28, 2019
394c4bd
Indicate likely minimum version.
detrout Feb 28, 2019
b149d84
Convert notes about some OpenDocument tests to comments
detrout Apr 5, 2019
19587b3
Add note about new OpenDocument functionality to whatsnew
detrout Apr 5, 2019
60a5bc1
Sort imports correctly
detrout Apr 7, 2019
1fef008
Use str instead of compat.string_types
detrout Apr 8, 2019
7148995
Remove leading underscore from ODFParser
detrout May 14, 2019
5db1a0b
Remove obsolete class (object)
detrout May 15, 2019
83c0243
Improve docstring text
detrout Jun 14, 2019
735e2b4
Merge remote-tracking branch 'upstream/master' into libreoffice-support
WillAyd Jun 28, 2019
8302fd7
Added test_odf
WillAyd Jun 28, 2019
d0df3bd
Merge remote-tracking branch 'upstream/master' into libreoffice-support
WillAyd Jun 29, 2019
47597c9
Class naming consistency
WillAyd Jun 29, 2019
9e1799a
Whatsnew linting
WillAyd Jun 29, 2019
d5c60ab
Added optional dependency load
WillAyd Jun 29, 2019
39cfecf
typo
WillAyd Jun 29, 2019
8a9a66c
Updated inheritance to use excel reader interface
WillAyd Jun 29, 2019
fd7663f
Added ods test files
WillAyd Jun 29, 2019
3bcc1b7
Updated tests
WillAyd Jun 29, 2019
15e69eb
convert_float handling
WillAyd Jun 29, 2019
65615cd
Merge remote-tracking branch 'upstream/master' into libreoffice-support
WillAyd Jun 30, 2019
9584753
Fixed missing value handling
WillAyd Jun 30, 2019
9dc34f4
Fixed error handling
WillAyd Jun 30, 2019
5e32f6d
Fixed bool handling
WillAyd Jun 30, 2019
6360c07
Skip missing file on master
WillAyd Jun 30, 2019
4227268
datetime compat
WillAyd Jun 30, 2019
80607b0
fixed row repeat
WillAyd Jun 30, 2019
43f7160
multiindex handling
WillAyd Jun 30, 2019
4da0445
Merge remote-tracking branch 'upstream/master' into libreoffice-support
WillAyd Jun 30, 2019
cbbc653
Handled horizontally merged cells
WillAyd Jun 30, 2019
1227216
Converted to pytest idiom
WillAyd Jun 30, 2019
696ed5d
Test idiom cleanup
WillAyd Jun 30, 2019
49fff9f
Removed duplicative test files
WillAyd Jun 30, 2019
7b08304
Raised NotImplemented for vertical merging
WillAyd Jun 30, 2019
4d97d84
Table attribute access simplification
WillAyd Jun 30, 2019
59cdf0b
Typing and func cleanups
WillAyd Jun 30, 2019
98d3ca7
lint and isort
WillAyd Jun 30, 2019
fb48d8d
Merge remote-tracking branch 'upstream/master' into libreoffice-support
WillAyd Jun 30, 2019
6576af9
typing fixup
WillAyd Jun 30, 2019
4dc1b51
Skip ods files for xlrd
WillAyd Jun 30, 2019
8ce45b4
Removed one-off tests
WillAyd Jul 1, 2019
f9f88b0
Handled defusedxml warnings
WillAyd Jul 1, 2019
3e0d758
Updated assert_warnings funcs to allow DeprecationWarnings
WillAyd Jul 1, 2019
ff28993
Merge remote-tracking branch 'upstream/master' into libreoffice-support
WillAyd Jul 1, 2019
7396ad6
Updated to config_init.py
WillAyd Jul 2, 2019
5a440a4
Updated whatsnew
WillAyd Jul 2, 2019
250a3d3
Updated io.rst
WillAyd Jul 2, 2019
d7e7d05
Merge remote-tracking branch 'upstream/master' into libreoffice-support
WillAyd Jul 2, 2019
93adedb
Refactored to simplify
WillAyd Jul 2, 2019
62a37e7
Removed unnecessary test
WillAyd Jul 2, 2019
13fb76f
lint fixup
WillAyd Jul 2, 2019
fb6c5ee
mypy error
WillAyd Jul 2, 2019
5c839f4
Merge remote-tracking branch 'upstream/master' into libreoffice-support
WillAyd Jul 2, 2019
4026fc1
Doc updates
WillAyd Jul 2, 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
Updated assert_warnings funcs to allow DeprecationWarnings
  • Loading branch information
WillAyd committed Jul 1, 2019
commit 3e0d7582ca284acd7a9397d76242fb1944ceb10c
9 changes: 6 additions & 3 deletions pandas/tests/io/excel/test_readers.py
Original file line number Diff line number Diff line change
Expand Up @@ -79,14 +79,16 @@ def test_usecols_int(self, read_ext, df_ref):

# usecols as int
with tm.assert_produces_warning(FutureWarning,
check_stacklevel=False):
check_stacklevel=False,
raise_on_extra_warnings=False):
with ignore_xlrd_time_clock_warning():
df1 = pd.read_excel("test1" + read_ext, "Sheet1",
index_col=0, usecols=3)

# usecols as int
with tm.assert_produces_warning(FutureWarning,
check_stacklevel=False):
check_stacklevel=False,
raise_on_extra_warnings=False):
with ignore_xlrd_time_clock_warning():
df2 = pd.read_excel("test1" + read_ext, "Sheet2", skiprows=[1],
index_col=0, usecols=3)
Expand Down Expand Up @@ -826,7 +828,8 @@ def test_excel_table_sheet_by_index(self, read_ext, df_ref):
df3 = pd.read_excel(excel, 0, index_col=0, skipfooter=1)
tm.assert_frame_equal(df3, df1.iloc[:-1])

with tm.assert_produces_warning(FutureWarning, check_stacklevel=False):
with tm.assert_produces_warning(FutureWarning, check_stacklevel=False,
raise_on_extra_warnings=False):
with pd.ExcelFile('test1' + read_ext) as excel:
df4 = pd.read_excel(excel, 0, index_col=0, skip_footer=1)

Expand Down