Skip to content
This repository was archived by the owner on Jan 7, 2021. It is now read-only.

Commit 4df592e

Browse files
committed
Attempt to rework requirements to support Python2.5 with a different version of python-dateutil
1 parent 4e2f5de commit 4df592e

4 files changed

Lines changed: 25 additions & 11 deletions

File tree

.travis.yml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,8 @@
11
language: python
22
python:
3-
- '2.5'
4-
- '2.6'
5-
- '2.7'
6-
- '3.2'
7-
- '3.3'
3+
- '2.5'
84
install:
9-
- pip install -r requirements.txt --use-mirrors
5+
- ./install_requirements.py
106
script:
117
- pep8 documentcloud
128
- pyflakes documentcloud

install_requirements.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
ret=`python -c 'import sys; print(".".join(map(str, sys.version_info[:2])))'`
2+
if [ $ret -eq 2.5 ]; then
3+
pip install -r requirements-py25.txt --use-mirrors
4+
else
5+
pip install -r requirements.txt --use-mirrors
6+
fi

requirements-py25.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
argparse==1.2.1
2+
pep8==1.4.6
3+
pyflakes==0.7.3
4+
python-dateutil==1.5
5+
simplejson==3.3.1
6+
six==1.4.1

setup.py

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,16 @@ def fullsplit(path, result=None):
7474
for file_info in data_files:
7575
file_info[0] = '\\PURELIB\\%s' % file_info[0]
7676

77+
dependencies = [
78+
,
79+
'simplejson==3.3.1',
80+
'six==1.4.1',
81+
]
82+
if sys.version_info < (2, 6):
83+
dependencies.append("python-dateutil==1.5")
84+
else:
85+
dependencies.append("python-dateutil==2.1")
86+
7787
setup(
7888
name='python-documentcloud',
7989
version='0.162',
@@ -85,10 +95,6 @@ def fullsplit(path, result=None):
8595
cmdclass = cmdclasses,
8696
data_files=data_files,
8797
include_package_data=True,
88-
install_requires=[
89-
'python-dateutil==2.1',
90-
'simplejson==3.3.1',
91-
'six==1.4.1',
92-
],
98+
install_requires=dependencies,
9399
)
94100

0 commit comments

Comments
 (0)