Merge pull request #35 from jhgg/pypy-py35

Add testing for py35 and pypy.

Author: dittos

.travis.yml

@@ -4,8 +4,11 @@ python:
 - 2.7
 - 3.3
 - 3.4
+- 3.5
+- pypy
 install:
-- pip install pytest pytest-cov coveralls flake8
+- pip install pytest-cov coveralls flake8
+- pip install pytest>=2.7.3 --upgrade
 - pip install -e .
 script:
 - py.test --cov=graphql

setup.py

@@ -40,14 +40,20 @@ def run_tests(self):
         'Intended Audience :: Developers',
         'Topic :: Software Development :: Libraries',
         'Programming Language :: Python :: 2',
+        'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 3',
+        'Programming Language :: Python :: 3.3',
+        'Programming Language :: Python :: 3.4',
+        'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: Implementation :: PyPy',
     ],
 
     keywords='api graphql protocol rest',
 
     packages=find_packages(exclude=['tests']),
 
     install_requires=[],
-    tests_require=['pytest>=2.7.2'],
+    tests_require=['pytest>=2.7.3'],
 
     cmdclass={'test': PyTest},
 )

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = flake8,py27,py33,py34,docs
+envlist = flake8,py27,py33,py34,py35,pypy,docs
 
 [testenv]
 deps = pytest>=2.7.2