Merge pull request #6816 from ales-erjavec/revert-6737

[MNT] Revert #6737
biolab · May 31, 2024 · 8831a57 · 8831a57
2 parents 97490a7 + 0b7ca11
commit 8831a57
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 138 deletions.
diff --git a/Orange/data/io.py b/Orange/data/io.py
@@ -32,15 +32,6 @@
 from Orange.util import flatten
 
 
-try:
-    # temporary fix for file not closed issue until openpyxl prepare release
-    from Orange.misc.openpyxl_patch import read_worksheets
-
-    openpyxl.reader.excel.ExcelReader.read_worksheets = read_worksheets
-except:  # pylint: disable=bare-except
-    pass
-
-
 # Support values longer than 128K (i.e. text contents features)
 csv.field_size_limit(100*1024*1024)
 

diff --git a/Orange/misc/_distmatrix_xlsx.py b/Orange/misc/_distmatrix_xlsx.py
@@ -2,15 +2,6 @@
 import openpyxl
 
 
-try:
-    # temporary fix for file not closed issue until openpyxl prepare release
-    from Orange.misc.openpyxl_patch import read_worksheets
-
-    openpyxl.reader.excel.ExcelReader.read_worksheets = read_worksheets
-except:  # pylint: disable=bare-except
-    pass
-
-
 def read_matrix(filename, sheet_name=None):
     sheet = _get_sheet(filename, sheet_name)
     cells, empty_cols, empty_rows = _non_empty_cells(sheet)

diff --git a/Orange/misc/openpyxl_patch.py b/Orange/misc/openpyxl_patch.py
diff --git a/Orange/misc/tests/test_openpyxl_patch.py b/Orange/misc/tests/test_openpyxl_patch.py
diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml
@@ -56,7 +56,7 @@ requirements:
     - keyrings.alt
     - networkx
     - numpy >=1.20.0,<2
-    - openpyxl
+    - openpyxl >=3.1.3
     - openTSNE >=0.6.1,!=0.7.0
     - pandas >=1.4.0,!=1.5.0,!=2.0.0
     - packaging

diff --git a/requirements-core.txt b/requirements-core.txt
@@ -10,7 +10,7 @@ keyring
 keyrings.alt    # for alternative keyring implementations
 networkx
 numpy>=1.20.0,<2
-openpyxl
+openpyxl>=3.1.3
 openTSNE>=0.6.1,!=0.7.0  # 0.7.0 segfaults
 packaging
 pandas>=1.4.0,!=1.5.0,!=2.0.0

diff --git a/tox.ini b/tox.ini
@@ -54,7 +54,7 @@ deps =
     # oldest: keyrings.alt
     # oldest: networkx
     oldest: numpy==1.20
-    # oldest: openpyxl
+    oldest: openpyxl==3.1.3
     oldest: openTSNE==0.6.1
     oldest: pandas==1.4.0
     oldest: pip==19.3