Skip to content

Commit

Permalink
Merge pull request #653 from hugovk/travis_python_versions
Browse files Browse the repository at this point in the history
Python 3.5 is out
  • Loading branch information
joshthecoder committed Nov 3, 2015
2 parents f764929 + b30a775 commit 70c1c6b
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 2 deletions.
6 changes: 6 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,11 @@ sudo: false
language: python

python:
- '2.6'
- '2.7'
- '3.3'
- '3.4'
- '3.5'

env:
global:
Expand Down Expand Up @@ -55,3 +58,6 @@ deploy:
on:
repo: tweepy/tweepy
branch: release

matrix:
fast_finish: true
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Github and install it manually:
cd tweepy
python setup.py install

Python 2.6 and 2.7, 3.3 & 3.4 are supported.
Python 2.6 and 2.7, 3.3, 3.4 & 3.5 are supported.

Documentation
-------------
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# and then run "tox" from this directory.

[tox]
envlist = py26, py27, py33, py34
envlist = py26, py27, py33, py34, py35

[base]
deps =
Expand Down

0 comments on commit 70c1c6b

Please sign in to comment.