diff --git a/lms/djangoapps/courseware/grades.py b/lms/djangoapps/courseware/grades.py index 935c5a9d57..59558d6801 100644 --- a/lms/djangoapps/courseware/grades.py +++ b/lms/djangoapps/courseware/grades.py @@ -15,7 +15,6 @@ from dogapi import dog_stats_api from courseware import courses from courseware.model_data import FieldDataCache from student.models import anonymous_id_for_user -from submissions import api as sub_api from xmodule import graders from xmodule.graders import Score from xmodule.modulestore.django import modulestore @@ -23,6 +22,7 @@ from xmodule.modulestore.exceptions import ItemNotFoundError from xmodule.util.duedate import get_extended_due_date from .models import StudentModule from .module_render import get_module_for_descriptor +from submissions import api as sub_api # installed from the edx-submissions repository from opaque_keys import InvalidKeyError log = logging.getLogger("edx.courseware") diff --git a/lms/djangoapps/instructor/enrollment.py b/lms/djangoapps/instructor/enrollment.py index 0da9f3e607..dc29c7ca0c 100644 --- a/lms/djangoapps/instructor/enrollment.py +++ b/lms/djangoapps/instructor/enrollment.py @@ -14,9 +14,7 @@ from student.models import CourseEnrollment, CourseEnrollmentAllowed from courseware.models import StudentModule from edxmako.shortcuts import render_to_string -# Submissions is a Django app that is currently installed -# from the edx-ora2 repo, although it will likely move in the future. -from submissions import api as sub_api +from submissions import api as sub_api # installed from the edx-submissions repository from student.models import anonymous_id_for_user from microsite_configuration import microsite diff --git a/lms/djangoapps/instructor/views/api.py b/lms/djangoapps/instructor/views/api.py index 94bcaefa84..5cd73c2e6b 100644 --- a/lms/djangoapps/instructor/views/api.py +++ b/lms/djangoapps/instructor/views/api.py @@ -52,9 +52,7 @@ import analytics.distributions import analytics.csvs import csv -# Submissions is a Django app that is currently installed -# from the edx-ora2 repo, although it will likely move in the future. -from submissions import api as sub_api +from submissions import api as sub_api # installed from the edx-submissions repository from bulk_email.models import CourseEmail diff --git a/lms/djangoapps/instructor/views/legacy.py b/lms/djangoapps/instructor/views/legacy.py index 4b8faefe05..cdab0986e1 100644 --- a/lms/djangoapps/instructor/views/legacy.py +++ b/lms/djangoapps/instructor/views/legacy.py @@ -36,9 +36,7 @@ from xmodule.html_module import HtmlDescriptor from opaque_keys import InvalidKeyError from lms.lib.xblock.runtime import quote_slashes -# Submissions is a Django app that is currently installed -# from the edx-ora2 repo, although it will likely move in the future. -from submissions import api as sub_api +from submissions import api as sub_api # installed from the edx-submissions repository from bulk_email.models import CourseEmail, CourseAuthorization from courseware import grades diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 08c38da769..b9f08095df 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -132,3 +132,6 @@ git+https://github.com/mfogel/django-settings-context-processor.git # django-cas version 2.0.3 with patch to be compatible with django 1.4 git+https://github.com/mitocw/django-cas.git + +# edX packages +edx-submissions==0.0.2 diff --git a/requirements/edx/github.txt b/requirements/edx/github.txt index 5b800b3f71..599ed1e5ef 100644 --- a/requirements/edx/github.txt +++ b/requirements/edx/github.txt @@ -26,6 +26,6 @@ -e git+https://github.com/edx/bok-choy.git@82b4e82d79b9d4c6d087ebbfa26ea23235728e62#egg=bok_choy -e git+https://github.com/edx-solutions/django-splash.git@9965a53c269666a30bb4e2b3f6037c138aef2a55#egg=django-splash -e git+https://github.com/edx/acid-block.git@459aff7b63db8f2c5decd1755706c1a64fb4ebb1#egg=acid-xblock --e git+https://github.com/edx/edx-ora2.git@release-2014-06-02T15.45#egg=edx-ora2 +-e git+https://github.com/edx/edx-ora2.git@release-2014-06-11T10.43#egg=edx-ora2 -e git+https://github.com/edx/opaque-keys.git@91b7ec93cfb57c6739332e85805296626b4fb1db#egg=opaque-keys git+https://github.com/edx/ease.git@a990b25ed4238acb1b15ee6f027465db3a10960e#egg=ease