Merge branch 'master' into dev

willforde · willforde · commit 13475e0f95c5 · 2017-08-24T17:39:33.000+01:00
diff --git a/.travis.yml b/.travis.yml
@@ -11,8 +11,6 @@ matrix:
       env: TOXENV=py35
     - python: "3.6"
       env: TOXENV=py36
-    - python: "pypy"
-      env: TOXENV=pypy
 
 sudo: false
 
diff --git a/tox.ini b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py{27,33,34,35,36},pypy
+envlist = py{27,33,34,35,36}
 skip_missing_interpreters=true
 
 [testenv]
