Upgrade SQLAlchemy to version 2

parsl/monitoring/db_manager.py

@@ -78,7 +78,7 @@ def __init__(self,
 
     def _get_mapper(self, table_obj: Table) -> Mapper:
         all_mappers: Set[Mapper] = set()
-        for mapper_registry in mapperlib._all_registries():  # type: ignore[attr-defined]
+        for mapper_registry in mapperlib._all_registries():
             all_mappers.update(mapper_registry.mappers)
         mapper_gen = (
             mapper for mapper in all_mappers

parsl/tests/test_monitoring/test_app_names.py

@@ -67,7 +67,7 @@ def test_app_name(get_app, expected_name, expected_result, tmpd_cwd):
     with engine.begin() as connection:
 
         def count_rows(table: str):
-            result = connection.execute(f"SELECT COUNT(*) FROM {table}")
+            result = connection.execute(sqlalchemy.text(f"SELECT COUNT(*) FROM {table}"))
             (c, ) = result.first()
             return c
 
@@ -81,6 +81,6 @@ def count_rows(table: str):
         assert count_rows("try") == 1
 
         # ... and has the expected name.
-        result = connection.execute("SELECT task_func_name FROM task")
+        result = connection.execute(sqlalchemy.text("SELECT task_func_name FROM task"))
         (c, ) = result.first()
         assert c == expected_name

parsl/tests/test_monitoring/test_stdouterr.py

@@ -106,7 +106,7 @@ def test_stdstream_to_monitoring(stdx, expected_stdx, stream, tmpd_cwd, caplog):
     with engine.begin() as connection:
 
         def count_rows(table: str):
-            result = connection.execute(f"SELECT COUNT(*) FROM {table}")
+            result = connection.execute(sqlalchemy.text(f"SELECT COUNT(*) FROM {table}"))
             (c, ) = result.first()
             return c
 
@@ -120,7 +120,7 @@ def count_rows(table: str):
         assert count_rows("try") == 1
 
         # ... and has the expected name.
-        result = connection.execute(f"SELECT task_{stream} FROM task")
+        result = connection.execute(sqlalchemy.text(f"SELECT task_{stream} FROM task"))
         (c, ) = result.first()
 
         if isinstance(expected_stdx, str):

setup.py

@@ -8,7 +8,9 @@
 
 extras_require = {
     'monitoring' : [
-        'sqlalchemy>=1.4,<2'
+        # sqlalchemy does not use semantic versioning.
+        # see https://github.com/sqlalchemy/sqlalchemy/discussions/11391#discussioncomment-9472033
+        'sqlalchemy>=2,<2.1'
     ],
     'visualization' : [
         # this pydot bound is copied from networkx's pyproject.toml,

test-requirements.txt

@@ -14,8 +14,7 @@ mpi4py
 # sqlalchemy is needed for typechecking, so it's here
 # as well as at runtime for optional monitoring execution
 # (where it's specified in setup.py)
-sqlalchemy>=1.4,<2
-sqlalchemy2-stubs
+sqlalchemy>=2,<2.1
 
 Sphinx==4.5.0
 twine