Merge pull request #166 from CartoDB/add-conditional-setup-py

adds more python versions
CartoDB · Jun 23, 2017 · 5cf6af1 · 5cf6af1
2 parents a396ffb + a9a0be3
commit 5cf6af1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,7 @@
 language: python
 python:
     - '2.7'
+    - '3.4'
     - '3.5'
     - '3.6'
 install:

diff --git a/setup.py b/setup.py
@@ -30,9 +30,9 @@
         'License :: OSI Approved :: BSD License',
         'Programming Language :: Python',
         'Programming Language :: Python :: 2',
-        'Programming Language :: Python :: 2.6',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
+        'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6'
     ],
@@ -43,12 +43,12 @@
                       'carto>=1.0.1',
                       'tqdm>=4.14.0',],
     extras_require={
-        ':python_version == "2.6"': [
-            'IPython>=5.0.0,<6.0.0',
-            ],
         ':python_version == "2.7"': [
             'IPython>=5.0.0,<6.0.0',
             ],
+        ':python_version == "3.4"': [
+            'IPython>=6.0.0'
+            ],
         ':python_version == "3.5"': [
             'IPython>=6.0.0'
             ],