added simplejson dep for 2.5

RDFLib · Mar 3, 2013 · 59ef5cd · 59ef5cd
1 parent 7d0915c
commit 59ef5cd
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -7,7 +7,7 @@ python:
     - 3.2
     - 3.3
 install:
-    - if [[ $TRAVIS_PYTHON_VERSION == '2.5' || $TRAVIS_PYTHON_VERSION == '2.6' ]]; then pip install --use-mirrors ordereddict; fi
+    - if [[ $TRAVIS_PYTHON_VERSION == '2.5' || $TRAVIS_PYTHON_VERSION == '2.6' ]]; then pip install --use-mirrors ordereddict; pip install --use-mirrors simplejson ; fi
     - if [[ ${TRAVIS_PYTHON_VERSION%%.*} == '2' ]]; then pip install --use-mirrors "pyparsing<=1.5.7"; fi
     - if [[ ${TRAVIS_PYTHON_VERSION%%.*} == '3' ]]; then pip install --use-mirrors pyparsing; fi
     - pip install -r requirements.txt --use-mirrors

diff --git a/setup.py b/setup.py
@@ -50,6 +50,9 @@ def setup_python3():
 
 kwargs = {}
 
+if sys.version_info[:2] < (2, 6): 
+    requires.append("simplejson")
+
 if sys.version_info[:2] < (2, 7):
     requires.append("ordereddict")
 

diff --git a/tox.ini b/tox.ini
@@ -11,6 +11,7 @@ deps =
     nose
     git+https://github.com/RDFLib/rdflib.git#egg=rdflib
     ordereddict
+    simplejson
 
 
 [testenv:py26]