Merge remote-tracking branch 'origin/master' into ai-grading

Conflicts:
	README.rst
	openassessment/assessment/api/peer.py
	openassessment/workflow/api.py
	openassessment/workflow/models.py
	openassessment/workflow/test/test_api.py

README.rst

@@ -71,11 +71,11 @@ To run the Python and Javascript unit test suites:
 
     ./scripts/test.sh
 
-To limit Python tests to a particular Django app:
+To limit Python tests to a particular module:
 
 .. code:: bash
 
-    ./scripts/test-python.sh openassessment/xblock
+    ./scripts/test-python.sh openassessment/xblock/test/test_openassessment.py
 
 To run just the JavaScript tests:
 

docs/en_us/developers/requirements.txt

@@ -4,3 +4,6 @@
 sphinx
 sphinxcontrib-napoleon
 markupsafe
+
+# need to install requirements for application, in order to import Python code
+-r ../../../requirements/base.txt

docs/shared/requirements.txt

-# Read the docs requirements file
-# ----------------------------------------
-# Installing modules with C dependencies on RTD can be tricky, and pip doesn't
-# have an 'ignore-errors' option, so all requirements fail. Here we keep the
-# maximal list of modules that still works.
-#
-beautifulsoup4==4.1.3
-beautifulsoup==3.2.1
-boto==2.6.0
-celery==3.0.19
-distribute>=0.6.28, <0.7
-django-celery==3.0.17
-django-countries==1.5
-django-filter==0.6.0
-django-followit==0.0.3
-django-keyedcache==1.4-6
-django-kombu==0.9.4
-django-mako==0.1.5pre
-django-masquerade==0.1.6
-django-mptt==0.5.5
-django-openid-auth==0.4
-django-robots==0.9.1
-django-sekizai==0.6.1
-django-ses==0.4.1
-django-storages==1.1.5
-django-threaded-multihost==1.4-1
-django-method-override==0.1.0
-djangorestframework==2.3.5
-django==1.4.5
-feedparser==5.1.3
-fs==0.4.0
-GitPython==0.3.2.RC1
-glob2==0.3
-lxml==3.0.1
-mako==0.7.3
-Markdown==2.2.1
-mock==1.0.1
-networkx==1.7
-nltk==2.0.4
-oauthlib==0.5.1
-paramiko==1.9.0
-path.py==3.0.1
-Pillow==1.7.8
-pip>=1.3
-polib==1.0.3
-pycrypto>=2.6
-pygments==1.5
-pymongo==2.4.1
-python-memcached==1.48
-python-openid==2.2.5
-pytz==2012h
-PyYAML==3.10
-requests==1.2.3
-Shapely==1.2.16
-sorl-thumbnail==11.12
-South==0.7.6
-sympy==0.7.1
-xmltodict==0.4.1
-
-# Metrics gathering and monitoring
-dogapi==1.2.1
-dogstatsd-python==0.2.1
-newrelic==1.13.1.31
-
-# Used for Internationalization and localization
-Babel==1.3
-transifex-client==0.9.1
-
-
--e common/lib/calc
--e common/lib/capa
--e common/lib/chem
--e common/lib/sandbox-packages
--e common/lib/symmath
--e common/lib/xmodule
--e .
-
--e git+https://github.com/edx/XBlock.git@b697bebd45deebd0f868613fab6722a0460ca0c1#egg=XBlock

scripts/build-docs.sh

+#!/usr/bin/env bash
+
+# Need to exit with an error code to fail the Travis build
+set -e
+
+pip install Sphinx sphinx_rtd_theme
+
+# go into docs directory
+cd docs/en_us
+
+# build course authors docs
+cd course_authors
+if [ -f requirements.txt ]; then
+    pip install -r requirements.txt
+fi
+make html
+cd ..
+
+# build developer docs
+cd developers
+if [ -f requirements.txt ]; then
+    pip install -r requirements.txt
+fi
+make html
+cd ..
+
+# go back where we started
+cd ../..

scripts/test.sh

@@ -6,3 +6,4 @@ set -e
 cd `dirname $BASH_SOURCE` && cd ..
 ./scripts/test-python.sh $1
 ./scripts/test-js.sh
+./scripts/build-docs.sh