From 6470eab36a5587137852506565e876d93dda13de Mon Sep 17 00:00:00 2001 From: Evan Neill Date: Thu, 4 Apr 2024 14:51:27 -0700 Subject: [PATCH 1/5] update dependency requirements --- adapter/to_python.py | 8 +++++++- setup.py | 6 +++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/adapter/to_python.py b/adapter/to_python.py index 99da0e5..aabc764 100644 --- a/adapter/to_python.py +++ b/adapter/to_python.py @@ -74,7 +74,13 @@ def load(self, data_object_names=None, kind="all"): values """ # check if any name in data_object_names not in excel file - all_input_ranges = {object_range.name for object_range in self.wb.defined_names.definedName} + if hasattr(self.wb.defined_names,"definedName"): + # This case is for openpyxl <3.1.0 + all_input_ranges = {object_range.name for object_range in self.wb.defined_names.definedName} + else: + # This case is for openpyxl ≥3.1.0 + all_input_ranges = set(self.wb.defined_names.keys()) + all_input_tables = {object_table for ws in self.wb.worksheets for object_table in ws.tables.keys()} all_input_objects = all_input_ranges | all_input_tables diff --git a/setup.py b/setup.py index d99d353..325e322 100644 --- a/setup.py +++ b/setup.py @@ -42,10 +42,10 @@ def get_version(rel_path): keywords="data, tables, IO for research computation, sql, excel, csv, dataframe, connection", packages=find_packages(exclude=["*.tests", "*.tests"]), install_requires=[ - "pandas>=1.0.4", + "pandas>=2.2.0", "xlwings>=0.19.4", "psycopg2-binary>=2.8.6", - "SQLAlchemy==1.4.29", - "openpyxl==3.0.9", + "SQLAlchemy>=2.0.0", + "openpyxl>=3.0.9", ], ) From b8c0e6f1c8745196664e43efcc33f226e1633a60 Mon Sep 17 00:00:00 2001 From: Evan Neill Date: Fri, 5 Apr 2024 09:56:13 -0700 Subject: [PATCH 2/5] increment minor version --- adapter/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adapter/__init__.py b/adapter/__init__.py index 9606c9f..18d25cf 100644 --- a/adapter/__init__.py +++ b/adapter/__init__.py @@ -5,5 +5,5 @@ # build dist backup: drive, Public Code/Adapter -__version__ = "1.6.1" +__version__ = "1.7.0" From e9f29abf2c7f6ccdd1244451790dd4cd9fbee887 Mon Sep 17 00:00:00 2001 From: Evan Neill Date: Fri, 5 Apr 2024 12:18:44 -0700 Subject: [PATCH 3/5] pandas 2.2.0 requires openpyxl at least 3.1.0, don't support backwards compatibility --- adapter/to_python.py | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/adapter/to_python.py b/adapter/to_python.py index aabc764..824c21f 100644 --- a/adapter/to_python.py +++ b/adapter/to_python.py @@ -73,14 +73,7 @@ def load(self, data_object_names=None, kind="all"): the corresponding named data object values """ - # check if any name in data_object_names not in excel file - if hasattr(self.wb.defined_names,"definedName"): - # This case is for openpyxl <3.1.0 - all_input_ranges = {object_range.name for object_range in self.wb.defined_names.definedName} - else: - # This case is for openpyxl ≥3.1.0 - all_input_ranges = set(self.wb.defined_names.keys()) - + all_input_ranges = set(self.wb.defined_names.keys()) all_input_tables = {object_table for ws in self.wb.worksheets for object_table in ws.tables.keys()} all_input_objects = all_input_ranges | all_input_tables From a7dc7a96636717d30d5d233a6779b9cbcb28f840 Mon Sep 17 00:00:00 2001 From: Evan Neill Date: Fri, 5 Apr 2024 12:19:58 -0700 Subject: [PATCH 4/5] re-add deleted comment --- adapter/to_python.py | 1 + 1 file changed, 1 insertion(+) diff --git a/adapter/to_python.py b/adapter/to_python.py index 824c21f..7519c05 100644 --- a/adapter/to_python.py +++ b/adapter/to_python.py @@ -73,6 +73,7 @@ def load(self, data_object_names=None, kind="all"): the corresponding named data object values """ + # check if any name in data_object_names not in excel file all_input_ranges = set(self.wb.defined_names.keys()) all_input_tables = {object_table for ws in self.wb.worksheets for object_table in ws.tables.keys()} all_input_objects = all_input_ranges | all_input_tables From eb78465889239ad3605198d31fd93ea2c1e828cf Mon Sep 17 00:00:00 2001 From: Evan Neill Date: Fri, 5 Apr 2024 12:40:21 -0700 Subject: [PATCH 5/5] increment openpyxl min version to least that accommodates to_python changes --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 325e322..f1db7a1 100644 --- a/setup.py +++ b/setup.py @@ -46,6 +46,6 @@ def get_version(rel_path): "xlwings>=0.19.4", "psycopg2-binary>=2.8.6", "SQLAlchemy>=2.0.0", - "openpyxl>=3.0.9", + "openpyxl>=3.1.2", ], )