Thanks to visit codestin.com
Credit goes to github.com

Skip to content

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

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 1 commit into from
Nov 8, 2016
Merged

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

merged 1 commit into from
Nov 8, 2016

Conversation

pomegranited
Copy link
Contributor

@pomegranited pomegranited commented Nov 7, 2016 •
edited
Loading

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 •
edited
Loading

👍 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
Contributor 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.

@pomegranited
Uses the same import path for instructor_task.models as edxapp
1667412 
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'>.
@pomegranited pomegranited force-pushed the jill/fix_instructor_task_path branch from 96d7c50 to 1667412 Compare November 7, 2016 23:52
@pomegranited pomegranited merged commit 5d47b0c into master Nov 8, 2016
@pomegranited pomegranited deleted the jill/fix_instructor_task_path branch November 8, 2016 00:07
pomegranited added a commit to open-craft/edx-platform that referenced this pull request Nov 8, 2016
@pomegranited
Updates problem-builder to v2.6.1, which fixes the instructor_task im…
8d6243f 
…port errors.

Ref open-craft/problem-builder#128
@pomegranited pomegranited mentioned this pull request Nov 8, 2016
Merged
2 tasks
@itsjeyd itsjeyd mentioned this pull request Nov 24, 2016
Merged
2 tasks
@pomegranited pomegranited mentioned this pull request Feb 14, 2017
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@pomegranited @haikuginger @bradenmacdonald