From eed5821cd764904617dbcecb4c75338e1ca7967c Mon Sep 17 00:00:00 2001 From: Farhaan Bukhsh Date: Thu, 21 Aug 2025 18:42:56 +0530 Subject: [PATCH 1/3] chore: update openedx-forum to fix issues Signed-off-by: Farhaan Bukhsh --- requirements/edx/base.txt | 2 +- requirements/edx/development.txt | 2 +- requirements/edx/doc.txt | 2 +- requirements/edx/testing.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 470ed2ce8c73..0794b93c1ca0 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -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 diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index 283886b777e7..5d9f300bc9e3 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -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 diff --git a/requirements/edx/doc.txt b/requirements/edx/doc.txt index 3578bf31bb40..3fc918fc0897 100644 --- a/requirements/edx/doc.txt +++ b/requirements/edx/doc.txt @@ -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 diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index 5e6f12192b8d..01744ea3880a 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -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 From ac8458eae738fc18d9792dc60b7175c89ed5781e Mon Sep 17 00:00:00 2001 From: Felipe Montoya Date: Wed, 3 Sep 2025 06:46:51 -0500 Subject: [PATCH 2/3] chore: change release line from 'master' to 'teak' (#37312) --- openedx/core/release.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openedx/core/release.py b/openedx/core/release.py index ce30df8cc543..9df0e2f15c5a 100644 --- a/openedx/core/release.py +++ b/openedx/core/release.py @@ -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(): From 69ea898cd1c4a93adbff1391ecf7c5650a63d406 Mon Sep 17 00:00:00 2001 From: Deimer M Date: Tue, 16 Sep 2025 13:25:12 -0500 Subject: [PATCH 3/3] fix: running make compile_requirements to fix conflicts --- requirements/common_constraints.txt | 6 ------ requirements/edx/base.txt | 1 - requirements/edx/development.txt | 1 - requirements/edx/doc.txt | 1 - requirements/edx/semgrep.txt | 1 - requirements/edx/testing.txt | 1 - scripts/user_retirement/requirements/base.txt | 1 - scripts/xblock/requirements.txt | 4 +--- 8 files changed, 1 insertion(+), 15 deletions(-) diff --git a/requirements/common_constraints.txt b/requirements/common_constraints.txt index f3cc8fc9c9e8..fc92ee019407 100644 --- a/requirements/common_constraints.txt +++ b/requirements/common_constraints.txt @@ -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 diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 0794b93c1ca0..3a9391489f5b 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -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 diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index 5d9f300bc9e3..4cb35eda8c26 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -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 diff --git a/requirements/edx/doc.txt b/requirements/edx/doc.txt index 3fc918fc0897..76195ab08d48 100644 --- a/requirements/edx/doc.txt +++ b/requirements/edx/doc.txt @@ -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 diff --git a/requirements/edx/semgrep.txt b/requirements/edx/semgrep.txt index 6054225b3507..64b91ea96d91 100644 --- a/requirements/edx/semgrep.txt +++ b/requirements/edx/semgrep.txt @@ -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 diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index 01744ea3880a..7fe3dab49560 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -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 diff --git a/scripts/user_retirement/requirements/base.txt b/scripts/user_retirement/requirements/base.txt index 46e94999631f..e4fb71e54dc5 100644 --- a/scripts/user_retirement/requirements/base.txt +++ b/scripts/user_retirement/requirements/base.txt @@ -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 diff --git a/scripts/xblock/requirements.txt b/scripts/xblock/requirements.txt index d015b6c1bd6f..631204c34cf5 100644 --- a/scripts/xblock/requirements.txt +++ b/scripts/xblock/requirements.txt @@ -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