From 1b243edd54595540cfd614d8a42c0d2ca39b7ca5 Mon Sep 17 00:00:00 2001 From: Jens Hedegaard Nielsen Date: Wed, 28 Oct 2015 14:43:11 +0000 Subject: [PATCH] Merge pull request #5215 from tacaswell/tst_drop_old_pythons TST: drop py2.6 & py3.3 testing --- .travis.yml | 6 ++---- setup.py | 5 ++++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index e858436b1e7f..cc96f76db2bc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,13 +34,11 @@ language: python matrix: include: - - python: 2.6 - env: NUMPY=numpy==1.6 MOCK=mock - python: 2.7 - env: MOCK=mock PANDAS=pandas - - python: 3.3 + env: MOCK=mock NUMPY=numpy==1.6 - python: 3.4 - python: 3.5 + env: PANDAS=pandas - python: 2.7 env: TEST_ARGS=--pep8 - python: 2.7 diff --git a/setup.py b/setup.py index 4856e1c465ca..e294363bce57 100644 --- a/setup.py +++ b/setup.py @@ -121,8 +121,11 @@ 'Intended Audience :: Science/Research', 'License :: OSI Approved :: Python Software Foundation License', 'Programming Language :: Python', - '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', 'Topic :: Scientific/Engineering :: Visualization', ]