From 8a4165f2d7a252e6f3de3fd82b215e46d532a237 Mon Sep 17 00:00:00 2001 From: Eric Fischer Date: Tue, 29 Nov 2016 17:14:54 -0500 Subject: [PATCH 1/3] Allow grades app to be zero-migrated --- .../migrations/0005_multiple_course_flags.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/lms/djangoapps/grades/migrations/0005_multiple_course_flags.py b/lms/djangoapps/grades/migrations/0005_multiple_course_flags.py index 3efed916d8..e739fb0b08 100644 --- a/lms/djangoapps/grades/migrations/0005_multiple_course_flags.py +++ b/lms/djangoapps/grades/migrations/0005_multiple_course_flags.py @@ -18,3 +18,17 @@ class Migration(migrations.Migration): field=CourseKeyField(max_length=255, db_index=True), ), ] + + def unapply(self, project_state, schema_editor, collect_sql=False): + """ + This is a bit of a hack. This migration is removing a unique index that was erroneously included in the initial + migrations for this app, so it's very likely that IntegrityErrors would result if we did roll this particular + migration back. To avoid this, we override the default unapply method and skip the addition of a unique index + that was never intended to exist. + + The assumption here is that you are never going to be specifically targeting a migration < 0005 for grades, + and will only ever be migrating backwards if you intend to go all the way back to zero and drop the tables. + + If this is not the case and you are reading this comment, please file a PR to help us with your intended usage. + """ + pass From 56defd4872699df6b4ea4a38f9f78445fbaa7723 Mon Sep 17 00:00:00 2001 From: jmbowman Date: Mon, 5 Dec 2016 21:46:18 +0000 Subject: [PATCH 2/3] Upgrade django-user-tasks to resolve makemigrations issue --- requirements/edx/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index cda459c97f..74a33b36c3 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -34,7 +34,7 @@ django-simple-history==1.6.3 django-statici18n==1.1.5 django-storages==1.4.1 django-method-override==0.1.0 -django-user-tasks==0.1.1 +django-user-tasks==0.1.2 # We need a fix to DRF 3.2.x, for now use it from our own cherry-picked repo #djangorestframework>=3.1,<3.2 git+https://github.com/edx/django-rest-framework.git@3c72cb5ee5baebc4328947371195eae2077197b0#egg=djangorestframework==3.2.3 From 313493b75c75fea8a68b90a195ae12ed05e03577 Mon Sep 17 00:00:00 2001 From: Mushtaq Ali Date: Tue, 6 Dec 2016 15:16:13 +0500 Subject: [PATCH 3/3] edx-val version bump to 0.0.11 -TNL-6094 --- AUTHORS | 2 +- requirements/edx/github.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/AUTHORS b/AUTHORS index dd0a183592..641b4fb7e8 100644 --- a/AUTHORS +++ b/AUTHORS @@ -217,7 +217,7 @@ Randy Ostler Thomas Young Andrew Dekker Christopher Lee -Mushtaq Ali +Mushtaq Ali Colin Fredericks Xiaolu Xiong Tim Krones diff --git a/requirements/edx/github.txt b/requirements/edx/github.txt index d39d1c398b..1cab546ae2 100644 --- a/requirements/edx/github.txt +++ b/requirements/edx/github.txt @@ -80,7 +80,7 @@ git+https://github.com/edx/edx-ora2.git@1.1.11#egg=ora2==1.1.11 -e git+https://github.com/edx/edx-submissions.git@1.1.1#egg=edx-submissions==1.1.1 git+https://github.com/edx/ease.git@release-2015-07-14#egg=ease==0.1.3 git+https://github.com/edx/i18n-tools.git@v0.3.2#egg=i18n-tools==v0.3.2 -git+https://github.com/edx/edx-val.git@0.0.10#egg=edxval==0.0.10 +git+https://github.com/edx/edx-val.git@0.0.10#egg=edxval==0.0.11 git+https://github.com/pmitros/RecommenderXBlock.git@v1.1#egg=recommender-xblock==1.1 git+https://github.com/solashirai/crowdsourcehinter.git@518605f0a95190949fe77bd39158450639e2e1dc#egg=crowdsourcehinter-xblock==0.1 -e git+https://github.com/pmitros/RateXBlock.git@367e19c0f6eac8a5f002fd0f1559555f8e74bfff#egg=rate-xblock