Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sync opencraft-release/redwood.1 with Upstream 20241104-1730679679 #707

Open
wants to merge 23 commits into
base: opencraft-release/redwood.1
Choose a base branch
from
Open
Changes from 4 commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
aa70fea
feat: hide the survey report banner for a month after clicking the di…
Asespinel Jun 19, 2024
e5f074b
chore: upgrade Django to 4.2.14
magajh Jul 15, 2024
932e504
Merge pull request #35120 from magajh/open-release/redwood.master
Jul 15, 2024
4744ea1
chore!: uprgade social-auth-app-django to version 5.4.1
iamsobanjaved Jun 10, 2024
670772b
chore: add migration from social_django
iamsobanjaved Jun 27, 2024
2165da0
chore: Re-compile requirements.
feanil Jul 23, 2024
b4a1e01
Merge pull request #35166 from openedx/feanil/backport_django_social_…
Jul 23, 2024
ed72248
fix: libraries across orgs
connorhaugh Feb 15, 2024
d23b41e
docs: imporved comment
connorhaugh Feb 15, 2024
d757cfa
fix: cohorts data can be private
connorhaugh Oct 4, 2023
62269f8
fix: Remove errant pluses from a bad merge.
feanil Jul 25, 2024
8813e8b
style: Fix a pylint and style violations.
feanil Jul 25, 2024
3160ff6
Merge pull request #35180 from openedx/feanil/backporting
Jul 25, 2024
1e0d575
fix: course progress url returned based on course_home_mfe_progress_t…
FatemeKhodayari Jul 30, 2024
c5d7507
chore: upgrade Django to 4.2.15 (#35240)
magajh Aug 6, 2024
d5c84e9
backport fix: disable submit button for archived courses (#34920) to …
Anas12091101 Aug 8, 2024
fa97f13
fix: Prevent error page recursion (#35209)
timmc-edx Jul 31, 2024
3d50dd8
Merge pull request #35259 from raccoongang/max/backport-error-page-re…
cmltaWt0 Aug 8, 2024
5ea3b98
feat: course about page markup and styles improvements (#34892)
ihor-romaniuk Sep 9, 2024
9c8059b
fix: backport: hide new library button for ineligible users in split …
kaustavb12 Sep 19, 2024
9ef785a
chore: upgrade Django to 4.2.16
magajh Sep 10, 2024
daf696a
chore: compile requirements
magajh Oct 9, 2024
5071f28
Merge pull request #35458 from magajh/magajh/patch-django-redwood-4.2.16
cmltaWt0 Oct 17, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -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'),
),
]
8 changes: 8 additions & 0 deletions requirements/common_constraints.txt
Original file line number Diff line number Diff line change
@@ -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
8 changes: 0 additions & 8 deletions requirements/constraints.txt
Original file line number Diff line number Diff line change
@@ -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
8 changes: 4 additions & 4 deletions requirements/edx/base.txt
Original file line number Diff line number Diff line change
@@ -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
8 changes: 4 additions & 4 deletions requirements/edx/development.txt
Original file line number Diff line number Diff line change
@@ -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
8 changes: 4 additions & 4 deletions requirements/edx/doc.txt
Original file line number Diff line number Diff line change
@@ -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
8 changes: 4 additions & 4 deletions requirements/edx/testing.txt
Original file line number Diff line number Diff line change
@@ -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