summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVille Skyttä <ville.skytta@iki.fi>2016-01-05 16:05:19 +0200
committerVille Skyttä <ville.skytta@iki.fi>2016-01-05 16:24:43 +0200
commit76155e28992395293abc70244f05a6f77f955cb0 (patch)
tree50cb5508f10480b1bc17ed8aa7b6f74b26724d9b
parent35bfaceec39136b4d4dc09b877a14829bc82b8a3 (diff)
downloadpython-mimeparse-76155e28992395293abc70244f05a6f77f955cb0.tar.gz
Test with Python 3.4 and 3.5
-rw-r--r--.travis.yml7
-rw-r--r--tox.ini8
2 files changed, 14 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index 7d3901c..cb5b1e1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,9 +6,16 @@ python:
env:
- TOXENV=py27
- TOXENV=py32
+ - TOXENV=py34
- TOXENV=pypy
- TOXENV=pep8,pyflakes
+# https://github.com/travis-ci/travis-ci/issues/4794
+matrix:
+ include:
+ - python: 3.5
+ env: TOXENV=py35
+
# command to install dependencies
install:
- pip install tox
diff --git a/tox.ini b/tox.ini
index 72cd14a..38fb075 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,9 +1,15 @@
[tox]
-envlist = py32,py27,pypy,pep8,pyflakes
+envlist = py35,py34,py32,py27,pypy,pep8,pyflakes
[testenv]
commands = ./mimeparse_test.py
+[testenv:py35]
+basepython = python3.5
+
+[testenv:py34]
+basepython = python3.4
+
[testenv:py32]
basepython = python3.2