Skip to content

Commit

Permalink
Added Python 3.6 to Tox & Travis.
Browse files Browse the repository at this point in the history
  • Loading branch information
sybrenstuvel committed Feb 6, 2017
1 parent 3cb0e32 commit d24cc15
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 5 deletions.
12 changes: 9 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
language: python

# Python 3.5 specified to make tox environment 'py35' work.
# Python versions specified to make tox environment 'py35' and 'py36' work.
# See: https://github.com/travis-ci/travis-ci/issues/4794
python:
- 2.7
- 3.3
- 3.4
- 3.5
- 3.6

# Environment changes have to be manually synced with 'tox.ini'.
# See: https://github.com/travis-ci/travis-ci/issues/3024
Expand All @@ -12,16 +16,18 @@ env:
- TOXENV=py33
- TOXENV=py34
- TOXENV=py35
- TOXENV=py36
- TOXENV=pypy

install:
- pip install tox-travis
- pip install -r requirements.txt
- pip install coveralls

script:
- tox

after_success:
# Coveralls submission only for py35 environment, because of being the only
# Coveralls submission only for py36 environment, because of being the only
# one that executes doctest-modules testing, according to tox.ini.
- if [ ${TOXENV} = "py35" ]; then coveralls; fi
- if [ ${TOXENV} = "py36" ]; then coveralls; fi
4 changes: 2 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist = py27,py33,py34,py35,pypy
envlist = py27,py33,py34,py35,py36,pypy

[pytest]
addopts = -v --cov flickrapi --cov-report term-missing
Expand All @@ -15,5 +15,5 @@ deps=pytest==2.9.1
requests-toolbelt==0.3.1
six==1.9.0

[testenv:py35]
[testenv:py36]
commands=py.test --doctest-modules flickrapi tests

0 comments on commit d24cc15

Please sign in to comment.