Skip to content

Commit 803afd9

Browse files
authored
Merge pull request #76 from haotianw465/master
Fix travis ci
2 parents b6d380a + 903015e commit 803afd9

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

tox.ini

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
[tox]
22
envlist =
33
py{27,34,35,36}
4-
py36-aiohttp3
5-
py35-aiohttp3
4+
py36-aiohttp2
5+
py35-aiohttp2
66
coverage-report
77

88
skip_missing_interpreters = True
@@ -21,38 +21,38 @@ deps =
2121
django >= 1.10, <2.0
2222
pynamodb
2323
# Python3.5+ only deps
24-
py{35,36}: aiohttp >= 2.3.0,<3.0.0
24+
py{35,36}: aiohttp >= 3.0.0
2525
py{35,36}: pytest-aiohttp
2626
py{35,36}: aiobotocore
2727

2828
commands =
2929
py{27,34}: coverage run --source aws_xray_sdk -m py.test tests --ignore tests/ext/aiohttp --ignore tests/ext/aiobotocore --ignore tests/test_async_local_storage.py --ignore tests/test_async_recorder.py
30-
py{35,36}: coverage run --source aws_xray_sdk -m py.test tests --ignore tests/ext/aiohttp/test_client.py
30+
py{35,36}: coverage run --source aws_xray_sdk -m py.test tests
3131

3232
setenv =
3333
DJANGO_SETTINGS_MODULE = tests.ext.django.app.settings
3434
AWS_SECRET_ACCESS_KEY = fake_key
3535
AWS_ACCESS_KEY_ID=fake_id
3636

37-
[testenv:py35-aiohttp3]
37+
[testenv:py35-aiohttp2]
3838
deps =
3939
pytest > 3.0.0
40-
aiohttp >= 3.0.0
40+
aiohttp >= 2.3.0,<3.0.0
4141
pytest-aiohttp
4242
coverage
4343

4444
commands =
45-
py{35}: coverage run --source aws_xray_sdk -m py.test tests/ext/aiohttp
45+
py{35}: coverage run --source aws_xray_sdk -m py.test tests/ext/aiohttp --ignore tests/ext/aiohttp/test_client.py
4646

47-
[testenv:py36-aiohttp3]
47+
[testenv:py36-aiohttp2]
4848
deps =
4949
pytest > 3.0.0
50-
aiohttp >= 3.0.0
50+
aiohttp >= 2.3.0,<3.0.0
5151
pytest-aiohttp
5252
coverage
5353

5454
commands =
55-
py{36}: coverage run --source aws_xray_sdk -m py.test tests/ext/aiohttp
55+
py{36}: coverage run --source aws_xray_sdk -m py.test tests/ext/aiohttp --ignore tests/ext/aiohttp/test_client.py
5656

5757
[testenv:coverage-report]
5858
deps = coverage

0 commit comments

Comments
 (0)