Merge pull request #2176 from thedrow/patch-1

Added PyPy 3 to the build matrix

.travis.yml

@@ -8,15 +8,9 @@ env:
     - TOXENV=3.3
     - TOXENV=3.4
     - TOXENV=pypy
+    - TOXENV=pypy3
 before_install:
   - |
-    if [[ $TOXENV = pypy ]]; then
-      deactivate
-      sudo apt-add-repository --yes ppa:pypy/ppa
-      sudo apt-get update
-      sudo apt-get install pypy
-      source ~/virtualenv/pypy/bin/activate
-    fi
     python --version
     uname -a
     lsb_release -a

tox.ini

@@ -4,6 +4,7 @@ envlist =
     3.3,
     3.4,
     pypy
+    pypy3
 
 [testenv]
 sitepackages = False
@@ -49,6 +50,17 @@ setenv = C_DEBUG_TEST = 1
 commands = {toxinidir}/extra/release/removepyc.sh {toxinidir}
            pip install -U -r{toxinidir}/requirements/dev.txt
            nosetests -xsv --with-coverage --cover-inclusive --cover-erase []
+           
+[testenv:pypy3]
+basepython = pypy3
+deps = -r{toxinidir}/requirements/default.txt
+       -r{toxinidir}/requirements/test.txt
+       -r{toxinidir}/requirements/test-ci.txt
+       -r{toxinidir}/requirements/dev.txt
+setenv = C_DEBUG_TEST = 1
+commands = {toxinidir}/extra/release/removepyc.sh {toxinidir}
+           pip install -U -r{toxinidir}/requirements/dev.txt
+           nosetests -xsv --with-coverage --cover-inclusive --cover-erase []         
 
 [testenv:docs]
 deps = -r{toxinidir}/requirements/docs.txt