Skip to content

Commit

Permalink
Merge pull request #14 from macisamuele/maci-update-conditional-aioht…
Browse files Browse the repository at this point in the history
…tp-dependency

Update conditional aiohttp dependency
  • Loading branch information
sjaensch committed Mar 8, 2018
2 parents ec73096 + fe39301 commit b9c36b0
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
3 changes: 3 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@ language: python

matrix:
include:
- env: TOXENV=py35
# Ensure one test with a python version that does not support aiohttp>=3
python: "3.5.2"
- env: TOXENV=py35
python: "3.5"
- env: TOXENV=py36
Expand Down
5 changes: 2 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#!/usr/bin/env python
import os
import sys

from setuptools import setup

Expand All @@ -10,7 +9,6 @@
with open(os.path.join(base_dir, 'bravado_asyncio', '__init__.py')) as f:
exec(f.read(), about)

aiohttp_requirement = 'aiohttp' if sys.version_info >= (3, 5, 3) else 'aiohttp<3.0'

setup(
name='bravado-asyncio',
Expand All @@ -32,12 +30,13 @@
'Programming Language :: Python :: 3.6',
],
install_requires=[
aiohttp_requirement,
'aiohttp',
'bravado',
],
extras_require={
# as recommended by aiohttp, see http://aiohttp.readthedocs.io/en/stable/#library-installation
'aiohttp_extras': ['aiodns', 'cchardet'],
'aiobravado': ['aiobravado'],
':python_version<"3.5.3"': 'aiohttp<3',
},
)

0 comments on commit b9c36b0

Please sign in to comment.