Merge pull request #934 from Tarrasch/remove-26-support

Drop python 2.6 support
spotify · May 7, 2015 · d987e1e · d987e1e
2 parents 9ee0191 + 7b3fb1a
commit d987e1e
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -13,11 +13,9 @@ env:
   matrix:
     - TOXENV=pep8
     - TOXENV=docs
-    - TOXENV=py26-nonhdfs
     - TOXENV=py27-nonhdfs
     - TOXENV=py33-nonhdfs
     - TOXENV=py34-nonhdfs
-    - TOXENV=py26-cdh
     - TOXENV=py27-cdh
     - TOXENV=py33-cdh
     - TOXENV=py34-cdh

diff --git a/debian/control b/debian/control
@@ -3,8 +3,7 @@ Section: libs
 Priority: extra
 Maintainer: Elias Freider <freider@spotify.com>
 Build-Depends:	debhelper (>= 7),
-		python-all (>= 2.6.6-3~),
-		python-argparse,
+		python-all (>= 2.7),
 		python-pip,
 		python-psycopg2,
 		python-pyparsing,
@@ -25,7 +24,6 @@ Architecture: all
 Depends: ${shlibs:Depends},
 	 ${misc:Depends},
 	 ${python:Depends},
-	 python-argparse,
 	 python-pyparsing,
 	 python-sqlalchemy,
 	 python-mechanize

diff --git a/tox.ini b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py{26,27,33,34}-{cdh,hdp,nonhdfs}, docs, pep8
+envlist = py{27,33,34}-{cdh,hdp,nonhdfs}, docs, pep8
 skipsdist = True
 
 [testenv]