Update supported and testing python versions

Signed-off-by: Ivan Kanakarakis <ivan.kanak@gmail.com>

3 files changed, 6 insertions, 4 deletions

diff --git a/.travis.yml b/.travis.yml
index 096fb3ee..53d616b8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,11 +5,13 @@ python:
   - 3.4
   - 3.5
   - 3.6
+  - pypy
+  - pypy3
 
 addons:
   apt:
     packages:
-    - xmlsec1
+      - xmlsec1
 
 services:
   - mongodb
diff --git a/setup.py b/setup.py
index 23ac065c..d767ef45 100755
--- a/setup.py
+++ b/setup.py
@@ -57,8 +57,8 @@ setup(
         "Programming Language :: Python :: 2.7",
         "Programming Language :: Python :: 3",
         "Programming Language :: Python :: 3.4",
-        "Programming Language :: Python :: 3.5"
-        "Programming Language :: Python :: 3.6"
+        "Programming Language :: Python :: 3.5",
+        "Programming Language :: Python :: 3.6",
     ],
 
     scripts=["tools/parse_xsd2.py", "tools/make_metadata.py",
diff --git a/tox.ini b/tox.ini
index 9db9641c..0589dc16 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py27,py34,py35,py36
+envlist = py27,py34,py35,py36,pypy,pypy3
 
 [testenv]
 deps = -rtests/test_requirements.txt