Migrate to Python 3.13

.github/workflows/testing.yaml

@@ -8,6 +8,6 @@ on:
 
 jobs:
   main:
-    uses: heyslava/workflows/.github/workflows/tox.yml@v0.3.0
+    uses: heyslava/workflows/.github/workflows/tox.yml@v1.3.0
     with:
-      env: '["py311"]'
+      env: '["py313"]'

Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.11-slim-bullseye
+FROM python:3.13-slim-bullseye
 
 WORKDIR /app
 

bot/data/models.py

@@ -26,6 +26,10 @@ class Base(DeclarativeBase):
     metadata = meta
 
 
+def _utc_now() -> dt.datetime:
+    return dt.datetime.now(dt.timezone.utc).replace(tzinfo=None)
+
+
 class User(Base):
     __tablename__ = 'users'
     id: Mapped[int] = mapped_column(primary_key=True)
@@ -63,11 +67,11 @@ class Expense(Base):
     comment: Mapped[str] = mapped_column(String, nullable=True)
     cdate: Mapped[dt.datetime] = mapped_column(
             DateTime,
-            default=dt.datetime.utcnow,
+            default=_utc_now,
         )
     cdate_tz: Mapped[dt.datetime] = mapped_column(
             DateTime,
-            default=dt.datetime.utcnow,
+            default=_utc_now,
             nullable=True,
         )
     is_replenishment: Mapped[bool] = mapped_column(

requirements.txt

@@ -2,4 +2,4 @@ aiogram==3.19.0
 alembic
 pydantic
 pytz
-SQLAlchemy==2.0.30
+SQLAlchemy==2.0.51

tests/conftest.py

@@ -17,7 +17,10 @@ def engine():
         tmpfile = Path(dir) / 'pytest.db'
         conn_str = f'sqlite:///{tmpfile}'
         engine = sa.create_engine(conn_str)
-        yield engine
+        try:
+            yield engine
+        finally:
+            engine.dispose()
 
 
 @pytest.fixture(scope='function')
@@ -26,10 +29,13 @@ def db(engine):
     session: orm.Session = _factory()
     Base.metadata.create_all(bind=engine)
 
-    yield session
-    for table in reversed(Base.metadata.sorted_tables):
-        session.execute(table.delete())
-    session.commit()
+    try:
+        yield session
+    finally:
+        for table in reversed(Base.metadata.sorted_tables):
+            session.execute(table.delete())
+        session.commit()
+        session.close()
 
 
 @pytest.fixture(scope='function')

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-env_list = py311,pre-commit
+env_list = py313,pre-commit
 
 [testenv]
 deps =
@@ -17,6 +17,7 @@ commands =
 addopts =
     -ra
     -v
+    -W error
 testpaths =
     tests
 pythonpath = bot