Simplified dependencies and removed outdated simplejson dependency since nobody is using those old versions of Python any more.

Author: palewire

.travis.yml

@@ -1,10 +1,10 @@
 language: python
 python:
-- '2.7'
-- '3.3'
-- '3.4'
+ - '2.7'
+ - '3.3'
+ - '3.4'
 install:
-- pip install -r requirements.txt
+ - pip install -r requirements.txt
 script:
  - pep8 documentcloud
  - pyflakes documentcloud

documentcloud/__init__.py

@@ -15,6 +15,7 @@
 import os
 import sys
 import six
+import json
 import copy
 import base64
 from .toolbox import retry
@@ -31,10 +32,6 @@
     import urllib.request
 else:
     from six.moves import urllib
-try:
-    import json
-except ImportError:
-    import simplejson as json
 
 
 #

requirements.txt

@@ -1,20 +1,12 @@
-Jinja2==2.7.2
-MarkupSafe==0.19
-PyYAML==3.10
-Pygments==1.6
-Sphinx==1.2.2
+# Required for development
+Sphinx
 argparse
-coverage==3.7.1
-docutils==0.11
-pep8==1.4.6
-py==1.4.19
+coverage
+pep8
 pyflakes
-python-coveralls==2.4.2
+python-coveralls
+tox
+# Required for the app
+six
 python-dateutil>=2.1
-requests==2.1.0
-sh==1.09
-simplejson>=3.3.1
-six>=1.4.1
-tox==1.6.1
-virtualenv==1.11
-rfc3987
+rfc3987

setup.py

@@ -14,7 +14,6 @@
     include_package_data=True,
     install_requires=(
         'python-dateutil>=2.1',
-        'simplejson>=3.3.1',
         'six>=1.4.1',
         'rfc3987',
     ),