start anyio port

databases/core.py

@@ -1,4 +1,4 @@
-import asyncio
+import anyio
 import contextlib
 import functools
 import logging
@@ -203,14 +203,14 @@ class Connection:
     def __init__(self, backend: DatabaseBackend) -> None:
         self._backend = backend
 
-        self._connection_lock = asyncio.Lock()
+        self._connection_lock = anyio.Lock()
         self._connection = self._backend.connection()
         self._connection_counter = 0
 
-        self._transaction_lock = asyncio.Lock()
+        self._transaction_lock = anyio.Lock()
         self._transaction_stack = []  # type: typing.List[Transaction]
 
-        self._query_lock = asyncio.Lock()
+        self._query_lock = anyio.Lock()
 
     async def __aenter__(self) -> "Connection":
         async with self._connection_lock:

requirements.txt

@@ -1,13 +1,7 @@
 # Notes...
 # The JSONField tests require sqlalchemy 1.3+. Other cases work at lower versions.
 # The aiocontextvars package is only required as a backport for Python 3.6.
--e .
-
-# Async database drivers
-aiomysql
-aiopg
-aiosqlite
-asyncpg
+-e .[trio-postgresql,trio-mysql,mysql,sqlite,postgresql,postgresql-aiopg]
 
 # Sync database drivers for standard tooling around setup/teardown/migrations.
 psycopg2-binary

setup.py

@@ -48,12 +48,15 @@ def get_packages(package):
     packages=get_packages("databases"),
     package_data={"databases": ["py.typed"]},
     data_files=[("", ["LICENSE.md"])],
-    install_requires=['sqlalchemy<1.4', 'aiocontextvars;python_version<"3.7"'],
+    install_requires=['sqlalchemy<1.4', 'aiocontextvars;python_version<"3.7"', 'anyio~=3.2'],
     extras_require={
+        "trio-postgresql": ["anyio[trio]", "triopg"],
+        "trio-mysql": ["anyio[trio]", "trio-mysql"],
         "postgresql": ["asyncpg"],
         "mysql": ["aiomysql"],
         "sqlite": ["aiosqlite"],
-        "postgresql+aiopg": ["aiopg"]
+        "postgresql+aiopg": ["aiopg"],
+        "postgresql-aiopg": ["aiopg"]
     },
     classifiers=[
         "Development Status :: 3 - Alpha",

tests/test_connection_options.py

@@ -1,12 +1,13 @@
 """
 Unit tests for the backend connection arguments.
 """
+import pytest
 
 from databases.backends.aiopg import AiopgBackend
 from databases.backends.mysql import MySQLBackend
 from databases.backends.postgres import PostgresBackend
 from databases.core import DatabaseURL
-from tests.test_databases import DATABASE_URLS, async_adapter
+from tests.test_databases import DATABASE_URLS
 
 
 def test_postgres_pool_size():
@@ -15,7 +16,7 @@ def test_postgres_pool_size():
     assert kwargs == {"min_size": 1, "max_size": 20}
 
 
-@async_adapter
+@pytest.mark.anyio
 async def test_postgres_pool_size_connect():
     for url in DATABASE_URLS:
         if DatabaseURL(url).dialect != "postgresql":