Merge upstream

.github/workflows/ci.yml

@@ -45,7 +45,7 @@ jobs:
       TORTOISE_MSSQL_DRIVER: ODBC Driver 18 for SQL Server
     strategy:
       matrix:
-        python-version: ["3.8", "3.9", "3.10"]
+        python-version: ["3.8", "3.9", "3.10", "3.11"]
     steps:
       - uses: actions/cache@v3
         with:

CHANGELOG.rst

@@ -6,16 +6,31 @@ Changelog
 
 .. rst-class:: emphasize-children
 
-0.19
+0.20
 ====
-0.19.4
+
+0.20.0
 ------
 Added
 ^^^^^
 - Enhancement for FastAPI lifespan support (#1371)
+- Allow ForeignKeyField(on_delete=NO_ACTION) (#1393)
+- Support `pydantic` 2.0. (#1433)
+
 Fixed
 ^^^^^
 - Fix foreign key constraint not generated on MSSQL Server. (#1400)
+- Fix testcase error with python3.11 (#1308)
+
+Breaking Changes
+^^^^^^^^^^^^^^^^
+- Drop support for `pydantic` 1.x.
+- Drop support for `python` 3.7.
+- Param `config_class` of `pydantic_model_creator` is renamed to `model_config`.
+- Attr `config_class` of `PydanticMeta` is renamed to `model_config`.
+
+0.19
+====
 
 0.19.3
 ------

README.rst

@@ -29,7 +29,7 @@ You can find the docs at `Documentation <https://tortoise.github.io>`_
    Tortoise ORM is a young project and breaking changes are to be expected.
    We keep a `Changelog <https://tortoise.github.io/CHANGELOG.html>`_ and it will have possible breakage clearly documented.
 
-Tortoise ORM is supported on CPython >= 3.7 for SQLite, MySQL and PostgreSQL and Microsoft SQL Server and Oracle.
+Tortoise ORM is supported on CPython >= 3.8 for SQLite, MySQL and PostgreSQL and Microsoft SQL Server and Oracle.
 
 Why was Tortoise ORM built?
 ---------------------------

docs/CONTRIBUTING.rst

@@ -99,7 +99,7 @@ Tortoise ORM follows a the following agreed upon style:
 * Always try to separate out terms clearly rather than concatenate words directly:
     * ``some_purpose`` instead of ``somepurpose``
     * ``SomePurpose`` instead of ``Somepurpose``
-* Keep in mind the targeted Python versions of ``>=3.7``:
+* Keep in mind the targeted Python versions of ``>=3.8``:
     * Do use f-strings
 * Please try and provide type annotations where you can, it will improve auto-completion in editors, and better static analysis.
 

docs/index.rst

@@ -13,7 +13,7 @@ It's engraved in it's design that you are working not with just tables, you work
 
 Source & issue trackers are available at `<https://github.com/tortoise/tortoise-orm/>`_
 
-Tortoise ORM is supported on CPython >= 3.7 for SQLite, MySQL and PostgreSQL.
+Tortoise ORM is supported on CPython >= 3.8 for SQLite, MySQL and PostgreSQL.
 
 Introduction
 ============

examples/fastapi/main.py

@@ -2,15 +2,32 @@
 from contextlib import asynccontextmanager
 from typing import List
 
-from fastapi import FastAPI, HTTPException
+from fastapi import FastAPI
 from models import User_Pydantic, UserIn_Pydantic, Users
 from pydantic import BaseModel
+from starlette.exceptions import HTTPException
 
-from tortoise.contrib.fastapi import HTTPNotFoundError, register_tortoise
+from tortoise.contrib.fastapi import register_tortoise
 
 
 @asynccontextmanager
 async def lifespan(app: FastAPI):
+    """It is recommended to register tortoise use async with.
+
+    Or in the traditional, procedural manner::
+
+        db = await register_tortoise(
+            app,
+            db_url="sqlite://:memory:",
+            modules={"models": ["models"]},
+            generate_schemas=True,
+            add_exception_handlers=True,
+            is_lifespan=True,
+        )
+        yield
+        await db.close()
+
+    """
     async with register_tortoise(
         app,
         db_url="sqlite://:memory:",
@@ -20,19 +37,6 @@ async def lifespan(app: FastAPI):
         is_lifespan=True,
     ):
         yield
-    """
-    # or in the traditional, procedural manner::
-    db = await register_tortoise(
-        app,
-        db_url="sqlite://:memory:",
-        modules={"models": ["models"]},
-        generate_schemas=True,
-        add_exception_handlers=True,
-        is_lifespan=True,
-    )
-    yield
-    await db.close()
-    """
 
 
 app = FastAPI(title="Tortoise ORM FastAPI example", lifespan=lifespan)
@@ -53,22 +57,18 @@ async def create_user(user: UserIn_Pydantic):
     return await User_Pydantic.from_tortoise_orm(user_obj)
 
 
-@app.get(
-    "/user/{user_id}", response_model=User_Pydantic, responses={404: {"model": HTTPNotFoundError}}
-)
+@app.get("/user/{user_id}", response_model=User_Pydantic)
 async def get_user(user_id: int):
     return await User_Pydantic.from_queryset_single(Users.get(id=user_id))
 
 
-@app.put(
-    "/user/{user_id}", response_model=User_Pydantic, responses={404: {"model": HTTPNotFoundError}}
-)
+@app.put("/user/{user_id}", response_model=User_Pydantic)
 async def update_user(user_id: int, user: UserIn_Pydantic):
     await Users.filter(id=user_id).update(**user.dict(exclude_unset=True))
     return await User_Pydantic.from_queryset_single(Users.get(id=user_id))
 
 
-@app.delete("/user/{user_id}", response_model=Status, responses={404: {"model": HTTPNotFoundError}})
+@app.delete("/user/{user_id}", response_model=Status)
 async def delete_user(user_id: int):
     deleted_count = await Users.filter(id=user_id).delete()
     if not deleted_count:

examples/pydantic/basic.py

@@ -39,7 +39,7 @@ class Address(Model):
     created_at = fields.DatetimeField(auto_now_add=True)
 
     event: fields.OneToOneRelation[Event] = fields.OneToOneField(
-        "models.Event", on_delete=fields.CASCADE, related_name="address", pk=True
+        "models.Event", on_delete=fields.OnDelete.CASCADE, related_name="address", pk=True
     )
 
     class Meta:
@@ -87,16 +87,16 @@ async def run():
     await event3.participants.add(team1, team3)
 
     p = await Event_Pydantic.from_tortoise_orm(await Event.get(name="Test"))
-    print("One Event:", p.json(indent=4))
+    print("One Event:", p.model_dump_json(indent=4))
 
     p = await Tournament_Pydantic.from_tortoise_orm(await Tournament.get(name="New Tournament"))
-    print("One Tournament:", p.json(indent=4))
+    print("One Tournament:", p.model_dump_json(indent=4))
 
     p = await Team_Pydantic.from_tortoise_orm(await Team.get(name="Onesies"))
-    print("One Team:", p.json(indent=4))
+    print("One Team:", p.model_dump_json(indent=4))
 
     pl = await Event_Pydantic_List.from_queryset(Event.filter(address__event_id__isnull=True))
-    print("All Events without addresses:", pl.json(indent=4))
+    print("All Events without addresses:", pl.model_dump_json(indent=4))
 
 
 if __name__ == "__main__":

examples/relations.py

@@ -39,7 +39,7 @@ class Address(Model):
     street = fields.CharField(max_length=128)
 
     event: fields.OneToOneRelation[Event] = fields.OneToOneField(
-        "models.Event", on_delete=fields.CASCADE, related_name="address", pk=True
+        "models.Event", on_delete=fields.OnDelete.CASCADE, related_name="address", pk=True
     )
 
     def __str__(self):

examples/relations_with_unique.py

@@ -30,7 +30,7 @@ class Principal(Model):
     id = fields.IntField(pk=True)
     name = fields.TextField()
     school: fields.OneToOneRelation[School] = fields.OneToOneField(
-        "models.School", on_delete=fields.CASCADE, related_name="principal", to_field="id"
+        "models.School", on_delete=fields.OnDelete.CASCADE, related_name="principal", to_field="id"
     )