Bump database schema version (#225)

* Bump database schema version

* Drop old Python versions

* Update DB tarfile artifact reference

* Update Python version requirements in README

* Pin sqlacodegen version to 3.0.0rc5

* Update sqlacodegen command

Author: gfrn

.github/workflows/ci.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [ "3.7", "3.8", "3.9", "3.10", "3.11" ]
+        python-version: [ "3.10", "3.11", "3.12", "3.13" ]
         sqlalchemy-version: ["sqlalchemy==1.4", "sqlalchemy>=2,<3"]
     services:
       mariadb:

.github/workflows/test-and-publish.yml

@@ -4,7 +4,7 @@ on:
   [push, pull_request]
 
 env:
-  DATABASE_SCHEMA: 4.2.1
+  DATABASE_SCHEMA: 4.4.0
 
 permissions:
   contents: read

.github/workflows/update-orm.yml

@@ -59,8 +59,8 @@ jobs:
         if: ${{ steps.checkUpdate.outputs.needsUpdate == 'true' }}
         uses: actions/download-artifact@v4
         with:
-          name: package-distributions
-          path: dist/
+          name: database
+          path: database/
 
       - uses: shogo82148/actions-setup-mysql@v1
         if: ${{ steps.checkUpdate.outputs.needsUpdate == 'true' }}
@@ -82,7 +82,7 @@ jobs:
           database = ispybtest
           EOF
 
-          tar xfz "dist/ispyb-database.tar.gz"
+          tar xfz "database/ispyb-database.tar.gz"
           patch -p1 < "src/ispyb/sqlalchemy/sqlacodegen.patch"
       
           printf 'Waiting for MySQL database to accept connections'
@@ -100,7 +100,7 @@ jobs:
         if: ${{ steps.checkUpdate.outputs.needsUpdate == 'true' }}
         run: |
           set -eux
-          sqlacodegen mysql+mysqlconnector://root:mariadb_root_pwd@127.0.0.1/ispyb_build --noinflect --nojoined --outfile _auto_db_schema.py.in
+          sqlacodegen mysql+mysqlconnector://root:mariadb_root_pwd@127.0.0.1/ispyb_build --options nojoined --outfile _auto_db_schema.py.in
           # This code produces false positives due to non-deterministic ordering.
           # Add an identifier to the file, and only update/PR the changes when the
           # identifier indicates the file is out of date.

README.md

@@ -21,7 +21,7 @@ as webservices.
 Please see https://ispyb.readthedocs.io.
 
 ### Requirements
-* Python 3.7, 3.8, 3.9, 3.10, 3.11
+* Python 3.7, 3.8, 3.9 (minimum), 3.10, 3.11, 3.12, 3.13 (recommended)
 * The MySQL Connector/Python package.
 * MariaDB 10.0+ or MySQL 5.6+, but we recommend MariaDB 10.2 or later.
 * An ISPyB database installed on the above. See the [ispyb-database](https://github.com/DiamondLightSource/ispyb-database) repository for details.

requirements_orm.txt

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