diff --git a/lms/djangoapps/support/migrations/0006_alter_historicalusersocialauth_extra_data_and_more.py b/lms/djangoapps/support/migrations/0006_alter_historicalusersocialauth_extra_data_and_more.py deleted file mode 100644 index 5f09d0cc493b..000000000000 --- a/lms/djangoapps/support/migrations/0006_alter_historicalusersocialauth_extra_data_and_more.py +++ /dev/null @@ -1,23 +0,0 @@ -# Generated by Django 4.2.13 on 2024-06-27 20:46 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('support', '0005_unique_course_id'), - ] - - operations = [ - migrations.AlterField( - model_name='historicalusersocialauth', - name='extra_data', - field=models.JSONField(default=dict), - ), - migrations.AlterField( - model_name='historicalusersocialauth', - name='id', - field=models.BigIntegerField(auto_created=True, blank=True, db_index=True, verbose_name='ID'), - ), - ] diff --git a/requirements/common_constraints.txt b/requirements/common_constraints.txt index 4abc9ae22cb3..ef8bc86061b7 100644 --- a/requirements/common_constraints.txt +++ b/requirements/common_constraints.txt @@ -21,6 +21,7 @@ Django<5.0 # elasticsearch>=7.14.0 includes breaking changes in it which caused issues in discovery upgrade process. # elastic search changelog: https://www.elastic.co/guide/en/enterprise-search/master/release-notes-7.14.0.html +# See https://github.com/openedx/edx-platform/issues/35126 for more info elasticsearch<7.14.0 # django-simple-history>3.0.0 adds indexing and causes a lot of migrations to be affected @@ -33,3 +34,10 @@ elasticsearch<7.14.0 # So we need to pin it globally, for now. # Ticket for unpinning: https://github.com/openedx/edx-lint/issues/407 importlib-metadata<7 + +# Cause: https://github.com/openedx/event-tracking/pull/290 +# event-tracking 2.4.1 upgrades to pymongo 4.4.0 which is not supported on edx-platform. +# We will pin event-tracking to do not break existing installations +# This can be unpinned once https://github.com/openedx/edx-platform/issues/34586 +# has been resolved and edx-platform is running with pymongo>=4.4.0 +event-tracking<2.4.1 diff --git a/requirements/constraints.txt b/requirements/constraints.txt index cdb306e6a030..b404440e04dd 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -59,6 +59,14 @@ pycodestyle<2.9.0 pylint<2.16.0 # greater version failing quality test. Fix them in seperate ticket. +# adding these constraints to minimize boto3 and botocore changeset +social-auth-core==4.3.0 + +# social-auth-app-django versions after 5.2.0 has a problematic migration that will cause issues deployments with large +# `social_auth_usersocialauth` tables. 5.1.0 has missing migration and 5.2.0 has that problematic migration. +social-auth-app-django==5.0.0 + + # urllib3>=2.0.0 conflicts with elastic search && snowflake-connector-python packages # which require urllib3<2 for now. # Issue for unpinning: https://github.com/openedx/edx-platform/issues/32222 diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 5dd6732caeb0..320f9c7cd8b1 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -227,7 +227,6 @@ django==4.2.14 # openedx-filters # openedx-learning # ora2 - # social-auth-app-django # super-csv # xblock-google-drive # xss-utils @@ -537,6 +536,7 @@ enmerkar-underscore==2.3.0 # via -r requirements/edx/kernel.in event-tracking==2.4.0 # via + # -c requirements/edx/../common_constraints.txt # -r requirements/edx/kernel.in # edx-completion # edx-proctoring @@ -1057,12 +1057,14 @@ slumber==0.7.1 # edx-rest-api-client snowflake-connector-python==3.11.0 # via edx-enterprise -social-auth-app-django==5.4.1 +social-auth-app-django==5.0.0 # via + # -c requirements/edx/../constraints.txt # -r requirements/edx/kernel.in # edx-auth-backends -social-auth-core==4.5.4 +social-auth-core==4.3.0 # via + # -c requirements/edx/../constraints.txt # -r requirements/edx/kernel.in # edx-auth-backends # social-auth-app-django diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index aeda833921bf..432f53f0f44d 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -395,7 +395,6 @@ django==4.2.14 # openedx-filters # openedx-learning # ora2 - # social-auth-app-django # super-csv # xblock-google-drive # xss-utils @@ -854,6 +853,7 @@ enmerkar-underscore==2.3.0 # -r requirements/edx/testing.txt event-tracking==2.4.0 # via + # -c requirements/edx/../common_constraints.txt # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # edx-completion @@ -1878,13 +1878,15 @@ snowflake-connector-python==3.11.0 # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # edx-enterprise -social-auth-app-django==5.4.1 +social-auth-app-django==5.0.0 # via + # -c requirements/edx/../constraints.txt # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # edx-auth-backends -social-auth-core==4.5.4 +social-auth-core==4.3.0 # via + # -c requirements/edx/../constraints.txt # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # edx-auth-backends diff --git a/requirements/edx/doc.txt b/requirements/edx/doc.txt index 05542b5d586e..b3d242ce6eea 100644 --- a/requirements/edx/doc.txt +++ b/requirements/edx/doc.txt @@ -275,7 +275,6 @@ django==4.2.14 # openedx-filters # openedx-learning # ora2 - # social-auth-app-django # super-csv # xblock-google-drive # xss-utils @@ -615,6 +614,7 @@ enmerkar-underscore==2.3.0 # via -r requirements/edx/base.txt event-tracking==2.4.0 # via + # -c requirements/edx/../common_constraints.txt # -r requirements/edx/base.txt # edx-completion # edx-proctoring @@ -1247,12 +1247,14 @@ snowflake-connector-python==3.11.0 # via # -r requirements/edx/base.txt # edx-enterprise -social-auth-app-django==5.4.1 +social-auth-app-django==5.0.0 # via + # -c requirements/edx/../constraints.txt # -r requirements/edx/base.txt # edx-auth-backends -social-auth-core==4.5.4 +social-auth-core==4.3.0 # via + # -c requirements/edx/../constraints.txt # -r requirements/edx/base.txt # edx-auth-backends # social-auth-app-django diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index 8f08a3308a5d..978f9a3b1254 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -310,7 +310,6 @@ django==4.2.14 # openedx-filters # openedx-learning # ora2 - # social-auth-app-django # super-csv # xblock-google-drive # xss-utils @@ -651,6 +650,7 @@ enmerkar-underscore==2.3.0 # via -r requirements/edx/base.txt event-tracking==2.4.0 # via + # -c requirements/edx/../common_constraints.txt # -r requirements/edx/base.txt # edx-completion # edx-proctoring @@ -1409,12 +1409,14 @@ snowflake-connector-python==3.11.0 # via # -r requirements/edx/base.txt # edx-enterprise -social-auth-app-django==5.4.1 +social-auth-app-django==5.0.0 # via + # -c requirements/edx/../constraints.txt # -r requirements/edx/base.txt # edx-auth-backends -social-auth-core==4.5.4 +social-auth-core==4.3.0 # via + # -c requirements/edx/../constraints.txt # -r requirements/edx/base.txt # edx-auth-backends # social-auth-app-django