Bumped poetry to 2.2.1, updated dependencies, and reformatted.

Author: johnbywater

.github/workflows/github-actions.yml

@@ -34,10 +34,10 @@ jobs:
         run: make install
       - name: Downgrade SQLAlchemy
         if: ${{ matrix.sqlalchemy-version != 'default' }}
-        run: poetry@2.1.2 run pip install -U "sqlalchemy${{ matrix.sqlalchemy-version }}"
+        run: poetry@2.2.1 run pip install -U "sqlalchemy${{ matrix.sqlalchemy-version }}"
       - name: Downgrade Flask-SQLAlchemy
         if: ${{ matrix.sqlalchemy-version != 'default' }}
-        run: poetry@2.1.2 run pip install -U "flask-sqlalchemy<3.1"
+        run: poetry@2.2.1 run pip install -U "flask-sqlalchemy<3.1"
       - name: Lint
         run: make lint
       - name: Setup PostgreSQL database
@@ -58,7 +58,7 @@ jobs:
           make create-mssql-schema
 
       - name: Print SQLAlchemy version
-        run: poetry@2.1.2 run python -c "import sqlalchemy; print(f'Using sqlalchemy {sqlalchemy.__version__}')"
+        run: poetry@2.2.1 run python -c "import sqlalchemy; print(f'Using sqlalchemy {sqlalchemy.__version__}')"
 
       - name: Run tests
         run: make test

Makefile

@@ -3,7 +3,7 @@
 COMPOSE_FILE ?= docker/docker-compose-local.yml
 COMPOSE_PROJECT_NAME ?= eventsourcing_sqlalchemy
 
-POETRY_VERSION=2.1.2
+POETRY_VERSION=2.2.1
 POETRY ?= poetry@$(POETRY_VERSION)
 
 DOTENV_BASE_FILE ?= .env-base

eventsourcing_sqlalchemy/datastore.py

@@ -230,7 +230,7 @@ def define_record_class(
     ) -> Type[TEventRecord]:
         try:
             record_classes_key = (schema_name or "public") + "." + table_name
-            (record_class, record_base_cls) = cls.record_classes[record_classes_key]
+            record_class, record_base_cls = cls.record_classes[record_classes_key]
             if record_base_cls is not base_cls:
                 raise ValueError(
                     f"Have already defined a record class with table name {table_name} "

eventsourcing_sqlalchemy/recorders.py

@@ -64,8 +64,9 @@ def __init__(
         record_cls_name = "".join(
             [
                 s.capitalize()
-                for s in (schema_name or "").split("_")
-                + events_table_name.rstrip("s").split("_")
+                for s in (schema_name or "").split("_") + events_table_name.rstrip(
+                    "s"
+                ).split("_")
             ]
         )
         if not for_snapshots: