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" diff --git a/adapter/to_python.py b/adapter/to_python.py index 99da0e5..7519c05 100644 --- a/adapter/to_python.py +++ b/adapter/to_python.py @@ -74,7 +74,7 @@ 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} + 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..f1db7a1 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.1.2", ], )