Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix aiohttp upgrade #951

Merged
merged 2 commits into from
Oct 15, 2019
Merged

Fix aiohttp upgrade #951

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
712b2d2
Revert "set max aiohttp version to 3.5.1 (until build is fixed) (#844)"
cognifloyd May 22, 2019
41803bc
Fix test_run_with_aiohttp_not_installed
cognifloyd May 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion requirements-aiohttp.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
aiohttp>=2.2.5,<3.5.2
aiohttp>=2.2.5
aiohttp-swagger>=1.0.5
ujson>=1.35
aiohttp_jinja2==0.15.0
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ def read_version(package):
swagger_ui_require = 'swagger-ui-bundle>=0.0.2'
flask_require = 'flask>=0.10.1'
aiohttp_require = [
'aiohttp>=2.3.10,<3.5.2',
'aiohttp>=2.3.10',
'aiohttp-jinja2>=0.14.0'
]
ujson_require = 'ujson>=1.35'
Expand Down
1 change: 1 addition & 0 deletions tests/test_cli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,6 +262,7 @@ def test_run_with_wsgi_containers(mock_app_run, spec_file):
def test_run_with_aiohttp_not_installed(mock_app_run, spec_file):
import sys
aiohttp_bkp = sys.modules.pop('aiohttp', None)
sys.modules['aiohttp'] = None

runner = CliRunner()

Expand Down