Merge branch 'develop' of github.com:tortoise/tortoise-orm into optional-aiosqlite

Author: waketzheng

CHANGELOG.rst

@@ -12,13 +12,17 @@ Changelog
 
 0.26.0 (unreleased)
 -------------------
-Fixed
-^^^^^
-- Fix exception when creating aiosqlite connections on aiosqlite==0.22.0 (#2035)
 
 0.25
 ====
 
+0.25.3
+------
+Fixed
+^^^^^
+- Fix exception when creating aiosqlite connections on aiosqlite==0.22.0 (#2035)
+- Fix implicit anyio dependency introduced, but not declared (#2045)
+
 0.25.2
 ------
 Fixed

pyproject.toml

@@ -10,11 +10,9 @@ requires-python = ">=3.9"
 dependencies = [
     "pypika-tortoise (>=0.6.3,<1.0.0)",
     "iso8601 (>=2.1.0,<3.0.0); python_version < '4.0'",
-    "anyio (>=4.12.0,<5.0.0)",
-    "typing-extensions>=4.15.0; python_version < '3.11'",
+    "anyio",
     "pytz",
-    # Typing support for older Python
-    "typing-extensions (>= 4.1.0)",
+    "typing-extensions (>= 4.1.0); python_version < '3.11'",
 ]
 classifiers = [
     "License :: OSI Approved :: Apache Software License",

tests/test_table_name.py

@@ -38,4 +38,5 @@ async def test_custom_table_name_precedence(self):
         self.assertEqual(CustomTable._meta.db_table, "my_custom_table")
 
     async def _tearDownDB(self) -> None:
+        # Explicitly close aiosqlite connection to fix ResourceWarning
         await Tortoise.get_connection("default").close()

tortoise/__init__.py

@@ -648,7 +648,7 @@ async def main() -> None:
         portal.call(main)
 
 
-__version__ = "0.25.2"
+__version__ = "0.25.3"
 
 __all__ = [
     "Model",

tortoise/filters.py

@@ -18,15 +18,15 @@
     ValueWrapper,
 )
 
-if sys.version_info >= (3, 11):
-    from typing import NotRequired
-else:
-    from typing_extensions import NotRequired
-
 from tortoise.contrib.postgres.fields import ArrayField
 from tortoise.fields import Field, JSONField
 from tortoise.fields.relational import BackwardFKRelation, ManyToManyFieldInstance
 
+if sys.version_info >= (3, 11):  # pragma：nocoverage
+    from typing import NotRequired
+else:
+    from typing_extensions import NotRequired
+
 if TYPE_CHECKING:  # pragma: nocoverage
     from tortoise.models import Model