Merge pull request twisted#69 from hawkowl/tox-tw15

Add Twisted 15.0 in build matrix
pawelmhm · Jan 30, 2015 · 77cc51c · 77cc51c
2 parents aa2b367 + 9c3d22e
commit 77cc51c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -10,6 +10,9 @@ env:
     - TOX_ENV=py26-twtrunk
     - TOX_ENV=py27-twtrunk
     - TOX_ENV=pypy-twtrunk
+    - TOX_ENV=py26-tw150
+    - TOX_ENV=py27-tw150
+    - TOX_ENV=pypy-tw150
     - TOX_ENV=py26-tw140
     - TOX_ENV=py27-tw140
     - TOX_ENV=pypy-tw140

diff --git a/tox.ini b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 envlist =
-    {py26,py27,pypy}-{twcurrent,twtrunk,tw121,tw122,tw123,tw130,tw131,tw132,tw140},
+    {py26,py27,pypy}-{twcurrent,twtrunk,tw121,tw122,tw123,tw130,tw131,tw132,tw140,tw150},
     pyflakes, docs, docs-linkcheck
 
 ###########################
@@ -22,6 +22,7 @@ deps =
     tw131: Twisted==13.1
     tw132: Twisted==13.2
     tw140: Twisted==14.0.2
+    tw150: Twisted==15.0
     twcurrent: Twisted
     twtrunk: git+git://github.com/twisted/twisted.git
 commands =