trying to fix tests for python312 and geoalchmey

dynamicannotationdb/annotation.py

@@ -257,6 +257,7 @@ def insert_annotations(self, table_name: str, annotations: List[dict], user_id=N
                                 that meet the schema
         user_id : str, optional
             user id to fill in any auto_user_id fields in the schema, by default None
+            note: if user_id is None, auto_user_id fields will not be filled and will need to be provided in the annotation dicts
 
         Returns
         -------

dynamicannotationdb/database.py

@@ -5,7 +5,7 @@
 
 from sqlalchemy import create_engine, func, inspect, or_
 from sqlalchemy.ext.automap import automap_base
-from sqlalchemy.ext.declarative.api import DeclarativeMeta
+from sqlalchemy.orm import DeclarativeMeta
 from sqlalchemy.orm import Session, scoped_session, sessionmaker
 from sqlalchemy.orm.exc import NoResultFound
 from sqlalchemy.schema import MetaData

pyproject.toml

@@ -20,8 +20,8 @@ classifiers = [
 requires-python = ">=3.8"
 dependencies = [
     "marshmallow==3.5.1",
-    "emannotationschemas>=5.26.0",
-    "sqlalchemy<1.4",
+    "emannotationschemas>=5.26.3",
+    "sqlalchemy>=1.4,<2",
     "psycopg2-binary",
     "geoalchemy2",
     "pytz",

requirements.txt

@@ -1,6 +1,6 @@
 marshmallow==3.5.1
-emannotationschemas>=5.26.0
-sqlalchemy<1.4
+emannotationschemas>=5.26.3
+sqlalchemy>=1.4,<2
 psycopg2-binary
 geoalchemy2
 pytz

tests/test_database.py

@@ -3,7 +3,7 @@
 import pytest
 
 from sqlalchemy import Table
-from sqlalchemy.ext.declarative.api import DeclarativeMeta
+from sqlalchemy.orm import DeclarativeMeta
 
 from emannotationschemas import type_mapping
 from dynamicannotationdb.errors import TableAlreadyExists

tests/test_schema.py

@@ -1,7 +1,7 @@
 import marshmallow
 from emannotationschemas.errors import UnknownAnnotationTypeException
 import pytest
-from sqlalchemy.ext.declarative.api import DeclarativeMeta
+from sqlalchemy.orm import DeclarativeMeta
 
 
 def test_get_schema(dadb_interface):