Small fixes to rebase to edx-platform

.jshintrc

@@ -27,7 +27,7 @@
     "unused"          : true,      // Warns when you define and never use your variables.
     "strict"          : false,     // Requires all functions to run in ECMAScript 5's strict mode.
     "trailing"        : true,      // Makes it an error to leave a trailing whitespace in your code.
-    "maxlen"          : 120,       // Lets you set the maximum length of a line.
+    // "maxlen"       : 120,       // Lets you set the maximum length of a line.
     //"maxparams"     : 4,         // Lets you set the max number of formal parameters allowed per function.
     //"maxdepth"      : 4,         // Lets you control how nested do you want your blocks to be.
     //"maxstatements" : 4,         // Lets you set the max number of statements allowed per function.

Makefile

@@ -21,7 +21,6 @@ install-python:
 	./scripts/install-python.sh
 
 install-js:
-	npm config set loglevel warn
 	npm install
 
 install-nltk-data:
@@ -43,6 +42,7 @@ install-test:
 	pip install -q -r requirements/test.txt
 
 install-sys-requirements: install-system install-node
+	npm config set loglevel warn
 
 install-dev:
 	gem install sass

manage.py

@@ -16,6 +16,7 @@ if __name__ == "__main__":
         import logging
         logging.captureWarnings(True)
         sys.argv.append('--noinput')
+        sys.argv.append('--logging-clear-handlers')
 
     from django.core.management import execute_from_command_line
     execute_from_command_line(sys.argv)

openassessment/assessment/api/staff.py

@@ -242,7 +242,7 @@ def create_assessment(
         raise StaffAssessmentInternalError(error_message)
 
 
-@transaction.commit_on_success
+@transaction.atomic
 def _complete_assessment(
         submission_uuid,
         scorer_id,

openassessment/workflow/models.py

@@ -110,10 +110,6 @@ class AssessmentWorkflow(TimeStampedModel, StatusModel):
             new_list.extend(AssessmentWorkflow.ASSESSMENT_SCORE_PRIORITY)
             AssessmentWorkflow.ASSESSMENT_SCORE_PRIORITY = new_list
 
-    @classmethod
-    @transaction.atomic
-    def include_staff_in_class(cls):
-        if 'staff' not in cls.STEPS:
     def start_workflow(cls, submission_uuid, step_names, on_init_params):
         """
         Start a new workflow.

requirements/base.txt

@@ -6,7 +6,7 @@
 git+https://github.com/edx/XBlock.git@xblock-0.4.1#egg=XBlock==0.4.1
 
 # edx-submissions
-git+https://github.com/edx/edx-submissions.git@0.1.2#egg=edx-submissions==0.1.2
+git+https://github.com/edx/edx-submissions.git@0.1.2#egg=edx-submissions==0.1.3
 
 # Third Party Requirements
 boto>=2.32.1,<3.0.0

requirements/test-acceptance.txt

 bok-choy==0.4.7
-ddt==0.8.0
+ddt==1.0.0
 nose==1.3.3

requirements/test.txt

 -r base.txt
 -r test-acceptance.txt
 
-coverage==3.7.1
+coverage==4.0.2
 django-nose==1.4.1
 mock==1.0.1
-moto==0.2.22
-pep8==1.5.7
+moto==0.3.1
+pep8==1.6.2
 pylint<1.0
 
 git+https://github.com/edx/django-pyfs.git@1.0.3#egg=django-pyfs==1.0.3

scripts/render-templates.sh

@@ -3,5 +3,5 @@
 cd `dirname $BASH_SOURCE` && cd ..
 
 echo "Generating HTML fixtures for JavaScript tests..."
-export DJANGO_SETTINGS_MODULE=${DJANGO_SETTINGS_MODULE:-"settings.test"}
+export DJANGO_SETTINGS_MODULE=${DJANGO_SETTINGS_MODULE:-"settings.test_with_coverage"}
 ./scripts/render_templates.py openassessment/xblock/static/js/fixtures/templates.json

scripts/render_templates.py

@@ -30,8 +30,8 @@ import dateutil.parser
 import pytz
 
 # This is a bit of a hack to ensure that the root repo directory
-# is in the Python path, so Django can find the settings module.
-sys.path.append(os.path.dirname(os.path.dirname(__file__)))
+# is in the front of the Python path, so Django can find the settings module.
+sys.path.insert(1,os.path.dirname(os.path.dirname(__file__)))
 import django
 from django.template.context import Context
 from django.template.loader import get_template

scripts/test-python.sh

@@ -6,5 +6,5 @@ cd `dirname $BASH_SOURCE` && cd ..
 git clean -xfd "./storage/test/"
 
 echo "Running Python tests..."
-export DJANGO_SETTINGS_MODULE=${DJANGO_SETTINGS_MODULE:-"settings.test"}
+export DJANGO_SETTINGS_MODULE=${DJANGO_SETTINGS_MODULE:-"settings.test_with_coverage"}
 python manage.py test $1

setup.py

@@ -42,7 +42,7 @@ def load_requirements(*requirements_paths):
 
 setup(
     name='ora2',
-    version='0.2.2',
+    version='0.2.3',
     author='edX',
     url='http://github.com/edx/edx-ora2',
     description='edx-ora2',