Skip to content

Commit 86b278c

Browse files
authored
Merge pull request #157 from luzfcb/fix-156
Enable test with Python3.7; there's an issue to track the failing test that appears to be perpendicular to this pull request: #159
2 parents 707358c + 48a257f commit 86b278c

File tree

2 files changed

+22
-11
lines changed

2 files changed

+22
-11
lines changed

.travis.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
language: python
2-
2+
dist: xenial
33
python:
44
- "2.7"
55
- "3.4"
66
- "3.5"
77
- "3.6"
8+
- "3.7"
89

910
install:
1011
- pip install tox
1112

1213
script:
13-
- tox -e $(echo py$TRAVIS_PYTHON_VERSION | tr -d .)
14+
- tox -e $(echo py$TRAVIS_PYTHON_VERSION | tr -d .)

tox.ini

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
[tox]
22
envlist =
3-
py{27,34,35,36}
4-
py36-aiohttp2
5-
py35-aiohttp2
3+
py{27,34,35,36,37}
4+
py{35,36,37}-aiohttp2
65
coverage-report
76

87
skip_missing_interpreters = True
@@ -28,13 +27,13 @@ deps =
2827
py{27}: enum34
2928

3029
# Python3.5+ only deps
31-
py{35,36}: aiohttp >= 3.0.0
32-
py{35,36}: pytest-aiohttp
33-
py{35,36}: aiobotocore >= 0.10.0
30+
py{35,36,37}: aiohttp >= 3.0.0
31+
py{35,36,37}: pytest-aiohttp
32+
py{35,36,37}: aiobotocore >= 0.10.0
3433

3534
commands =
3635
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
37-
py{35,36}: coverage run --source aws_xray_sdk -m py.test tests
36+
py{35,36,37}: coverage run --source aws_xray_sdk -m py.test tests
3837

3938
setenv =
4039
DJANGO_SETTINGS_MODULE = tests.ext.django.app.settings
@@ -63,13 +62,24 @@ deps =
6362
commands =
6463
py{36}: coverage run --source aws_xray_sdk -m py.test tests/ext/aiohttp --ignore tests/ext/aiohttp/test_client.py
6564

65+
[testenv:py37-aiohttp2]
66+
deps =
67+
pytest > 3.0.0
68+
aiohttp >= 2.3.0,<3.0.0
69+
pytest-aiohttp
70+
botocore
71+
coverage
72+
73+
commands =
74+
py{37}: coverage run --source aws_xray_sdk -m py.test tests/ext/aiohttp --ignore tests/ext/aiohttp/test_client.py
75+
6676
[testenv:coverage-report]
6777
deps = coverage
6878
skip_install = true
6979
commands =
7080
# might need to add coverage combine at some point
71-
py{36}: coverage report
72-
py{36}: coverage html
81+
py{37}: coverage report
82+
py{37}: coverage html
7383

7484
[flake8]
7585
max-line-length=120

0 commit comments

Comments
 (0)