Migration to sqlalchemy version 2

.github/workflows/update-orm.yml

@@ -63,6 +63,7 @@ jobs:
           path: dist/
 
       - uses: shogo82148/actions-setup-mysql@v1
+        if: ${{ steps.checkUpdate.outputs.needsUpdate == 'true' }}
         with:
           distribution: 'mariadb'
           mysql-version: '10.6'

pyproject.toml

@@ -25,7 +25,7 @@ keywords = ["ISPyB", "database"]
 requires-python = ">=3.7"
 readme = "README.md"
 license = { text = "Apache License 2.0" }
-dependencies = ["mysql-connector-python>=8.0.32", "sqlalchemy<2", "tabulate"]
+dependencies = ["mysql-connector-python>=8.0.32", "sqlalchemy>=2", "tabulate"]
 
 [project.urls]
 Documentation = "https://ispyb.readthedocs.io"

requirements_orm.txt

@@ -1,3 +1,3 @@
 mysql-connector-python>=8.0.32
 sqlacodegen<3
-sqlalchemy<2
+sqlalchemy>=2

src/ispyb/cli/last_data_collections_on.py

@@ -57,15 +57,15 @@ def get_last_data_collections_on(beamlines, db_session, limit=10, latest_dcid=No
         db_session.query(BLSession, DataCollection, GridInfo, Proposal)
         .options(
             Load(DataCollection).load_only(
-                "dataCollectionId",
-                "fileTemplate",
-                "imageDirectory",
-                "numberOfImages",
-                "startTime",
+                DataCollection.dataCollectionId,
+                DataCollection.fileTemplate,
+                DataCollection.imageDirectory,
+                DataCollection.numberOfImages,
+                DataCollection.startTime,
             ),
-            Load(Proposal).load_only("proposalCode", "proposalNumber"),
-            Load(BLSession).load_only("beamLineName", "visit_number"),
-            Load(GridInfo).load_only("steps_x", "steps_y"),
+            Load(Proposal).load_only(Proposal.proposalCode, Proposal.proposalNumber),
+            Load(BLSession).load_only(BLSession.beamLineName, BLSession.visit_number),
+            Load(GridInfo).load_only(GridInfo.steps_x, GridInfo.steps_y),
         )
         .join(
             BLSession,

src/ispyb/sqlalchemy/_auto_db_schema.py

@@ -28,8 +28,7 @@
     TINYINT,
     VARCHAR,
 )
-from sqlalchemy.ext.declarative import declarative_base
-from sqlalchemy.orm import relationship
+from sqlalchemy.orm import declarative_base, relationship
 
 Base = declarative_base()
 metadata = Base.metadata