Merge branch 'develop' of https://github.com/parklab/refinery-platform …

…into develop

docs/conf.py

@@ -12,6 +12,7 @@
 # serve to show the default.
 
 import sys, os
+from mock import Mock as MagicMock
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
@@ -253,3 +254,14 @@
 
 # How to display URL addresses: 'footnote', 'no', or 'inline'.
 #texinfo_show_urls = 'footnote'
+
+
+# the python-ldap module doesn't compile in the Read The Docs environment
+# https://github.com/parklab/refinery-platform/issues/531
+class Mock(MagicMock):
+    @classmethod
+    def __getattr__(cls, name):
+            return Mock()
+
+MOCK_MODULES = ['python-ldap']
+sys.modules.update((mod_name, Mock()) for mod_name in MOCK_MODULES)

requirements.txt

@@ -1,20 +1,16 @@
-Django==1.5.4
-Jinja2==2.6
-Markdown==2.2.1
-PyYAML==3.10
-Pygments==1.6rc1
-South==0.7.6
-Sphinx==1.1.3
 amqplib==1.0.2
 anyjson==0.3.1
 argh==0.23.1
-argparse==1.2.1
 bioblend==0.5.0
 bitstring==3.0.2
+boto==2.38.0
 caktus-sphinx-theme==0.1.0
 celery==2.4.6
-distribute==0.7.3
-django-auth-ldap==1.1.3
+certifi==2015.4.28
+cffi==0.9.2
+cryptography==0.8.2
+Django==1.5.4
+django-auth-ldap==1.2.6
 django-celery==2.4.2
 django-chunked-upload==1.0.5
 django-debug-toolbar==0.9.4
@@ -24,32 +20,43 @@ django-guardian==1.2.0
 django-haystack==2.0.0
 django-picklefield==0.2.0
 django-registration==1.0
+django-resumable==0.1b0
 django-supervisor==0.3.1
 django-tastypie==0.9.14
 django-uuidfield==0.2
 djangular==0.2.3
 docutils==0.10
+enum34==1.0.4
+Jinja2==2.6
 jsonpickle==0.4.0
 kombu==2.1.0
+Markdown==2.2.1
 meld3==0.6.10
 mimeparse==0.1.3
 mock==0.8.0
 ndg-httpsclient==0.3.2
 networkx==1.7
 pathtools==0.1.2
+poster==0.8.1
 psycopg2==2.4.5
 pyasn1==0.1.7
-pysolr==2.1.0-beta
+pycparser==2.13
+Pygments==1.6rc1
+pyOpenSSL==0.15.1
+pysolr==2.1.0b0
 python-dateutil==2.1
-python-ldap==2.3.13
+python-ldap==2.4.19
+python-magic==0.4.6
 python-ptrace==0.6.4
+PyYAML==3.10
 readline==6.2.2
 requests==2.7.0
 simplejson==2.4.0
 six==1.5.2
+South==0.7.6
+Sphinx==1.1.3
 sphinx-bootstrap-theme==0.1.2
 supervisor==3.1.3
 uuid==1.30
 watchdog==0.6.0
-wsgiref==0.1.2
 yolk==0.4.1