Skip to content

Teak 2 update #309

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.

Sign up for GitHub

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

Merged
DeimerM merged 3 commits into from
Sep 16, 2025
Merged

Teak 2 update #309

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eed5821
chore: update openedx-forum to fix issues
farhaanbukhsh Aug 21, 2025
ac8458e
chore: change release line from 'master' to 'teak' (#37312)
felipemontoya Sep 3, 2025
69ea898
fix: running make compile_requirements to fix conflicts
DeimerM Sep 16, 2025
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
2 changes: 1 addition & 1 deletion openedx/core/release.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
# The release line: an Open edX release name ("ficus"), or "master".
# This should always be "master" on the master branch, and will be changed
# manually when we start release-line branches, like open-release/ficus.master.
RELEASE_LINE = "master"
RELEASE_LINE = "teak"


def doc_version():
Expand Down
6 changes: 0 additions & 6 deletions requirements/common_constraints.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,6 @@ Django<5.0
# 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

# Cause: https://github.com/openedx/edx-lint/issues/458
# This can be unpinned once https://github.com/openedx/edx-lint/issues/459 has been resolved.
pip<24.3

# Cause: https://github.com/openedx/edx-lint/issues/475
# This can be unpinned once https://github.com/openedx/edx-lint/issues/476 has been resolved.
urllib3<2.3.0
3 changes: 1 addition & 2 deletions requirements/edx/base.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -815,7 +815,7 @@ openedx-filters==2.0.1
# -r requirements/edx/kernel.in
# lti-consumer-xblock
# ora2
openedx-forum==0.2.0
openedx-forum==0.3.4
# via -r requirements/edx/kernel.in
openedx-learning==0.26.0
# via
Expand Down Expand Up @@ -1187,7 +1187,6 @@ uritemplate==4.1.1
# google-api-python-client
urllib3==2.2.3
# via
# -c requirements/edx/../common_constraints.txt
# botocore
# elasticsearch
# requests
Expand Down
3 changes: 1 addition & 2 deletions requirements/edx/development.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1374,7 +1374,7 @@ openedx-filters==2.0.1
# -r requirements/edx/testing.txt
# lti-consumer-xblock
# ora2
openedx-forum==0.2.0
openedx-forum==0.3.4
# via
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
Expand Down Expand Up @@ -2155,7 +2155,6 @@ uritemplate==4.1.1
# google-api-python-client
urllib3==2.2.3
# via
# -c requirements/edx/../common_constraints.txt
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
# botocore
Expand Down
3 changes: 1 addition & 2 deletions requirements/edx/doc.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -986,7 +986,7 @@ openedx-filters==2.0.1
# -r requirements/edx/base.txt
# lti-consumer-xblock
# ora2
openedx-forum==0.2.0
openedx-forum==0.3.4
# via -r requirements/edx/base.txt
openedx-learning==0.26.0
# via
Expand Down Expand Up @@ -1500,7 +1500,6 @@ uritemplate==4.1.1
# google-api-python-client
urllib3==2.2.3
# via
# -c requirements/edx/../common_constraints.txt
# -r requirements/edx/base.txt
# botocore
# elasticsearch
Expand Down
1 change: 0 additions & 1 deletion requirements/edx/semgrep.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,6 @@ typing-extensions==4.13.2
# semgrep
urllib3==2.2.3
# via
# -c requirements/edx/../common_constraints.txt
# requests
# semgrep
wcmatch==8.5.2
Expand Down
3 changes: 1 addition & 2 deletions requirements/edx/testing.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1044,7 +1044,7 @@ openedx-filters==2.0.1
# -r requirements/edx/base.txt
# lti-consumer-xblock
# ora2
openedx-forum==0.2.0
openedx-forum==0.3.4
# via -r requirements/edx/base.txt
openedx-learning==0.26.0
# via
Expand Down Expand Up @@ -1597,7 +1597,6 @@ uritemplate==4.1.1
# google-api-python-client
urllib3==2.2.3
# via
# -c requirements/edx/../common_constraints.txt
# -r requirements/edx/base.txt
# botocore
# elasticsearch
Expand Down
1 change: 0 additions & 1 deletion scripts/user_retirement/requirements/base.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,6 @@ uritemplate==4.1.1
# via google-api-python-client
urllib3==1.26.20
# via
# -c scripts/user_retirement/requirements/../../../requirements/common_constraints.txt
# -r scripts/user_retirement/requirements/base.in
# botocore
# requests
Expand Down
4 changes: 1 addition & 3 deletions scripts/xblock/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,4 @@ idna==3.10
requests==2.32.3
# via -r scripts/xblock/requirements.in
urllib3==2.2.3
# via
# -c scripts/xblock/../../requirements/common_constraints.txt
# requests
# via requests
Loading