From 7cee2c8551db50bc90e8d182be1880f3a6105d76 Mon Sep 17 00:00:00 2001 From: phofl Date: Sat, 9 Jan 2021 23:18:40 +0100 Subject: [PATCH 1/2] Pin xlrd to 1.2.0 --- environment.yml | 2 +- requirements-dev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/environment.yml b/environment.yml index 600a20b153ed3..65322063cea8e 100644 --- a/environment.yml +++ b/environment.yml @@ -92,7 +92,7 @@ dependencies: # pd.read_excel, DataFrame.to_excel, pd.ExcelWriter, pd.ExcelFile - openpyxl - - xlrd + - xlrd=1.2.0 - xlsxwriter - xlwt - odfpy diff --git a/requirements-dev.txt b/requirements-dev.txt index d45e87b1785b0..87b8df0369546 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -58,7 +58,7 @@ beautifulsoup4>=4.6.0 html5lib lxml openpyxl -xlrd +xlrd==1.2.0 xlsxwriter xlwt odfpy From c14d23aabdc598863f0ab05f82185a26c5752dcc Mon Sep 17 00:00:00 2001 From: phofl Date: Sat, 9 Jan 2021 23:46:54 +0100 Subject: [PATCH 2/2] Remove xlrd engine in benchmark --- asv_bench/benchmarks/io/excel.py | 2 +- environment.yml | 2 +- requirements-dev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/asv_bench/benchmarks/io/excel.py b/asv_bench/benchmarks/io/excel.py index 80af2cff41769..96f02d37db1e1 100644 --- a/asv_bench/benchmarks/io/excel.py +++ b/asv_bench/benchmarks/io/excel.py @@ -40,7 +40,7 @@ def time_write_excel(self, engine): class ReadExcel: - params = ["xlrd", "openpyxl", "odf"] + params = ["openpyxl", "odf"] param_names = ["engine"] fname_excel = "spreadsheet.xlsx" fname_odf = "spreadsheet.ods" diff --git a/environment.yml b/environment.yml index 65322063cea8e..600a20b153ed3 100644 --- a/environment.yml +++ b/environment.yml @@ -92,7 +92,7 @@ dependencies: # pd.read_excel, DataFrame.to_excel, pd.ExcelWriter, pd.ExcelFile - openpyxl - - xlrd=1.2.0 + - xlrd - xlsxwriter - xlwt - odfpy diff --git a/requirements-dev.txt b/requirements-dev.txt index 87b8df0369546..d45e87b1785b0 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -58,7 +58,7 @@ beautifulsoup4>=4.6.0 html5lib lxml openpyxl -xlrd==1.2.0 +xlrd xlsxwriter xlwt odfpy