From 147189478fd18d0057a57f6e5592be47cd910906 Mon Sep 17 00:00:00 2001 From: Nimisha Asthagiri Date: Wed, 1 Apr 2020 12:39:48 -0400 Subject: [PATCH 1/2] Django2: Update django-model-utils Update this library in order to get the Django2 fix in https://github.com/jazzband/django-model-utils/pull/335 --- requirements/edx/base.txt | 2 +- requirements/edx/development.txt | 2 +- requirements/edx/testing.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 01315f48f7..a130f10ced 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -65,7 +65,7 @@ django-filter==2.2.0 # via -r requirements/edx/base.in, edx-enterprise django-ipware==2.1.0 # via -r requirements/edx/base.in, edx-enterprise, edx-proctoring django-js-asset==1.2.2 # via django-mptt git+https://gitlab.com/Ayub-khan/django-method-override.git@5270af321be2e576d8e8b3c4191711a19975c356#egg=django-method-override==1.0.4 # via -r requirements/edx/github.in -django-model-utils==3.0.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.in, django-user-tasks, edx-bulk-grades, edx-celeryutils, edx-completion, edx-enterprise, edx-milestones, edx-organizations, edx-proctoring, edx-rbac, edx-submissions, edx-when, edxval, ora2, super-csv +django-model-utils==3.2.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.in, django-user-tasks, edx-bulk-grades, edx-celeryutils, edx-completion, edx-enterprise, edx-milestones, edx-organizations, edx-proctoring, edx-rbac, edx-submissions, edx-when, edxval, ora2, super-csv django-mptt==0.11.0 # via -r requirements/edx/base.in, django-wiki django-multi-email-field==0.6.1 # via edx-enterprise django-mysql==3.3.0 # via -r requirements/edx/base.in diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index ede4ef3acf..e08489e99e 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -77,7 +77,7 @@ django-filter==2.2.0 # via -r requirements/edx/testing.txt, edx-enterprise django-ipware==2.1.0 # via -r requirements/edx/testing.txt, edx-enterprise, edx-proctoring django-js-asset==1.2.2 # via -r requirements/edx/testing.txt, django-mptt git+https://gitlab.com/Ayub-khan/django-method-override.git@5270af321be2e576d8e8b3c4191711a19975c356#egg=django-method-override==1.0.4 # via -r requirements/edx/testing.txt -django-model-utils==3.0.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt, django-user-tasks, edx-bulk-grades, edx-celeryutils, edx-completion, edx-enterprise, edx-milestones, edx-organizations, edx-proctoring, edx-rbac, edx-submissions, edx-when, edxval, ora2, super-csv +django-model-utils==3.2.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt, django-user-tasks, edx-bulk-grades, edx-celeryutils, edx-completion, edx-enterprise, edx-milestones, edx-organizations, edx-proctoring, edx-rbac, edx-submissions, edx-when, edxval, ora2, super-csv django-mptt==0.11.0 # via -r requirements/edx/testing.txt, django-wiki django-multi-email-field==0.6.1 # via -r requirements/edx/testing.txt, edx-enterprise django-mysql==3.3.0 # via -r requirements/edx/testing.txt diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index 9cf8c224f1..c270d340b1 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -75,7 +75,7 @@ django-filter==2.2.0 # via -r requirements/edx/base.txt, edx-enterprise django-ipware==2.1.0 # via -r requirements/edx/base.txt, edx-enterprise, edx-proctoring django-js-asset==1.2.2 # via -r requirements/edx/base.txt, django-mptt git+https://gitlab.com/Ayub-khan/django-method-override.git@5270af321be2e576d8e8b3c4191711a19975c356#egg=django-method-override==1.0.4 # via -r requirements/edx/base.txt -django-model-utils==3.0.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.txt, django-user-tasks, edx-bulk-grades, edx-celeryutils, edx-completion, edx-enterprise, edx-milestones, edx-organizations, edx-proctoring, edx-rbac, edx-submissions, edx-when, edxval, ora2, super-csv +django-model-utils==3.2.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.txt, django-user-tasks, edx-bulk-grades, edx-celeryutils, edx-completion, edx-enterprise, edx-milestones, edx-organizations, edx-proctoring, edx-rbac, edx-submissions, edx-when, edxval, ora2, super-csv django-mptt==0.11.0 # via -r requirements/edx/base.txt, django-wiki django-multi-email-field==0.6.1 # via -r requirements/edx/base.txt, edx-enterprise django-mysql==3.3.0 # via -r requirements/edx/base.txt From 28f65effd2c8d93f42c24d3b7044c606ac8d0565 Mon Sep 17 00:00:00 2001 From: Nimisha Asthagiri Date: Wed, 1 Apr 2020 17:11:25 -0400 Subject: [PATCH 2/2] Update edx-ora2 and edx-celeryutils to upgrade django-model-utils --- requirements/edx/base.txt | 4 ++-- requirements/edx/development.txt | 4 ++-- requirements/edx/github.in | 2 +- requirements/edx/testing.txt | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index a130f10ced..ed9a9d897d 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -96,7 +96,7 @@ edx-analytics-data-api-client==0.15.5 # via -r requirements/edx/base.in edx-api-doc-tools==1.1.0 # via -r requirements/edx/base.in edx-bulk-grades==0.6.8 # via -r requirements/edx/base.in, staff-graded-xblock edx-ccx-keys==1.0.1 # via -r requirements/edx/base.in -edx-celeryutils==0.4.0 # via -r requirements/edx/base.in, super-csv +edx-celeryutils==0.5.0 # via -r requirements/edx/base.in, super-csv edx-completion==3.1.1 # via -r requirements/edx/base.in edx-django-release-util==0.4.2 # via -r requirements/edx/base.in edx-django-sites-extensions==2.4.3 # via -r requirements/edx/base.in @@ -168,7 +168,7 @@ numpy==1.18.2 # via chem, openedx-calc, scipy git+https://github.com/joestump/python-oauth2.git@b94f69b1ad195513547924e380d9265133e995fa#egg=oauth2 # via -r requirements/edx/github.in oauthlib==3.0.1 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.in, django-oauth-toolkit, lti-consumer-xblock, requests-oauthlib, social-auth-core openedx-calc==1.0.7 # via -r requirements/edx/base.in -git+https://github.com/edx/edx-ora2.git@2.6.23#egg=ora2==2.6.23 # via -r requirements/edx/github.in +git+https://github.com/edx/edx-ora2.git@2.6.25#egg=ora2==2.6.25 # via -r requirements/edx/github.in packaging==20.3 # via drf-yasg path.py==12.4.0 # via edx-enterprise, edx-i18n-tools, ora2, xmodule path==13.1.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/paver.txt, path.py diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index e08489e99e..46bf86135d 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -108,7 +108,7 @@ edx-analytics-data-api-client==0.15.5 # via -r requirements/edx/testing.txt edx-api-doc-tools==1.1.0 # via -r requirements/edx/testing.txt edx-bulk-grades==0.6.8 # via -r requirements/edx/testing.txt, staff-graded-xblock edx-ccx-keys==1.0.1 # via -r requirements/edx/testing.txt -edx-celeryutils==0.4.0 # via -r requirements/edx/testing.txt, super-csv +edx-celeryutils==0.5.0 # via -r requirements/edx/testing.txt, super-csv edx-completion==3.1.1 # via -r requirements/edx/testing.txt edx-django-release-util==0.4.2 # via -r requirements/edx/testing.txt edx-django-sites-extensions==2.4.3 # via -r requirements/edx/testing.txt @@ -202,7 +202,7 @@ numpy==1.18.2 # via -r requirements/edx/testing.txt, chem, openedx-c git+https://github.com/joestump/python-oauth2.git@b94f69b1ad195513547924e380d9265133e995fa#egg=oauth2 # via -r requirements/edx/testing.txt oauthlib==3.0.1 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt, django-oauth-toolkit, lti-consumer-xblock, requests-oauthlib, social-auth-core openedx-calc==1.0.7 # via -r requirements/edx/testing.txt -git+https://github.com/edx/edx-ora2.git@2.6.23#egg=ora2==2.6.23 # via -r requirements/edx/testing.txt +git+https://github.com/edx/edx-ora2.git@2.6.25#egg=ora2==2.6.25 # via -r requirements/edx/testing.txt packaging==20.3 # via -r requirements/edx/testing.txt, drf-yasg, pytest, sphinx, tox pandas==0.22.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt path.py==12.4.0 # via -r requirements/edx/testing.txt, edx-enterprise, edx-i18n-tools, ora2, xmodule diff --git a/requirements/edx/github.in b/requirements/edx/github.in index 6b2aefd8e2..fa53be8091 100644 --- a/requirements/edx/github.in +++ b/requirements/edx/github.in @@ -87,7 +87,7 @@ git+https://gitlab.com/Ayub-khan/django-method-override.git@5270af321be2e576d8e8 # Our libraries: -e git+https://github.com/edx/codejail.git@4127fc4bd5775cc72aee8d7f0a70e31405e22439#egg=codejail -e git+https://github.com/edx/acid-block.git@98aecba94ecbfa934e2d00262741c0ea9f557fc9#egg=acid-xblock -git+https://github.com/edx/edx-ora2.git@2.6.23#egg=ora2==2.6.23 +git+https://github.com/edx/edx-ora2.git@2.6.25#egg=ora2==2.6.25 git+https://github.com/edx/crowdsourcehinter.git@a7ffc85b134b7d8909bf1fefd23dbdb8eb28e467#egg=crowdsourcehinter-xblock==0.2 -e git+https://github.com/edx/RateXBlock.git@2.0#egg=rate-xblock -e git+https://github.com/edx/DoneXBlock.git@2.0.1#egg=done-xblock diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index c270d340b1..3490578385 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -104,7 +104,7 @@ edx-analytics-data-api-client==0.15.5 # via -r requirements/edx/base.txt edx-api-doc-tools==1.1.0 # via -r requirements/edx/base.txt edx-bulk-grades==0.6.8 # via -r requirements/edx/base.txt, staff-graded-xblock edx-ccx-keys==1.0.1 # via -r requirements/edx/base.txt -edx-celeryutils==0.4.0 # via -r requirements/edx/base.txt, super-csv +edx-celeryutils==0.5.0 # via -r requirements/edx/base.txt, super-csv edx-completion==3.1.1 # via -r requirements/edx/base.txt edx-django-release-util==0.4.2 # via -r requirements/edx/base.txt edx-django-sites-extensions==2.4.3 # via -r requirements/edx/base.txt @@ -193,7 +193,7 @@ numpy==1.18.2 # via -r requirements/edx/base.txt, -r requirements/ed git+https://github.com/joestump/python-oauth2.git@b94f69b1ad195513547924e380d9265133e995fa#egg=oauth2 # via -r requirements/edx/base.txt oauthlib==3.0.1 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.txt, django-oauth-toolkit, lti-consumer-xblock, requests-oauthlib, social-auth-core openedx-calc==1.0.7 # via -r requirements/edx/base.txt -git+https://github.com/edx/edx-ora2.git@2.6.23#egg=ora2==2.6.23 # via -r requirements/edx/base.txt +git+https://github.com/edx/edx-ora2.git@2.6.25#egg=ora2==2.6.25 # via -r requirements/edx/base.txt packaging==20.3 # via -r requirements/edx/base.txt, drf-yasg, pytest, tox pandas==0.22.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/coverage.txt path.py==12.4.0 # via -r requirements/edx/base.txt, edx-enterprise, edx-i18n-tools, ora2, xmodule