Skip to content

Commit

Permalink
#7 fix pytest due to pytest-dev/pytest#6909
Browse files Browse the repository at this point in the history
  • Loading branch information
de1mos242 committed Mar 13, 2020
1 parent 05572b8 commit 2be1079
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 17 deletions.
5 changes: 5 additions & 0 deletions README.md
Expand Up @@ -6,3 +6,8 @@ Create migration:

Run upgrade:
`PYTHONPATH=.. alembic upgrade head`

Run tests:
```
docker build -t family-service-base-img . && docker-compose -f ci/docker-compose.yml run tests
```
10 changes: 5 additions & 5 deletions ci/test_requirements.txt
@@ -1,5 +1,5 @@
pytest
pytest-aiohttp
pytest-factoryboy
pytest-html
pylint
pytest~=5.3.5
pytest-aiohttp~=0.3.0
pytest-factoryboy~=2.0.3
pytest-html~=2.1.0
pylint~=2.4.4
22 changes: 11 additions & 11 deletions requirements.txt
@@ -1,11 +1,11 @@
aiohttp
aiohttp-apispec
aiohttp_jwt
aiopg
alembic
cryptography
factory-boy
marshmallow
PyYAML
python-dotenv
sqlalchemy
aiohttp~=3.6.2
aiohttp-apispec~=2.2.1
aiohttp-jwt~=0.5.0
aiopg~=1.0.0
alembic~=1.4.1
cryptography~=2.8
factory-boy~=2.12.0
marshmallow~=3.5.1
PyYAML~=5.3
python-dotenv~=0.12.0
SQLAlchemy~=1.3.15
5 changes: 4 additions & 1 deletion tests/conftest.py
Expand Up @@ -50,7 +50,10 @@ async def app():
if table.name not in exclude_tables:
await conn.execute(table.delete())

return app
yield app

await app.shutdown()
await app.cleanup()


@pytest.fixture
Expand Down

0 comments on commit 2be1079

Please sign in to comment.