Skip to content

Commit

Permalink
feat: unpin social auth django (#2382)
Browse files Browse the repository at this point in the history
* now that we've truncated the old entries in usersocialauth, unpinning this dependency.
* Includes some requirements updates from `make upgrade`

If maintainers have migration failures on this upgrade, they should run `truncate_social_auth`:

https://github.com/openedx/credentials/blob/master/credentials/apps/core/management/commands/truncate_social_auth.py

This will remove all entries from the `usersocialauth` table that haven't been updated in 90 days, which makes the size of the table tractable for the dependency's migration.

FIXES: APER-3161
  • Loading branch information
deborahgu authored Feb 7, 2024
1 parent 92b48c6 commit 1cd7c25
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 22 deletions.
8 changes: 4 additions & 4 deletions requirements/all.txt
Original file line number Diff line number Diff line change
Expand Up @@ -294,6 +294,7 @@ edx-django-utils==5.10.1
# edx-event-bus-kafka
# edx-rest-api-client
# edx-toggles
# openedx-events
edx-drf-extensions==10.2.0
# via
# -r requirements/dev.txt
Expand Down Expand Up @@ -331,7 +332,7 @@ exceptiongroup==1.2.0
# pytest
factory-boy==3.3.0
# via -r requirements/dev.txt
faker==22.7.0
faker==23.1.0
# via
# -r requirements/dev.txt
# factory-boy
Expand Down Expand Up @@ -446,7 +447,7 @@ openedx-atlas==0.6.0
# via
# -r requirements/dev.txt
# -r requirements/production.txt
openedx-events==9.4.0
openedx-events==9.5.0
# via
# -r requirements/dev.txt
# -r requirements/production.txt
Expand Down Expand Up @@ -693,9 +694,8 @@ slumber==0.7.1
# -r requirements/dev.txt
# -r requirements/production.txt
# edx-rest-api-client
social-auth-app-django==5.2.0
social-auth-app-django==5.4.0
# via
# -c requirements/constraints.txt
# -r requirements/dev.txt
# -r requirements/production.txt
# edx-auth-backends
Expand Down
6 changes: 3 additions & 3 deletions requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,7 @@ edx-django-utils==5.10.1
# edx-event-bus-kafka
# edx-rest-api-client
# edx-toggles
# openedx-events
edx-drf-extensions==10.2.0
# via -r requirements/base.in
edx-event-bus-kafka==5.6.0
Expand Down Expand Up @@ -187,7 +188,7 @@ openapi-codec==1.3.2
# via django-rest-swagger
openedx-atlas==0.6.0
# via -r requirements/base.in
openedx-events==9.4.0
openedx-events==9.5.0
# via edx-event-bus-kafka
packaging==23.2
# via drf-yasg
Expand Down Expand Up @@ -277,9 +278,8 @@ six==1.16.0
# python-dateutil
slumber==0.7.1
# via edx-rest-api-client
social-auth-app-django==5.2.0
social-auth-app-django==5.4.0
# via
# -c requirements/constraints.txt
# -r requirements/base.in
# edx-auth-backends
social-auth-core==4.5.2
Expand Down
4 changes: 0 additions & 4 deletions requirements/constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,3 @@ pyyaml<6.0
# Pinning urllib3 to versions < 2.x as this conflicts with boto. This constraint will be re-evaluated as part of
# APER-2422
urllib3<2

# social-auth-app-django versions after 5.2.0 has a problematic migration that will cause issues deployments with large
# `social_auth_usersocialauth` tables
social-auth-app-django<5.3
8 changes: 4 additions & 4 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,7 @@ edx-django-utils==5.10.1
# edx-event-bus-kafka
# edx-rest-api-client
# edx-toggles
# openedx-events
edx-drf-extensions==10.2.0
# via -r requirements/test.txt
edx-event-bus-kafka==5.6.0
Expand Down Expand Up @@ -246,7 +247,7 @@ exceptiongroup==1.2.0
# pytest
factory-boy==3.3.0
# via -r requirements/test.txt
faker==22.7.0
faker==23.1.0
# via
# -r requirements/test.txt
# factory-boy
Expand Down Expand Up @@ -327,7 +328,7 @@ openapi-codec==1.3.2
# django-rest-swagger
openedx-atlas==0.6.0
# via -r requirements/test.txt
openedx-events==9.4.0
openedx-events==9.5.0
# via
# -r requirements/test.txt
# edx-event-bus-kafka
Expand Down Expand Up @@ -526,9 +527,8 @@ slumber==0.7.1
# via
# -r requirements/test.txt
# edx-rest-api-client
social-auth-app-django==5.2.0
social-auth-app-django==5.4.0
# via
# -c requirements/constraints.txt
# -r requirements/test.txt
# edx-auth-backends
social-auth-core==4.5.2
Expand Down
6 changes: 3 additions & 3 deletions requirements/production.txt
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,7 @@ edx-django-utils==5.10.1
# edx-event-bus-kafka
# edx-rest-api-client
# edx-toggles
# openedx-events
edx-drf-extensions==10.2.0
# via -r requirements/base.txt
edx-event-bus-kafka==5.6.0
Expand Down Expand Up @@ -253,7 +254,7 @@ openapi-codec==1.3.2
# django-rest-swagger
openedx-atlas==0.6.0
# via -r requirements/base.txt
openedx-events==9.4.0
openedx-events==9.5.0
# via
# -r requirements/base.txt
# edx-event-bus-kafka
Expand Down Expand Up @@ -386,9 +387,8 @@ slumber==0.7.1
# via
# -r requirements/base.txt
# edx-rest-api-client
social-auth-app-django==5.2.0
social-auth-app-django==5.4.0
# via
# -c requirements/constraints.txt
# -r requirements/base.txt
# edx-auth-backends
social-auth-core==4.5.2
Expand Down
8 changes: 4 additions & 4 deletions requirements/test.txt
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,7 @@ edx-django-utils==5.10.1
# edx-event-bus-kafka
# edx-rest-api-client
# edx-toggles
# openedx-events
edx-drf-extensions==10.2.0
# via -r requirements/base.txt
edx-event-bus-kafka==5.6.0
Expand All @@ -211,7 +212,7 @@ exceptiongroup==1.2.0
# via pytest
factory-boy==3.3.0
# via -r requirements/test.in
faker==22.7.0
faker==23.1.0
# via factory-boy
fastavro==1.9.3
# via
Expand Down Expand Up @@ -281,7 +282,7 @@ openapi-codec==1.3.2
# django-rest-swagger
openedx-atlas==0.6.0
# via -r requirements/base.txt
openedx-events==9.4.0
openedx-events==9.5.0
# via
# -r requirements/base.txt
# edx-event-bus-kafka
Expand Down Expand Up @@ -452,9 +453,8 @@ slumber==0.7.1
# via
# -r requirements/base.txt
# edx-rest-api-client
social-auth-app-django==5.2.0
social-auth-app-django==5.4.0
# via
# -c requirements/constraints.txt
# -r requirements/base.txt
# edx-auth-backends
social-auth-core==4.5.2
Expand Down

0 comments on commit 1cd7c25

Please sign in to comment.