Teak 2 update (#309)

* chore: update openedx-forum to fix issues

Signed-off-by: Farhaan Bukhsh <[email protected]>

* chore: change release line from 'master' to 'teak' (openedx#37312)

* fix: running make compile_requirements to fix conflicts

---------

Signed-off-by: Farhaan Bukhsh <[email protected]>
Co-authored-by: Farhaan Bukhsh <[email protected]>
Co-authored-by: Felipe Montoya <[email protected]>

Author: 3 people

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():

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

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
@@ -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

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
@@ -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

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
@@ -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

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

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
@@ -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

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

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