Skip to content

Follow-up: XLSB Support #31215

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 35 commits into from
Jan 22, 2020
Merged

Follow-up: XLSB Support #31215

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
a4f2d22
initial xlsb support
Rik-de-Kort Nov 24, 2019
62564cf
Import order fix for CI pass
Rik-de-Kort Nov 25, 2019
a7a8460
Initial tests
Rik-de-Kort Nov 26, 2019
d9be281
style fixes
Rik-de-Kort Nov 28, 2019
8bf8c78
documentation
Rik-de-Kort Nov 28, 2019
cd95dce
forgot place to document
Rik-de-Kort Nov 28, 2019
7a7390d
Fixed test issue with XLRDError
Rik-de-Kort Nov 30, 2019
248ac12
Fix for unnamed column issue
Rik-de-Kort Nov 30, 2019
6ea78de
style fix
Rik-de-Kort Dec 1, 2019
44c5439
line up with upstream master
Rik-de-Kort Dec 1, 2019
92c98cd
Merge branch 'master' of https://github.com/pandas-dev/pandas
Rik-de-Kort Dec 1, 2019
64fa6f3
Fix broken xlrd test
Rik-de-Kort Dec 2, 2019
cb276e8
get docs to build
Rik-de-Kort Dec 2, 2019
4ebcb48
Remove warning filter
Rik-de-Kort Dec 6, 2019
71436a0
Merge branch 'master' of https://github.com/Rik-de-Kort/pandas
Rik-de-Kort Dec 6, 2019
00cc66b
extended description update
Rik-de-Kort Dec 7, 2019
4c81853
Merge branch 'master' of https://github.com/pandas-dev/pandas
Rik-de-Kort Dec 7, 2019
e85da03
Xlsb options instead of odf options
Rik-de-Kort Dec 9, 2019
2348c3b
Add reference in whatsnew to docs
Rik-de-Kort Dec 11, 2019
d02a5a5
Make pyxlsb show up in install.rst and show_versions
Rik-de-Kort Dec 11, 2019
c71e021
Add pyxlsb to ci builds
Rik-de-Kort Dec 14, 2019
ae3f9ea
environment.yml update
Rik-de-Kort Dec 14, 2019
a410e51
Merge upstream master
Rik-de-Kort Dec 15, 2019
7c9dcce
One update to environment.yml too many
Rik-de-Kort Dec 19, 2019
4bd8400
Trying to fix build
Rik-de-Kort Dec 23, 2019
43ab0fe
Merge upstream
Rik-de-Kort Jan 15, 2020
024492a
Added issue number
Rik-de-Kort Jan 15, 2020
b424c8e
Updated to use .rows(sparse=False) for future compat
Rik-de-Kort Jan 15, 2020
571489b
Merge branch 'master' of https://github.com/pandas-dev/pandas
Rik-de-Kort Jan 17, 2020
dad4a53
xfails in test_readers.py
Rik-de-Kort Jan 17, 2020
9b6bc9a
xfail url loads
Rik-de-Kort Jan 18, 2020
b92348e
Merge branch 'master' of https://github.com/pandas-dev/pandas
Rik-de-Kort Jan 22, 2020
c2cbfd7
Update min version
Rik-de-Kort Jan 22, 2020
799bb28
test xfailing for the right reason
Rik-de-Kort Jan 22, 2020
b97c4ae
xfail unnecessary due to consistency check only
Rik-de-Kort Jan 22, 2020
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
2 changes: 1 addition & 1 deletion doc/source/getting_started/install.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ pyarrow 0.12.0 Parquet, ORC (requires 0.13.0), and
pymysql 0.7.11 MySQL engine for sqlalchemy
pyreadstat SPSS files (.sav) reading
pytables 3.4.2 HDF5 reading / writing
pyxlsb 1.0.5 Reading for xlsb files
pyxlsb 1.0.6 Reading for xlsb files
qtpy Clipboard I/O
s3fs 0.3.0 Amazon S3 access
tabulate 0.8.3 Printing in Markdown-friendly format (see `tabulate`_)
Expand Down
2 changes: 1 addition & 1 deletion pandas/compat/_optional.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"pyarrow": "0.13.0",
"pytables": "3.4.2",
"pytest": "5.0.1",
"pyxlsb": "1.0.5",
"pyxlsb": "1.0.6",
"s3fs": "0.3.0",
"scipy": "0.19.0",
"sqlalchemy": "1.1.4",
Expand Down
5 changes: 0 additions & 5 deletions pandas/tests/io/excel/test_readers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -562,11 +562,6 @@ def test_bad_engine_raises(self, read_ext):

@tm.network
def test_read_from_http_url(self, read_ext):
if read_ext == ".xlsb":
pytest.xfail("xlsb files not present in master repo yet")
if pd.read_excel.keywords["engine"] == "pyxlsb":
pytest.xfail("Sheets containing datetimes not supported by pyxlsb")

url = (
"https://raw.githubusercontent.com/pandas-dev/pandas/master/"
"pandas/tests/io/data/excel/test1" + read_ext
Expand Down