From d0cf469796b12218200357c52676e5481ea61a29 Mon Sep 17 00:00:00 2001 From: NewUserHa <32261870+NewUserHa@users.noreply.github.com> Date: Fri, 26 Jan 2024 12:15:50 +0800 Subject: [PATCH 1/6] Update install.rst to match the newest code --- doc/source/getting_started/install.rst | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/doc/source/getting_started/install.rst b/doc/source/getting_started/install.rst index b54a220f74ca3..8c038c8f6ba0b 100644 --- a/doc/source/getting_started/install.rst +++ b/doc/source/getting_started/install.rst @@ -277,11 +277,12 @@ Installable with ``pip install "pandas[excel]"``. ========================= ================== =============== ============================================================= Dependency Minimum Version pip extra Notes ========================= ================== =============== ============================================================= -xlrd 2.0.1 excel Reading Excel -xlsxwriter 3.0.5 excel Writing Excel -openpyxl 3.1.0 excel Reading / writing for xlsx files +openpyxl 3.1.0 excel Reading / writing for Excel 2010 xlsx/xlsm/xltx/xltm files +xlrd 2.0.1 excel Reading / writing for xls files +xlsxwriter 3.0.5 excel Writing for xlsx files +python-calamine 0.1.7 excel Reading for xls/xlsx/xlsm/xlsb/xla/xlam/ods files pyxlsb 1.0.10 excel Reading for xlsb files -python-calamine 0.1.7 excel Reading for xls/xlsx/xlsb/ods files +odfpy 1.4.1 excel Reading / writing for OpenDocument v. 1.2 files ========================= ================== =============== ============================================================= HTML From 699435ff82fe22d76aca0a9c6fc2584d1d0c9293 Mon Sep 17 00:00:00 2001 From: NewUserHa <32261870+NewUserHa@users.noreply.github.com> Date: Fri, 26 Jan 2024 12:20:14 +0800 Subject: [PATCH 2/6] Update pyproject.toml --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index ffd3a7e1f1f33..def6186ee1a22 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -68,7 +68,7 @@ computation = ['scipy>=1.10.0', 'xarray>=2022.12.0'] fss = ['fsspec>=2022.11.0'] aws = ['s3fs>=2022.11.0'] gcp = ['gcsfs>=2022.11.0', 'pandas-gbq>=0.19.0'] -excel = ['odfpy>=1.4.1', 'openpyxl>=3.1.0', 'python-calamine>=0.1.7', 'pyxlsb>=1.0.10', 'xlrd>=2.0.1', 'xlsxwriter>=3.0.5'] +excel = ['openpyxl>=3.1.0', 'xlrd>=2.0.1', 'python-calamine>=0.1.7', 'xlsxwriter>=3.0.5', 'pyxlsb>=1.0.10', 'odfpy>=1.4.1'] parquet = ['pyarrow>=10.0.1'] feather = ['pyarrow>=10.0.1'] hdf5 = [# blosc only available on conda (https://github.com/Blosc/python-blosc/issues/297) From d0de8e880074dae85d35d8c169963f52cbfeb2ac Mon Sep 17 00:00:00 2001 From: NewUserHa <32261870+NewUserHa@users.noreply.github.com> Date: Sat, 27 Jan 2024 02:04:33 +0800 Subject: [PATCH 3/6] Update install.rst --- doc/source/getting_started/install.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/source/getting_started/install.rst b/doc/source/getting_started/install.rst index 8c038c8f6ba0b..02844fc4a7436 100644 --- a/doc/source/getting_started/install.rst +++ b/doc/source/getting_started/install.rst @@ -277,11 +277,11 @@ Installable with ``pip install "pandas[excel]"``. ========================= ================== =============== ============================================================= Dependency Minimum Version pip extra Notes ========================= ================== =============== ============================================================= -openpyxl 3.1.0 excel Reading / writing for Excel 2010 xlsx/xlsm/xltx/xltm files xlrd 2.0.1 excel Reading / writing for xls files xlsxwriter 3.0.5 excel Writing for xlsx files -python-calamine 0.1.7 excel Reading for xls/xlsx/xlsm/xlsb/xla/xlam/ods files +openpyxl 3.1.0 excel Reading / writing for Excel 2010 xlsx/xlsm/xltx/xltm files pyxlsb 1.0.10 excel Reading for xlsb files +python-calamine 0.1.7 excel Reading for xls/xlsx/xlsm/xlsb/xla/xlam/ods files odfpy 1.4.1 excel Reading / writing for OpenDocument v. 1.2 files ========================= ================== =============== ============================================================= From 8afc8ff49d43024cd503c910face887e2c436ac6 Mon Sep 17 00:00:00 2001 From: NewUserHa <32261870+NewUserHa@users.noreply.github.com> Date: Sat, 27 Jan 2024 02:06:16 +0800 Subject: [PATCH 4/6] Update pyproject.toml --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index def6186ee1a22..ffd3a7e1f1f33 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -68,7 +68,7 @@ computation = ['scipy>=1.10.0', 'xarray>=2022.12.0'] fss = ['fsspec>=2022.11.0'] aws = ['s3fs>=2022.11.0'] gcp = ['gcsfs>=2022.11.0', 'pandas-gbq>=0.19.0'] -excel = ['openpyxl>=3.1.0', 'xlrd>=2.0.1', 'python-calamine>=0.1.7', 'xlsxwriter>=3.0.5', 'pyxlsb>=1.0.10', 'odfpy>=1.4.1'] +excel = ['odfpy>=1.4.1', 'openpyxl>=3.1.0', 'python-calamine>=0.1.7', 'pyxlsb>=1.0.10', 'xlrd>=2.0.1', 'xlsxwriter>=3.0.5'] parquet = ['pyarrow>=10.0.1'] feather = ['pyarrow>=10.0.1'] hdf5 = [# blosc only available on conda (https://github.com/Blosc/python-blosc/issues/297) From 1d5013b99c3670cc1b6b71c9fccfdc790f92ddc8 Mon Sep 17 00:00:00 2001 From: NewUserHa <32261870+NewUserHa@users.noreply.github.com> Date: Sat, 27 Jan 2024 02:59:47 +0800 Subject: [PATCH 5/6] Update install.rst --- doc/source/getting_started/install.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/source/getting_started/install.rst b/doc/source/getting_started/install.rst index 02844fc4a7436..b2cd562e6749f 100644 --- a/doc/source/getting_started/install.rst +++ b/doc/source/getting_started/install.rst @@ -277,7 +277,7 @@ Installable with ``pip install "pandas[excel]"``. ========================= ================== =============== ============================================================= Dependency Minimum Version pip extra Notes ========================= ================== =============== ============================================================= -xlrd 2.0.1 excel Reading / writing for xls files +xlrd 2.0.1 excel Reading for xls files xlsxwriter 3.0.5 excel Writing for xlsx files openpyxl 3.1.0 excel Reading / writing for Excel 2010 xlsx/xlsm/xltx/xltm files pyxlsb 1.0.10 excel Reading for xlsb files From 8955f2dd0163a864ca99903ee131738ca72249cc Mon Sep 17 00:00:00 2001 From: NewUserHa <32261870+NewUserHa@users.noreply.github.com> Date: Sat, 27 Jan 2024 03:01:00 +0800 Subject: [PATCH 6/6] Update install.rst --- doc/source/getting_started/install.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/source/getting_started/install.rst b/doc/source/getting_started/install.rst index b2cd562e6749f..b2d137f12555e 100644 --- a/doc/source/getting_started/install.rst +++ b/doc/source/getting_started/install.rst @@ -282,7 +282,7 @@ xlsxwriter 3.0.5 excel Writing for xlsx fi openpyxl 3.1.0 excel Reading / writing for Excel 2010 xlsx/xlsm/xltx/xltm files pyxlsb 1.0.10 excel Reading for xlsb files python-calamine 0.1.7 excel Reading for xls/xlsx/xlsm/xlsb/xla/xlam/ods files -odfpy 1.4.1 excel Reading / writing for OpenDocument v. 1.2 files +odfpy 1.4.1 excel Reading / writing for OpenDocument 1.2 files ========================= ================== =============== ============================================================= HTML