summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.travis.yml16
-rw-r--r--CHANGES.rst2
-rw-r--r--setup.py1
-rw-r--r--tox.ini4
4 files changed, 14 insertions, 9 deletions
diff --git a/.travis.yml b/.travis.yml
index a8f0475..37c5317 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,13 +1,15 @@
language: python
sudo: false
-env:
- - TOXENV=py27
- - TOXENV=py33
- - TOXENV=py34
- - TOXENV=pypy
+python:
+ - 2.7
+ - 3.3
+ - 3.4
+ - 3.5
+ - pypy
+ - pypy3
install:
- - pip install tox
+ - pip install tox-travis
script:
- - tox
+ - tox
notifications:
email: false
diff --git a/CHANGES.rst b/CHANGES.rst
index baf1957..9d97773 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -4,6 +4,8 @@ Changes
4.1.0 (unreleased)
------------------
+- Add support for Python 3.5.
+
- Drop support for Python 2.6.
diff --git a/setup.py b/setup.py
index cbe99c0..3d6273b 100644
--- a/setup.py
+++ b/setup.py
@@ -76,6 +76,7 @@ setup(
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.3',
'Programming Language :: Python :: 3.4',
+ 'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: Implementation :: CPython',
'Programming Language :: Python :: Implementation :: PyPy',
'Natural Language :: English',
diff --git a/tox.ini b/tox.ini
index a48eeed..4122b3b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,8 +1,8 @@
[tox]
-envlist = py27,py33,py34,pypy
+envlist = py27,py33,py34,py35,pypy
[testenv]
-commands = python setup.py test -q
+commands = python setup.py -q test -q
deps =
six
transaction