From 8bcb6072163226bd4eac8373295f4b5c86eee755 Mon Sep 17 00:00:00 2001 From: "John T. Sexton" Date: Fri, 15 Jan 2021 13:49:23 -0600 Subject: [PATCH] Avoid new versions of the xlrd package. xlrd reads Excel files, but its ability to read .xlsx files was recently removed and it's no longer actively maintained. FlowCal still requires xlrd to read .xlsx files with old versions of pandas where the alternative (and now recommended) openpyxl engine is not recognized. This fix avoids the new versions of xlrd to ensure it can still read .xlsx files. (FlowCal still uses openpyxl first where available.) --- doc/getting_started/install_python.rst | 2 +- requirements.txt | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/getting_started/install_python.rst b/doc/getting_started/install_python.rst index 3ecd41f..26459fc 100644 --- a/doc/getting_started/install_python.rst +++ b/doc/getting_started/install_python.rst @@ -17,7 +17,7 @@ Alternatively, download ``FlowCal`` from `here =0.10.0) * ``scikit-learn`` (>=0.16.0) * ``pandas`` (>=0.23.0) -* ``xlrd`` (>=0.9.2) +* ``xlrd`` (>=0.9.2,<2.0.0) * ``openpyxl`` (>=2.2.0) If you have ``pip``, a ``requirements.txt`` file is provided, such that the required packages can be installed by running:: diff --git a/requirements.txt b/requirements.txt index b113548..bd8e5b4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,5 +6,5 @@ matplotlib>=2.0.0 scikit-image>=0.10.0 scikit-learn>=0.16.0 pandas>=0.23.0 -xlrd>=0.9.2 +xlrd>=0.9.2,<2.0.0 openpyxl>=2.2.0 diff --git a/setup.py b/setup.py index 6f1d04f..6335724 100644 --- a/setup.py +++ b/setup.py @@ -94,7 +94,7 @@ def find_version(file_path): 'scikit-image>=0.10.0', 'scikit-learn>=0.16.0', 'pandas>=0.23.0', - 'xlrd>=0.9.2', + 'xlrd>=0.9.2,<2.0.0', 'openpyxl>=2.2.0'], # List additional groups of dependencies here (e.g. development