Skip to content

Commit

Permalink
Merge branch 'emmanvg-37support'
Browse files Browse the repository at this point in the history
  • Loading branch information
clenk committed Oct 18, 2018
2 parents 0e1d6e4 + 3f4a664 commit fbe7b50
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 5 deletions.
5 changes: 5 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@ python:
- "3.4"
- "3.5"
- "3.6"
matrix:
include:
- python: 3.7 # https://github.com/travis-ci/travis-ci/issues/9069#issuecomment-425720905
dist: xenial
sudo: true
install:
- pip install -U pip setuptools
- pip install tox-travis pre-commit
Expand Down
1 change: 1 addition & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,6 @@
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
],
)
11 changes: 6 additions & 5 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist = py27,py34,py35,py36,style,isort-check
envlist = py27,py34,py35,py36,py37,style,isort-check

[testenv]
deps =
Expand Down Expand Up @@ -34,7 +34,8 @@ max-line-length=160

[travis]
python =
2.7: py27, pycodestyle
3.4: py34, pycodestyle
3.5: py35, pycodestyle
3.6: py36, pycodestyle
2.7: py27, style
3.4: py34, style
3.5: py35, style
3.6: py36, style, isort-check
3.7: py37, style

0 comments on commit fbe7b50

Please sign in to comment.