Merge pull request #72 from TutorMeOrg/python35_compat

enum34 is not compatible with python3.5

Author: aoberoi

.travis.yml

@@ -5,6 +5,7 @@ python:
 - '3.2'
 - '3.3'
 - '3.4'
+- '3.5'
 install:
 - pip install -r test_requirements.txt
 - pip install -r requirements.txt

setup.py

@@ -2,6 +2,7 @@
 import codecs
 import os
 import re
+import sys
 
 here = os.path.abspath(os.path.dirname(__file__))
 
@@ -26,6 +27,15 @@ def find_version(*file_paths):
 with codecs.open('README.rst', encoding='utf-8') as f:
     long_description = f.read()
 
+install_requires = [
+    'requests',
+    'six',
+    'pytz',
+]
+
+if sys.version_info[0] < 3 or sys.version_info[1] < 4:
+    install_requires.append('enum34')
+
 setup(
     name = 'opentok',
     version = find_version('opentok', 'version.py'),
@@ -68,12 +78,7 @@ def find_version(*file_paths):
 
     packages=find_packages(exclude=["contrib", "docs", "tests*"]),
 
-    install_requires=[
-        'requests',
-        'enum34',
-        'six',
-        'pytz',
-    ],
+    install_requires=install_requires,
 
     include_package_data = True,
 )

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py26,py27,py34
+envlist = py26,py27,py34,py35
 [testenv]
 deps = -rtest_requirements.txt
 commands =