Bye bye Python 2.5

datadesk · Oct 18, 2013 · 7c7d0cf · 7c7d0cf
1 parent 96d9758
commit 7c7d0cf
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 20 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,8 +1,11 @@
 language: python
 python:
- - '2.5'
+- '2.6'
+- '2.7'
+- '3.2'
+- '3.3'
 install:
- - ./install_requirements.sh
+- pip install -r requirements.txt --use-mirrors
 script:
  - pep8 documentcloud
  - pyflakes documentcloud

diff --git a/install_requirements.sh b/install_requirements.sh
diff --git a/requirements-py25.txt b/requirements-py25.txt
diff --git a/setup.py b/setup.py
@@ -75,14 +75,10 @@ def fullsplit(path, result=None):
         file_info[0] = '\\PURELIB\\%s' % file_info[0]
 
 dependencies = [
-    ,
+    'python-dateutil==2.1',
     'simplejson==3.3.1',
     'six==1.4.1',
 ]
-if sys.version_info < (2, 6):
-    dependencies.append("python-dateutil==1.5")
-else:
-    dependencies.append("python-dateutil==2.1")
 
 setup(
       name='python-documentcloud',
@@ -97,4 +93,3 @@ def fullsplit(path, result=None):
       include_package_data=True,
       install_requires=dependencies,
 )
-