Add more builds

.travis.yml

@@ -5,7 +5,10 @@ python:
   - 3.3
   - 3.4
   - 3.5
-# - pypy (something doesn't work with regex module)
+#  - pypy (some unicode errors with pypy)
+env:
+  - REGEX_DISABLED=0
+  - REGEX_DISABLED=1
 install:
   - pip install pip --upgrade
   - pip install -r dev-requirements.txt

tox.ini

@@ -1,16 +1,11 @@
 [tox]
-envlist = py26,py27,py33,py34,py35
+envlist = py26,py27,py33,py34,py35,pypy
 
 [testenv:py26]
 commands =
     {envbindir}/pip install -r dev-requirements.txt
     {envpython} setup.py test
 
-[testenv:py35]
-commands =
-    {envbindir}/pip install -r dev-requirements.txt
-    {envpython} setup.py test
-
 [testenv]
 commands =
     {envbindir}/pip install -r dev-requirements.txt