Skip to content

Commit eb15470

Browse files
committed
Remove async_generator because we don't support Python 3.5
1 parent 5c8aec9 commit eb15470

6 files changed

Lines changed: 9 additions & 34 deletions

File tree

mysql_tests/conftest.py

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import aiomysql
44
import pytest
55
import sqlalchemy
6-
from async_generator import yield_, async_generator
76

87
import gino
98
from .models import db, DB_ARGS, MYSQL_URL, random_name
@@ -23,31 +22,28 @@ def sa_engine():
2322

2423

2524
@pytest.fixture
26-
@async_generator
2725
async def engine(sa_engine):
2826
e = await gino.create_engine(MYSQL_URL, echo=ECHO, minsize=10)
29-
await yield_(e)
27+
yield e
3028
await e.close()
3129
sa_engine.execute("DELETE FROM gino_user_settings")
3230
sa_engine.execute("DELETE FROM gino_users")
3331

3432

3533
# noinspection PyUnusedLocal,PyShadowingNames
3634
@pytest.fixture
37-
@async_generator
3835
async def bind(sa_engine):
3936
async with db.with_bind(MYSQL_URL, echo=ECHO, minsize=10) as e:
40-
await yield_(e)
37+
yield e
4138
sa_engine.execute("DELETE FROM gino_user_settings")
4239
sa_engine.execute("DELETE FROM gino_users")
4340

4441

4542
# noinspection PyUnusedLocal,PyShadowingNames
4643
@pytest.fixture
47-
@async_generator
4844
async def aiomysql_pool(sa_engine):
4945
async with aiomysql.create_pool(**DB_ARGS) as rv:
50-
await yield_(rv)
46+
yield rv
5147
async with rv.acquire() as conn:
5248
await conn.query("DELETE FROM gino_user_settings")
5349
await conn.query("DELETE FROM gino_users")

mysql_tests/test_loader.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
from datetime import datetime
33

44
import pytest
5-
from async_generator import yield_, async_generator
65

76
from gino.loader import AliasLoader
87
from sqlalchemy import select
@@ -21,7 +20,6 @@
2120

2221

2322
@pytest.fixture
24-
@async_generator
2523
async def user(bind):
2624
c = await Company.create()
2725
t1 = await Team.create(company_id=c.id)
@@ -32,7 +30,7 @@ async def user(bind):
3230
t2.parent = t1
3331
t2.company = c
3432
t1.company = c
35-
await yield_(u)
33+
yield u
3634
await User.delete.gino.status()
3735
await Team.delete.gino.status()
3836
await Company.delete.gino.status()

poetry.lock

Lines changed: 1 addition & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pyproject.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ quart = ["gino-quart"]
5656

5757
[tool.poetry.dev-dependencies]
5858
psycopg2-binary = "^2.9.3"
59-
async_generator = "^1.10"
6059
click = "^8.0.3"
6160

6261
# tests

tests/conftest.py

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import asyncpg
44
import pytest
55
import sqlalchemy
6-
from async_generator import yield_, async_generator
76

87
import gino
98
from .models import db, DB_ARGS, PG_URL, random_name
@@ -21,31 +20,28 @@ def sa_engine():
2120

2221

2322
@pytest.fixture
24-
@async_generator
2523
async def engine(sa_engine):
2624
e = await gino.create_engine(PG_URL, echo=ECHO)
27-
await yield_(e)
25+
yield e
2826
await e.close()
2927
sa_engine.execute("DELETE FROM gino_user_settings")
3028
sa_engine.execute("DELETE FROM gino_users")
3129

3230

3331
# noinspection PyUnusedLocal,PyShadowingNames
3432
@pytest.fixture
35-
@async_generator
3633
async def bind(sa_engine):
3734
async with db.with_bind(PG_URL, echo=ECHO) as e:
38-
await yield_(e)
35+
yield e
3936
sa_engine.execute("DELETE FROM gino_user_settings")
4037
sa_engine.execute("DELETE FROM gino_users")
4138

4239

4340
# noinspection PyUnusedLocal,PyShadowingNames
4441
@pytest.fixture
45-
@async_generator
4642
async def asyncpg_pool(sa_engine):
4743
async with asyncpg.create_pool(**DB_ARGS) as rv:
48-
await yield_(rv)
44+
yield rv
4945
await rv.execute("DELETE FROM gino_user_settings")
5046
await rv.execute("DELETE FROM gino_users")
5147

tests/test_loader.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
from datetime import datetime
33

44
import pytest
5-
from async_generator import yield_, async_generator
65

76
from gino.loader import AliasLoader
87
from sqlalchemy import select
@@ -21,7 +20,6 @@
2120

2221

2322
@pytest.fixture
24-
@async_generator
2523
async def user(bind):
2624
c = await Company.create()
2725
t1 = await Team.create(company_id=c.id)
@@ -32,7 +30,7 @@ async def user(bind):
3230
t2.parent = t1
3331
t2.company = c
3432
t1.company = c
35-
await yield_(u)
33+
yield u
3634
await User.delete.gino.status()
3735
await Team.delete.gino.status()
3836
await Company.delete.gino.status()

0 commit comments

Comments
 (0)