From ce130f5ce7444ec38f0de7371897fb2bfc9c09f3 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Tue, 1 May 2018 16:00:07 +0100 Subject: [PATCH 01/19] Update aiohttp from 3.0.1 to 3.1.3 --- aiohttp_devtools/start/template/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aiohttp_devtools/start/template/requirements.txt b/aiohttp_devtools/start/template/requirements.txt index a14732a9..b7bbd788 100644 --- a/aiohttp_devtools/start/template/requirements.txt +++ b/aiohttp_devtools/start/template/requirements.txt @@ -1,7 +1,7 @@ # {# This file is special: lines are made unique, stripped and sorted before the new requirements.txt file is created #} # you will need to install these requirements with `pip install -r requirements.txt` -aiohttp==3.0.1 +aiohttp==3.1.3 pytest==3.4.0 pytest-aiohttp==0.3.0 pytest-cov==2.5.1 From dbd6b405673771be65154ba4b55112b2e4b5f490 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Tue, 1 May 2018 16:00:09 +0100 Subject: [PATCH 02/19] Update pytest from 3.4.0 to 3.5.1 --- aiohttp_devtools/start/template/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aiohttp_devtools/start/template/requirements.txt b/aiohttp_devtools/start/template/requirements.txt index b7bbd788..83b2a9d9 100644 --- a/aiohttp_devtools/start/template/requirements.txt +++ b/aiohttp_devtools/start/template/requirements.txt @@ -2,7 +2,7 @@ # you will need to install these requirements with `pip install -r requirements.txt` aiohttp==3.1.3 -pytest==3.4.0 +pytest==3.5.1 pytest-aiohttp==0.3.0 pytest-cov==2.5.1 From a45e13b855fd2575d6a7563b80b0086e6ae820d3 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Tue, 1 May 2018 16:00:11 +0100 Subject: [PATCH 03/19] Update pytest from 3.4.0 to 3.5.1 --- tests/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/requirements.txt b/tests/requirements.txt index d3a2c985..88ded62d 100644 --- a/tests/requirements.txt +++ b/tests/requirements.txt @@ -4,7 +4,7 @@ flake8==3.5.0 grablib==0.6.1 pycodestyle==2.3.1 pyflakes==1.6.0 -pytest==3.4.0 +pytest==3.5.1 pytest-aiohttp==0.3.0 pytest-cov==2.5.1 pytest-isort==0.1.0 From 8a2946fab1923fdc143af4d9f15183672533feec Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Tue, 1 May 2018 16:00:12 +0100 Subject: [PATCH 04/19] Update aiohttp-jinja2 from 0.15.0 to 1.0.0 --- aiohttp_devtools/start/template/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aiohttp_devtools/start/template/requirements.txt b/aiohttp_devtools/start/template/requirements.txt index 83b2a9d9..74a793ab 100644 --- a/aiohttp_devtools/start/template/requirements.txt +++ b/aiohttp_devtools/start/template/requirements.txt @@ -7,7 +7,7 @@ pytest-aiohttp==0.3.0 pytest-cov==2.5.1 # {% if template_engine.is_jinja %} -aiohttp-jinja2==0.15.0 +aiohttp-jinja2==1.0.0 # {% endif %} # {% if session.is_secure %} From 429f5ba44d28ce8360e19d3bfa3b70167b053833 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Tue, 1 May 2018 16:00:14 +0100 Subject: [PATCH 05/19] Update aiohttp-jinja2 from 0.15.0 to 1.0.0 --- tests/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/requirements.txt b/tests/requirements.txt index 88ded62d..6c7c6bc1 100644 --- a/tests/requirements.txt +++ b/tests/requirements.txt @@ -16,7 +16,7 @@ pytest-xdist==1.22.0 Sphinx==1.6.6 # required to run "start" apps -aiohttp-jinja2==0.15.0 +aiohttp-jinja2==1.0.0 aiohttp-session[secure]==2.2.0 aiohttp-session[aioredis]==2.2.0 aiopg==0.13.2 From db77a92647865a0fb30491f1d27be550b9724c6e Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Tue, 1 May 2018 16:00:15 +0100 Subject: [PATCH 06/19] Update aiohttp-session from 2.2.0 to 2.3.0 --- aiohttp_devtools/start/template/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aiohttp_devtools/start/template/requirements.txt b/aiohttp_devtools/start/template/requirements.txt index 74a793ab..53a1414d 100644 --- a/aiohttp_devtools/start/template/requirements.txt +++ b/aiohttp_devtools/start/template/requirements.txt @@ -11,7 +11,7 @@ aiohttp-jinja2==1.0.0 # {% endif %} # {% if session.is_secure %} -aiohttp-session[secure]==2.2.0 +aiohttp-session[secure]==2.3.0 # {% endif %} # {% if database.is_pg_sqlalchemy %} From 1e83e279db3a994daf8673a4b9ed9cf5d4b8f6ac Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Tue, 1 May 2018 16:00:17 +0100 Subject: [PATCH 07/19] Update aiohttp-session from 2.2.0 to 2.3.0 --- tests/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/requirements.txt b/tests/requirements.txt index 6c7c6bc1..91365d91 100644 --- a/tests/requirements.txt +++ b/tests/requirements.txt @@ -17,7 +17,7 @@ Sphinx==1.6.6 # required to run "start" apps aiohttp-jinja2==1.0.0 -aiohttp-session[secure]==2.2.0 +aiohttp-session[secure]==2.3.0 aiohttp-session[aioredis]==2.2.0 aiopg==0.13.2 SQLAlchemy==1.2.2 From 4d772114516da072c4c6bfe6a603c7935e15e873 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Tue, 1 May 2018 16:00:18 +0100 Subject: [PATCH 08/19] Update aiohttp-session from 2.2.0 to 2.3.0 --- tests/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/requirements.txt b/tests/requirements.txt index 91365d91..3a947857 100644 --- a/tests/requirements.txt +++ b/tests/requirements.txt @@ -18,6 +18,6 @@ Sphinx==1.6.6 # required to run "start" apps aiohttp-jinja2==1.0.0 aiohttp-session[secure]==2.3.0 -aiohttp-session[aioredis]==2.2.0 +aiohttp-session[aioredis]==2.3.0 aiopg==0.13.2 SQLAlchemy==1.2.2 From 6ed81acd9d14d2004c522b8d7a2999349aa3d91a Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Tue, 1 May 2018 16:00:20 +0100 Subject: [PATCH 09/19] Update sqlalchemy from 1.2.2 to 1.2.7 --- aiohttp_devtools/start/template/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aiohttp_devtools/start/template/requirements.txt b/aiohttp_devtools/start/template/requirements.txt index 53a1414d..880b68c4 100644 --- a/aiohttp_devtools/start/template/requirements.txt +++ b/aiohttp_devtools/start/template/requirements.txt @@ -16,5 +16,5 @@ aiohttp-session[secure]==2.3.0 # {% if database.is_pg_sqlalchemy %} aiopg==0.13.2 -SQLAlchemy==1.2.2 +SQLAlchemy==1.2.7 # {% endif %} From 557048d6beca17b22ff069ede3042e205abc7602 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Tue, 1 May 2018 16:00:21 +0100 Subject: [PATCH 10/19] Update sqlalchemy from 1.2.2 to 1.2.7 --- tests/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/requirements.txt b/tests/requirements.txt index 3a947857..6a330a50 100644 --- a/tests/requirements.txt +++ b/tests/requirements.txt @@ -20,4 +20,4 @@ aiohttp-jinja2==1.0.0 aiohttp-session[secure]==2.3.0 aiohttp-session[aioredis]==2.3.0 aiopg==0.13.2 -SQLAlchemy==1.2.2 +SQLAlchemy==1.2.7 From 633fd28539b82774d601d8f3e6dc1db6f408182d Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Tue, 1 May 2018 16:00:23 +0100 Subject: [PATCH 11/19] Update coverage from 4.4.2 to 4.5.1 --- tests/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/requirements.txt b/tests/requirements.txt index 6a330a50..bbd5a329 100644 --- a/tests/requirements.txt +++ b/tests/requirements.txt @@ -1,4 +1,4 @@ -coverage==4.4.2 +coverage==4.5.1 docutils==0.14 flake8==3.5.0 grablib==0.6.1 From 4377377f6e543b5fa7ac41f62a2f3bf028cd4b14 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Tue, 1 May 2018 16:00:24 +0100 Subject: [PATCH 12/19] Update grablib from 0.6.1 to 0.7.4 --- tests/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/requirements.txt b/tests/requirements.txt index bbd5a329..73a78091 100644 --- a/tests/requirements.txt +++ b/tests/requirements.txt @@ -1,7 +1,7 @@ coverage==4.5.1 docutils==0.14 flake8==3.5.0 -grablib==0.6.1 +grablib==0.7.4 pycodestyle==2.3.1 pyflakes==1.6.0 pytest==3.5.1 From 72a6199aeb993ac1ab4357978d59955e4c308b87 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Tue, 1 May 2018 16:00:26 +0100 Subject: [PATCH 13/19] Update pycodestyle from 2.3.1 to 2.4.0 --- tests/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/requirements.txt b/tests/requirements.txt index 73a78091..4340d8ba 100644 --- a/tests/requirements.txt +++ b/tests/requirements.txt @@ -2,7 +2,7 @@ coverage==4.5.1 docutils==0.14 flake8==3.5.0 grablib==0.7.4 -pycodestyle==2.3.1 +pycodestyle==2.4.0 pyflakes==1.6.0 pytest==3.5.1 pytest-aiohttp==0.3.0 From 2c562171111004dcffe2400ef3534de15eaf0881 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Tue, 1 May 2018 16:00:27 +0100 Subject: [PATCH 14/19] Update pytest-mock from 1.6.3 to 1.9.0 --- tests/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/requirements.txt b/tests/requirements.txt index 4340d8ba..46751383 100644 --- a/tests/requirements.txt +++ b/tests/requirements.txt @@ -8,7 +8,7 @@ pytest==3.5.1 pytest-aiohttp==0.3.0 pytest-cov==2.5.1 pytest-isort==0.1.0 -pytest-mock==1.6.3 +pytest-mock==1.9.0 pytest-sugar==0.9.1 pytest-timeout==1.2.1 pytest-toolbox==0.2 From 5519904fec238c5efb6eec4de037f6e0b3426860 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Tue, 1 May 2018 16:00:29 +0100 Subject: [PATCH 15/19] Update pytest-toolbox from 0.2 to 0.4 --- tests/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/requirements.txt b/tests/requirements.txt index 46751383..7c71d8cb 100644 --- a/tests/requirements.txt +++ b/tests/requirements.txt @@ -11,7 +11,7 @@ pytest-isort==0.1.0 pytest-mock==1.9.0 pytest-sugar==0.9.1 pytest-timeout==1.2.1 -pytest-toolbox==0.2 +pytest-toolbox==0.4 pytest-xdist==1.22.0 Sphinx==1.6.6 From a2b86d59b1a970f308173fa8548dac6d8544bd9b Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Tue, 1 May 2018 16:00:30 +0100 Subject: [PATCH 16/19] Update pytest-xdist from 1.22.0 to 1.22.2 --- tests/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/requirements.txt b/tests/requirements.txt index 7c71d8cb..8c5c30cc 100644 --- a/tests/requirements.txt +++ b/tests/requirements.txt @@ -12,7 +12,7 @@ pytest-mock==1.9.0 pytest-sugar==0.9.1 pytest-timeout==1.2.1 pytest-toolbox==0.4 -pytest-xdist==1.22.0 +pytest-xdist==1.22.2 Sphinx==1.6.6 # required to run "start" apps From 942eab9dec7467fd53565b2f6e9c14c0d65955d9 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Tue, 1 May 2018 16:00:32 +0100 Subject: [PATCH 17/19] Update sphinx from 1.6.6 to 1.7.4 --- tests/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/requirements.txt b/tests/requirements.txt index 8c5c30cc..c8c96cce 100644 --- a/tests/requirements.txt +++ b/tests/requirements.txt @@ -13,7 +13,7 @@ pytest-sugar==0.9.1 pytest-timeout==1.2.1 pytest-toolbox==0.4 pytest-xdist==1.22.2 -Sphinx==1.6.6 +Sphinx==1.7.4 # required to run "start" apps aiohttp-jinja2==1.0.0 From 104be92929771cb7e64881eae2b0b1d508ba39ab Mon Sep 17 00:00:00 2001 From: Samuel Colvin Date: Sat, 26 May 2018 15:27:50 +0100 Subject: [PATCH 18/19] uprev aiohttp --- aiohttp_devtools/start/template/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aiohttp_devtools/start/template/requirements.txt b/aiohttp_devtools/start/template/requirements.txt index 880b68c4..d345e59b 100644 --- a/aiohttp_devtools/start/template/requirements.txt +++ b/aiohttp_devtools/start/template/requirements.txt @@ -1,7 +1,7 @@ # {# This file is special: lines are made unique, stripped and sorted before the new requirements.txt file is created #} # you will need to install these requirements with `pip install -r requirements.txt` -aiohttp==3.1.3 +aiohttp==3.2.1 pytest==3.5.1 pytest-aiohttp==0.3.0 pytest-cov==2.5.1 From b773d6f174a01a14df55a3612b65f51f3e2e93f7 Mon Sep 17 00:00:00 2001 From: Samuel Colvin Date: Sat, 26 May 2018 16:03:09 +0100 Subject: [PATCH 19/19] fixes --- tests/requirements.txt | 4 ++-- tests/test_runserver_main.py | 18 +++++++++--------- tests/test_runserver_serve.py | 8 ++++---- tests/test_start.py | 8 ++++---- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/tests/requirements.txt b/tests/requirements.txt index c8c96cce..36ee5195 100644 --- a/tests/requirements.txt +++ b/tests/requirements.txt @@ -1,8 +1,8 @@ coverage==4.5.1 docutils==0.14 flake8==3.5.0 -grablib==0.7.4 -pycodestyle==2.4.0 +grablib==0.6.1 # pyup: ignore (last version which is compatible with python 3.5) +pycodestyle==2.3.1 pyflakes==1.6.0 pytest==3.5.1 pytest-aiohttp==0.3.0 diff --git a/tests/test_runserver_main.py b/tests/test_runserver_main.py index 3019e272..5b262793 100644 --- a/tests/test_runserver_main.py +++ b/tests/test_runserver_main.py @@ -39,7 +39,7 @@ async def check_server_running(loop, check_callback): @if_boxed @slow -def test_start_runserver(tmpworkdir, caplog): +def test_start_runserver(tmpworkdir, smart_caplog): mktree(tmpworkdir, { 'app.py': """\ from aiohttp import web @@ -86,7 +86,7 @@ async def check_callback(session): 'adev.server.dft INFO: Starting aux server at http://localhost:8001 ◆\n' 'adev.server.dft INFO: serving static files from ./static_dir/ at http://localhost:8001/static/\n' 'adev.server.dft INFO: Starting dev server at http://localhost:8000 ●\n' - ) in caplog + ) in smart_caplog @if_boxed @@ -220,7 +220,7 @@ def aux_cli(test_client, loop): loop.run_until_complete(cli.close()) -async def test_websocket_hello(aux_cli, caplog): +async def test_websocket_hello(aux_cli, smart_caplog): async with aux_cli.session.ws_connect(aux_cli.make_url('/livereload')) as ws: await ws.send_json({'command': 'hello', 'protocols': ['http://livereload.com/protocols/official-7']}) async for msg in ws: @@ -232,7 +232,7 @@ async def test_websocket_hello(aux_cli, caplog): 'protocols': ['http://livereload.com/protocols/official-7'] } break # noqa - assert 'adev.server.aux WARNING: browser disconnected, appears no websocket connection was made' in caplog + assert 'adev.server.aux WARNING: browser disconnected, appears no websocket connection was made' in smart_caplog async def test_websocket_info(aux_cli, loop): @@ -246,7 +246,7 @@ async def test_websocket_info(aux_cli, loop): await ws.close() -async def test_websocket_bad(aux_cli, caplog): +async def test_websocket_bad(aux_cli, smart_caplog): async with aux_cli.session.ws_connect(aux_cli.make_url('/livereload')) as ws: await ws.send_str('not json') async with aux_cli.session.ws_connect(aux_cli.make_url('/livereload')) as ws: @@ -255,10 +255,10 @@ async def test_websocket_bad(aux_cli, caplog): await ws.send_json({'command': 'boom', 'url': 'foobar', 'plugins': 'bang'}) async with aux_cli.session.ws_connect(aux_cli.make_url('/livereload')) as ws: await ws.send_bytes(b'this is bytes') - assert 'adev.server.aux ERROR: live reload protocol 7 not supported' in caplog.log - assert 'adev.server.aux ERROR: JSON decode error' in caplog.log - assert 'adev.server.aux ERROR: Unknown ws message' in caplog.log - assert "adev.server.aux ERROR: unknown websocket message type binary, data: b'this is bytes'" in caplog + assert 'adev.server.aux ERROR: live reload protocol 7 not supported' in smart_caplog.log + assert 'adev.server.aux ERROR: JSON decode error' in smart_caplog.log + assert 'adev.server.aux ERROR: Unknown ws message' in smart_caplog.log + assert "adev.server.aux ERROR: unknown websocket message type binary, data: b'this is bytes'" in smart_caplog async def test_websocket_reload(aux_cli, loop): diff --git a/tests/test_runserver_serve.py b/tests/test_runserver_serve.py index 2c7affc8..397e6aed 100644 --- a/tests/test_runserver_serve.py +++ b/tests/test_runserver_serve.py @@ -27,7 +27,7 @@ async def test_check_port_not_open(unused_port, loop): await check_port_open(port, loop, 0.001) -async def test_aux_reload(caplog): +async def test_aux_reload(smart_caplog): aux_app = Application() ws = MagicMock() ws.send_str = MagicMock(return_value=create_future()) @@ -45,7 +45,7 @@ async def test_aux_reload(caplog): 'liveCSS': True, 'liveImg': True, } - assert 'adev.server.aux INFO: prompted reload of /static/the_file.js on 1 client\n' == caplog + assert 'adev.server.aux INFO: prompted reload of /static/the_file.js on 1 client\n' == smart_caplog async def test_aux_reload_no_path(): @@ -81,7 +81,7 @@ async def test_aux_reload_html_different(): assert ws.send_str.call_count == 0 -async def test_aux_reload_runtime_error(caplog): +async def test_aux_reload_runtime_error(smart_caplog): aux_app = Application() ws = MagicMock() ws.send_str = MagicMock(return_value=create_future()) @@ -93,7 +93,7 @@ async def test_aux_reload_runtime_error(caplog): ) assert 0 == await src_reload(aux_app) assert ws.send_str.call_count == 1 - assert 'adev.server.aux ERROR: Error broadcasting change to /foo/bar, RuntimeError: foobar\n' == caplog + assert 'adev.server.aux ERROR: Error broadcasting change to /foo/bar, RuntimeError: foobar\n' == smart_caplog async def test_aux_cleanup(loop): diff --git a/tests/test_start.py b/tests/test_start.py index 95193c2c..ec24287d 100644 --- a/tests/test_start.py +++ b/tests/test_start.py @@ -19,7 +19,7 @@ if_boxed = get_if_boxed(pytest) -def test_start_simple(tmpdir, caplog): +def test_start_simple(tmpdir, smart_caplog): StartProject(path=str(tmpdir), name='foobar') assert {p.basename for p in tmpdir.listdir()} == { 'app', @@ -38,11 +38,11 @@ def test_start_simple(tmpdir, caplog): session: secure database: pg-sqlalchemy example: message-board -adev.main INFO: project created, 18 files generated\n""" == caplog(('"/tmp/.*?"', '"/tmp/..."')) +adev.main INFO: project created, 18 files generated\n""" == smart_caplog(('"/tmp/.*?"', '"/tmp/..."')) @if_boxed -async def test_start_other_dir(tmpdir, loop, test_client, caplog): +async def test_start_other_dir(tmpdir, loop, test_client, smart_caplog): StartProject(path=str(tmpdir.join('the-path')), name='foobar', database=DatabaseChoice.NONE) assert {p.basename for p in tmpdir.listdir()} == {'the-path'} assert {p.basename for p in tmpdir.join('the-path').listdir()} == { @@ -62,7 +62,7 @@ async def test_start_other_dir(tmpdir, loop, test_client, caplog): session: secure database: none example: message-board -adev.main INFO: project created, 16 files generated\n""" == caplog.log.replace(str(tmpdir), '/') +adev.main INFO: project created, 16 files generated\n""" == smart_caplog.log.replace(str(tmpdir), '/') config = Config(app_path='the-path/app/', root_path=str(tmpdir), static_path='.') app_factory = config.import_app_factory() app = app_factory()