Merge pull request #413 from aio-libs/pyup-scheduled-update-2019-02-11

Scheduled weekly dependency update for week 06

Author: popravich

aiohttp_admin/backends/mongo.py

@@ -44,7 +44,7 @@ async def list(self, request):
                   .sort(paging.sort_field, sort_direction))
 
         entities = await cursor.to_list(paging.limit)
-        count = await self._collection.find(query).count()
+        count = await self._collection.count_documents(query)
         headers = {'X-Total-Count': str(count)}
         return json_response(entities, headers=headers)
 
@@ -66,8 +66,8 @@ async def create(self, request):
         raw_payload = await request.read()
         data = validate_payload(raw_payload, self._update_schema)
 
-        entity_id = await self._collection.insert(data)
-        query = {self._primary_key: ObjectId(entity_id)}
+        result = await self._collection.insert_one(data)
+        query = {self._primary_key: result.inserted_id}
         doc = await self._collection.find_one(query)
 
         return json_response(doc)
@@ -79,7 +79,7 @@ async def update(self, request):
         data = validate_payload(raw_payload, self._update_schema)
         query = {self._primary_key: ObjectId(entity_id)}
 
-        doc = await self._collection.find_and_modify(
+        doc = await self._collection.find_one_and_update(
             query, {"$set": data}, upsert=False, new=True)
 
         if not doc:
@@ -93,5 +93,5 @@ async def delete(self, request):
         entity_id = request.match_info['entity_id']
         # TODO: fix ObjectId is not always valid case
         query = {self._primary_key: ObjectId(entity_id)}
-        await self._collection.remove(query)
+        await self._collection.delete_one(query)
         return json_response({'status': 'deleted'})

aiohttp_admin/backends/mongo_utils.py

@@ -123,6 +123,4 @@ def create_validator(schema, primary_key):
     # create validator without primary key, used for update queries
     # where pk supplied in url and rest in body
     keys = [s for s in schema.keys if s.get_name() != primary_key]
-    new_schema = t.Dict({})
-    new_schema.keys = keys
-    return new_schema.ignore_extra(primary_key)
+    return t.Dict().merge(keys).ignore_extra(primary_key)

demos/blog/requirements-dev.txt

@@ -1,4 +1,4 @@
-pyflakes==2.0.0
+pyflakes==2.1.0
 pep8==1.7.1
-pytest==3.6.1
+pytest==4.2.0
 ipdb==0.11

demos/blog_react/requirements-dev.txt

@@ -1,4 +1,4 @@
-pyflakes==2.0.0
+pyflakes==2.1.0
 pep8==1.7.1
-pytest==3.6.1
+pytest==4.2.0
 ipdb==0.11

requirements-dev.txt

@@ -1,19 +1,19 @@
-aiohttp-jinja2==1.0.0
-aiohttp-security==0.2.0
-aiohttp-session==2.5.1
-aiohttp==3.3.1
-aiomysql==0.0.16
-aiopg==0.14.0
-coverage==4.5.1
-docker==3.3.0
-flake8==3.5.0
+aiohttp-jinja2==1.1.0
+aiohttp-security==0.4.0
+aiohttp-session==2.7.0
+aiohttp==3.5.4
+aiomysql==0.0.20
+aiopg==0.16.0
+coverage==4.5.2
+docker==3.7.0
+flake8==3.7.5
 ipdb==0.11
-motor==1.2.2
-pytest-cov==2.5.1
-pytest-sugar==0.9.1
-pytest==3.6.1
-python-dateutil==2.7.3
-sqlalchemy==1.2.8
-trafaret==2.0.0a1
-pymysql==0.8.1
+motor==2.0.0
+pytest-cov==2.6.1
+pytest-sugar==0.9.2
+pytest==4.2.0
+python-dateutil==2.8.0
+sqlalchemy==1.2.17
+trafaret==1.2.0
+pymysql==0.9.3
 -r requirements-doc.txt

requirements-doc.txt

@@ -1,2 +1,2 @@
-sphinx==1.7.5
+sphinx==1.8.4
 sphinxcontrib-asyncio==0.2.0

tests/admin_fixtures.py

@@ -63,11 +63,11 @@ async def mongo_admin(resource_name='test_post', security=setup_security):
 @pytest.fixture
 def create_admin(request, admin_type):
     if admin_type == 'mongo':
-        f = request.getfuncargvalue('mongo_admin_creator')
+        f = request.getfixturevalue('mongo_admin_creator')
     elif admin_type == 'mysql':
-        f = request.getfuncargvalue('mysql_admin_creator')
+        f = request.getfixturevalue('mysql_admin_creator')
     else:
-        f = request.getfuncargvalue('pg_admin_creator')
+        f = request.getfixturevalue('pg_admin_creator')
     return f
 
 

tests/db_fixtures.py

@@ -13,9 +13,7 @@
 from trafaret.contrib.rfc_3339 import DateTime
 
 
-def pytest_namespace():
-    dbs = 'pg', 'mongo', 'mysql'
-    return {'admin_type_list': dbs}
+ADMIN_TYPE_LIST = 'pg', 'mongo', 'mysql'
 
 
 @pytest.fixture
@@ -27,9 +25,9 @@ def admin_type():
 @pytest.fixture
 def database(request, admin_type):
     if admin_type == 'mysql':
-        f = request.getfuncargvalue('mysql')
+        f = request.getfixturevalue('mysql')
     else:
-        f = request.getfuncargvalue('postgres')
+        f = request.getfixturevalue('postgres')
     return f
 
 
@@ -203,7 +201,7 @@ async def f(rows):
         await mongo_collection.drop()
         values = create_entries(rows)
         for doc in values:
-            await mongo_collection.insert(doc)
+            await mongo_collection.insert_one(doc)
         return sa_table
     yield f
     loop.run_until_complete(mongo_collection.drop())

tests/test_admin_handlers.py

@@ -1,5 +1,7 @@
 import pytest
 
+from db_fixtures import ADMIN_TYPE_LIST
+
 
 async def prepare_admin(create_admin):
     resource = 'posts'
@@ -9,7 +11,7 @@ async def prepare_admin(create_admin):
     return admin, client
 
 
-@pytest.mark.parametrize('admin_type', pytest.admin_type_list)
+@pytest.mark.parametrize('admin_type', ADMIN_TYPE_LIST)
 @pytest.mark.run_loop
 async def test_login_page(create_admin):
     _, client = await prepare_admin(create_admin)
@@ -19,7 +21,7 @@ async def test_login_page(create_admin):
     assert b'username' in page
 
 
-@pytest.mark.parametrize('admin_type', pytest.admin_type_list)
+@pytest.mark.parametrize('admin_type', ADMIN_TYPE_LIST)
 @pytest.mark.run_loop
 async def test_admin_page_redirect(create_admin):
     _, client = await prepare_admin(create_admin)
@@ -30,7 +32,7 @@ async def test_admin_page_redirect(create_admin):
     assert b"ng-admin" in page
 
 
-@pytest.mark.parametrize('admin_type', pytest.admin_type_list)
+@pytest.mark.parametrize('admin_type', ADMIN_TYPE_LIST)
 @pytest.mark.run_loop
 async def test_token(create_admin):
     _, client = await prepare_admin(create_admin)
@@ -44,7 +46,7 @@ async def test_token(create_admin):
     assert ctx.value.error_json == msg
 
 
-@pytest.mark.parametrize('admin_type', pytest.admin_type_list)
+@pytest.mark.parametrize('admin_type', ADMIN_TYPE_LIST)
 @pytest.mark.run_loop
 async def test_token_invalid_payload(create_admin):
     _, client = await prepare_admin(create_admin)
@@ -60,7 +62,7 @@ async def test_token_invalid_payload(create_admin):
     assert ctx.value.error_json == msg
 
 
-@pytest.mark.parametrize('admin_type', pytest.admin_type_list)
+@pytest.mark.parametrize('admin_type', ADMIN_TYPE_LIST)
 @pytest.mark.run_loop
 async def test_logout(create_admin):
     _, client = await prepare_admin(create_admin)

tests/test_permissions.py

@@ -5,6 +5,8 @@
 from aiohttp_admin.security import DummyAuthPolicy, DummyTokenIdentityPolicy
 from aiohttp_admin.security import Permissions
 
+from db_fixtures import ADMIN_TYPE_LIST
+
 
 def setup_security(app, permissions=None):
     # setup dummy auth and identity
@@ -24,7 +26,7 @@ async def prepare_admin(create_admin, permissions=None):
     return resource, client
 
 
-@pytest.mark.parametrize('admin_type', pytest.admin_type_list)
+@pytest.mark.parametrize('admin_type', ADMIN_TYPE_LIST)
 @pytest.mark.run_loop
 async def test_list_without_permisson(create_admin):
     p = [Permissions.edit, Permissions.add, Permissions.delete]