Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Uses the same import path for instructor_task.models as edxapp #128

Merged
merged 1 commit into from
Nov 8, 2016

Conversation

pomegranited
Copy link
Member

@pomegranited pomegranited commented Nov 7, 2016

Fixes celery task error (ref TNL-5903):

RuntimeError: Conflicting 'instructortask' models in application 'instructor_task': <class 'lms.djangoapps.instructor_task.models.InstructorTask'> and <class 'instructor_task.models.InstructorTask'>.

Testing instructions

  1. Ensure your devstack is updated to current master. The commit that introduced the conflict was 54d34e8.
  2. Create a course, and import course.99Ob05.tar.gz.
  3. Visit the Features > Instructor Tool unit, and note that you're able to filter and download data.

Reviewers

  • haikuginger

@haikuginger
Copy link

haikuginger commented Nov 7, 2016

👍 once tests are green.

  • I tested this: I followed the testing instructions and verified that I didn't encounter any errors
  • I read through the code
  • I checked for accessibility issues N/A; no frontend changes
  • Includes documentation N/A

@pomegranited
Copy link
Member Author

@bradenmacdonald Do I need any more approvals before merging this PR, and tagging the updated version for the hotfix?

@bradenmacdonald
Copy link
Member

@pomegranited No, one reviewer is fine here. Go ahead and merge.

Includes version bump to 2.6.1

Fixes RuntimeError: Conflicting 'instructortask' models in application
'instructor_task': <class
'lms.djangoapps.instructor_task.models.InstructorTask'> and <class
'instructor_task.models.InstructorTask'>.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants