Update requirements (closes #119) (#120)

* Use Py3.10 instead of Py3.9
* Use SQLAlchemy v2
* Do not allow the order of query results to mess up the test assertions

.github/workflows/default.yml

@@ -17,10 +17,10 @@ jobs:
         options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
     steps:
       - uses: actions/checkout@v2
-      - name: Set up Python 3.9
+      - name: Set up Python 3.10
         uses: actions/setup-python@v2
         with:
-          python-version: 3.9
+          python-version: "3.10"
       - name: Cache pip
         uses: actions/cache@v2
         with:
@@ -47,10 +47,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - name: Set up Python 3.9
+      - name: Set up Python 3.10
         uses: actions/setup-python@v2
         with:
-          python-version: 3.9
+          python-version: "3.10"
       - name: Cache pip
         uses: actions/cache@v2
         with:

backend/Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.9-slim
+FROM python:3.10-slim
 
 COPY . /opt/aimaas
 RUN pip3 install -r /opt/aimaas/requirements.txt; \

backend/database.py

@@ -1,8 +1,7 @@
 from fastapi import HTTPException
 from starlette.status import HTTP_503_SERVICE_UNAVAILABLE
 from sqlalchemy import create_engine, text
-from sqlalchemy.ext.declarative import declarative_base
-from sqlalchemy.orm import sessionmaker
+from sqlalchemy.orm import declarative_base, sessionmaker
 
 from .config import SQLALCHEMY_DATABASE_URL
 

backend/requirements.txt

@@ -9,5 +9,5 @@ pydantic<1.9.1
 python-dotenv
 python-jose[cryptography]
 python-multipart
-SQLAlchemy<2
+SQLAlchemy
 uvicorn

backend/tests/conftest.py

@@ -4,7 +4,7 @@
 from alembic.config import Config
 from httpx._client import USE_CLIENT_DEFAULT
 import pytest
-from sqlalchemy import create_engine
+from sqlalchemy import create_engine, text
 from sqlalchemy.orm import sessionmaker
 from fastapi.testclient import TestClient
 
@@ -304,14 +304,16 @@ def engine():
                            pool_timeout=5)
     Base.metadata.drop_all(engine)
     with engine.connect() as conn:
-        conn.execute("drop table if exists alembic_version")
+        conn.execute(text("drop table if exists alembic_version"))
+        conn.commit()
     cfg = Config("alembic.ini")
     command.upgrade(cfg, "head")
 
     yield engine
     Base.metadata.drop_all(engine)
     with engine.connect() as conn:
-        conn.execute("drop table if exists alembic_version")
+        conn.execute(text("drop table if exists alembic_version"))
+        conn.commit()
     engine.dispose()
 
 

backend/tests/test_crud_entity.py

@@ -18,15 +18,21 @@ def asserts_after_entities_create(self, db: Session):
         jack = self.get_default_entity(db)
 
         persons = db.execute(select(Entity).where(Entity.schema_id == jack.schema_id)).scalars().all()
+        persons = {p.slug: p for p in persons}
+
         assert len(persons) == 5
-        assert persons[-2].name == 'John'
-        assert persons[-2].slug == 'John'
-        assert persons[-2].get('nickname', db).value == 'john'
-        assert persons[-2].get('age', db).value == 10
-        assert persons[-2].get('born', db).value == born
-        assert isinstance(persons[-2].get('age', db), ValueInt)
-        assert {i.value for i in persons[-2].get('friends', db)} == {jack.id, persons[-3].id}
-        assert persons[-1].get('born', db).value.astimezone(timezone.utc) == tz_born.astimezone(
+
+        john = persons["John"]
+        mike = persons["Mike"]
+        pumpkin_jack = persons["pumpkin-jack"]
+
+        assert john.name == 'John'
+        assert john.get('nickname', db).value == 'john'
+        assert john.get('age', db).value == 10
+        assert john.get('born', db).value == born
+        assert isinstance(john.get('age', db), ValueInt)
+        assert {i.value for i in john.get('friends', db)} == {jack.id, mike.id}
+        assert pumpkin_jack.get('born', db).value.astimezone(timezone.utc) == tz_born.astimezone(
             timezone.utc)
 
     def test_create(self, dbsession):