Commit 70c1c6b1 authored by Joshua Roesslein's avatar Joshua Roesslein
Browse files

Merge pull request #653 from hugovk/travis_python_versions

Python 3.5 is out
parents f7649296 b30a7755
......@@ -3,8 +3,11 @@ sudo: false
language: python
python:
- '2.6'
- '2.7'
- '3.3'
- '3.4'
- '3.5'
env:
global:
......@@ -55,3 +58,6 @@ deploy:
on:
repo: tweepy/tweepy
branch: release
matrix:
fast_finish: true
......@@ -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
-------------
......
......@@ -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 =
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment