Merge pull request #35166 from openedx/feanil/backport_django_social_…

…auth Feanil/backport django social auth
openedx · Jul 23, 2024 · b4a1e01 · b4a1e01
2 parents 932e504 + 2165da0
commit b4a1e01
Show file tree

Hide file tree

Showing 7 changed files with 47 additions and 24 deletions.
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
@@ -0,0 +1,23 @@
+# 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
@@ -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
@@ -62,14 +62,6 @@ 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
@@ -246,6 +246,7 @@ django==4.2.14
     #   openedx-filters
     #   openedx-learning
     #   ora2
+    #   social-auth-app-django
     #   super-csv
     #   xblock-google-drive
     #   xss-utils
@@ -566,6 +567,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
@@ -1097,14 +1099,12 @@ slumber==0.7.1
     #   edx-rest-api-client
 snowflake-connector-python==3.10.0
     # via edx-enterprise
-social-auth-app-django==5.0.0
+social-auth-app-django==5.4.1
     # via
-    #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/kernel.in
     #   edx-auth-backends
-social-auth-core==4.3.0
+social-auth-core==4.5.4
     # 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
@@ -420,6 +420,7 @@ django==4.2.14
     #   openedx-filters
     #   openedx-learning
     #   ora2
+    #   social-auth-app-django
     #   super-csv
     #   xblock-google-drive
     #   xss-utils
@@ -894,6 +895,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
@@ -1945,15 +1947,13 @@ snowflake-connector-python==3.10.0
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   edx-enterprise
-social-auth-app-django==5.0.0
+social-auth-app-django==5.4.1
     # via
-    #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   edx-auth-backends
-social-auth-core==4.3.0
+social-auth-core==4.5.4
     # 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
@@ -296,6 +296,7 @@ django==4.2.14
     #   openedx-filters
     #   openedx-learning
     #   ora2
+    #   social-auth-app-django
     #   super-csv
     #   xblock-google-drive
     #   xss-utils
@@ -650,6 +651,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
@@ -1300,14 +1302,12 @@ snowflake-connector-python==3.10.0
     # via
     #   -r requirements/edx/base.txt
     #   edx-enterprise
-social-auth-app-django==5.0.0
+social-auth-app-django==5.4.1
     # via
-    #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/base.txt
     #   edx-auth-backends
-social-auth-core==4.3.0
+social-auth-core==4.5.4
     # 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
@@ -332,6 +332,7 @@ django==4.2.14
     #   openedx-filters
     #   openedx-learning
     #   ora2
+    #   social-auth-app-django
     #   super-csv
     #   xblock-google-drive
     #   xss-utils
@@ -687,6 +688,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
@@ -1466,14 +1468,12 @@ snowflake-connector-python==3.10.0
     # via
     #   -r requirements/edx/base.txt
     #   edx-enterprise
-social-auth-app-django==5.0.0
+social-auth-app-django==5.4.1
     # via
-    #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/base.txt
     #   edx-auth-backends
-social-auth-core==4.3.0
+social-auth-core==4.5.4
     # via
-    #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/base.txt
     #   edx-auth-backends
     #   social-auth-app-django