From c53c18488137c79ab7973b9736ca6f79973498d0 Mon Sep 17 00:00:00 2001 From: Andy Eschbacher Date: Fri, 23 Jun 2017 15:07:13 -0400 Subject: [PATCH 1/2] adds more python versions --- .travis.yml | 3 +++ setup.py | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/.travis.yml b/.travis.yml index cdb8c8263..2bb479e79 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,9 @@ language: python python: + - '2.6' - '2.7' + - '3.3' + - '3.4' - '3.5' - '3.6' install: diff --git a/setup.py b/setup.py index a88d8d15e..0a04dc7f8 100644 --- a/setup.py +++ b/setup.py @@ -49,6 +49,12 @@ ':python_version == "2.7"': [ 'IPython>=5.0.0,<6.0.0', ], + ':python_version == "3.3"': [ + 'IPython>=6.0.0' + ], + ':python_version == "3.4"': [ + 'IPython>=6.0.0' + ], ':python_version == "3.5"': [ 'IPython>=6.0.0' ], From a9a0be329b85c173847d88bb28e9f85864595cb0 Mon Sep 17 00:00:00 2001 From: Andy Eschbacher Date: Fri, 23 Jun 2017 15:33:43 -0400 Subject: [PATCH 2/2] limit to python 2.7, 3.4-3.6 --- .travis.yml | 2 -- setup.py | 8 +------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2bb479e79..ababf5c15 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,6 @@ language: python python: - - '2.6' - '2.7' - - '3.3' - '3.4' - '3.5' - '3.6' diff --git a/setup.py b/setup.py index 0a04dc7f8..21931ae2a 100644 --- 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,15 +43,9 @@ '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.3"': [ - 'IPython>=6.0.0' - ], ':python_version == "3.4"': [ 'IPython>=6.0.0' ],