Merge branch 'master' into BOMS-200-handle-features-setting-dict-depr

Akanshu-2u · web-flow · commit c69ec943e73e · 2025-11-05T15:51:33.000+05:30
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -1,4 +1,7 @@
 {
+    "hostRequirements": {
+        "cpus": 8
+    },
     "customizations": {
         "vscode": {
             "settings": {
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -6,4 +6,4 @@ updates:
     schedule:
         interval: "weekly"
     reviewers:
-      - "openedx/arbi-bom"
+      - "openedx/orbi-bom"
diff --git a/.github/workflows/cli-tests.yml b/.github/workflows/cli-tests.yml
@@ -70,3 +70,6 @@ jobs:
 
       - name: CLI tests
         run: pytest -s ./tests/*.py
+
+      - name: Repo setup-remotes tests
+        run: ./tests/test_repo.sh
diff --git a/.github/workflows/upgrade-python-requirements.yml b/.github/workflows/upgrade-python-requirements.yml
@@ -13,9 +13,9 @@ jobs:
    call-upgrade-python-requirements-workflow:
     with:
        branch: ${{ github.event.inputs.branch }}
-       team_reviewers: "arbi-bom"
-       email_address: arbi-bom@edx.org 
-       send_success_notification: false
+       team_reviewers: "orbi-bom"
+       email_address: orbi-bom-upgrade-prs@2u-internal.jsmalerts.atlassian.net
+       send_success_notification: true
     secrets:
        requirements_bot_github_token: ${{ secrets.REQUIREMENTS_BOT_GITHUB_TOKEN }}
        requirements_bot_github_email: ${{ secrets.REQUIREMENTS_BOT_GITHUB_EMAIL }}
diff --git a/.readthedocs.yaml b/.readthedocs.yaml
@@ -6,7 +6,7 @@
 version: 2
 
 build:
-  os: "ubuntu-22.04"
+  os: "ubuntu-lts-latest"
   tools:
     python: "3.8"
 
diff --git a/Makefile b/Makefile
@@ -143,13 +143,18 @@ dev.status: ## Prints the status of all git repositories.
 dev.checkout: ## Check out "openedx-release/$OPENEDX_RELEASE" in each repo if set, use default branch otherwise.
 	./repo.sh checkout
 
+dev.setup-remotes: ## Set up edx and openedx remotes for all forked repositories.
+	./repo.sh setup-remotes
+
 dev.clone: dev.clone.ssh ## Clone service repos to the parent directory.
 
 dev.clone.https: ## Clone service repos using HTTPS method to the parent directory.
 	./repo.sh clone
+	make dev.setup-remotes
 
 dev.clone.ssh: ## Clone service repos using SSH method to the parent directory.
 	./repo.sh clone_ssh
+	make dev.setup-remotes
 
 ########################################################################################
 # Developer interface: Docker image management.
diff --git a/configuration_files/cms.yml b/configuration_files/cms.yml
@@ -244,7 +244,6 @@ DATABASES:
 DATA_DIR: /edx/var/edxapp
 DEFAULT_COURSE_VISIBILITY_IN_CATALOG: both
 DEFAULT_FEEDBACK_EMAIL: feedback@example.com
-DEFAULT_FILE_STORAGE: django.core.files.storage.FileSystemStorage
 DEFAULT_FROM_EMAIL: registration@example.com
 DEFAULT_JWT_ISSUER:
     AUDIENCE: lms-key
@@ -280,6 +279,7 @@ ELASTIC_SEARCH_CONFIG:
 -   host: edx.devstack.elasticsearch
     port: 9200
     use_ssl: false
+ENABLE_MKTG_SITE: true    
 EMAIL_BACKEND: django.core.mail.backends.smtp.EmailBackend
 EMAIL_HOST: localhost
 EMAIL_HOST_PASSWORD: ''
@@ -314,7 +314,6 @@ ENABLE_ENROLLMENT_RESET: false
 ENABLE_EXPORT_GIT: false
 ENABLE_GRADE_DOWNLOADS: true
 ENABLE_LTI_PROVIDER: false
-ENABLE_MKTG_SITE: false
 ENABLE_MOBILE_REST_API: false
 ENABLE_OAUTH2_PROVIDER: false
 ENABLE_PUBLISHER: false
@@ -381,8 +380,16 @@ LOG_DIR: /edx/var/log/edx
 MAINTENANCE_BANNER_TEXT: Sample banner message
 MEDIA_ROOT: /edx/var/edxapp/media/
 MEDIA_URL: /media/
-MKTG_URLS: {}
-MKTG_URL_LINK_MAP: {}
+MKTG_URLS:
+  ROOT: http://localhost:18010
+  ABOUT: /about
+  CONTACT: /contact
+  FAQ: /help
+  COURSES: /course
+  TOS: /edx-terms-service
+  HONOR: /honor
+  PRIVACY: /privacy
+  WHAT_IS_VERIFIED_CERT: /verified-certificate
 MOBILE_STORE_ACE_URLS: {}
 MODULESTORE:
     default:
@@ -493,6 +500,11 @@ SOCIAL_SHARING_SETTINGS:
     DASHBOARD_TWITTER: false
 STATIC_ROOT_BASE: /edx/var/edxapp/staticfiles
 STATIC_URL_BASE: /static/
+STORAGES:
+    default:
+        BACKEND: django.core.files.storage.FileSystemStorage
+    staticfiles:
+        BACKEND: django.contrib.staticfiles.storage.StaticFilesStorage
 STUDIO_NAME: Studio
 STUDIO_SHORT_NAME: Studio
 SUPPORT_SITE_LINK: ''
diff --git a/configuration_files/discovery.yml b/configuration_files/discovery.yml
@@ -69,7 +69,11 @@ JWT_AUTH:
     JWT_PUBLIC_SIGNING_JWK_SET: ''
 LANGUAGE_CODE: en
 MEDIA_STORAGE_BACKEND:
-    DEFAULT_FILE_STORAGE: django.core.files.storage.FileSystemStorage
+    STORAGES:
+        default:
+            BACKEND: django.core.files.storage.FileSystemStorage
+        staticfiles:
+            BACKEND: django.contrib.staticfiles.storage.StaticFilesStorage
     MEDIA_ROOT: /edx/var/discovery/media
     MEDIA_URL: /media/
 OPENEXCHANGERATES_API_KEY: ''
@@ -91,7 +95,11 @@ SOCIAL_AUTH_EDX_OAUTH2_LOGOUT_URL: http://localhost:18000/logout
 SOCIAL_AUTH_EDX_OAUTH2_SECRET: discovery-sso-secret
 SOCIAL_AUTH_EDX_OAUTH2_URL_ROOT: http://127.0.0.1:8000
 SOCIAL_AUTH_REDIRECT_IS_HTTPS: false
-STATICFILES_STORAGE: django.contrib.staticfiles.storage.StaticFilesStorage
 STATIC_ROOT: /edx/var/discovery/staticfiles
+STORAGES:
+    default:
+        BACKEND: django.core.files.storage.FileSystemStorage
+    staticfiles:
+        BACKEND: django.contrib.staticfiles.storage.StaticFilesStorage
 TIME_ZONE: UTC
 USERNAME_REPLACEMENT_WORKER: OVERRIDE THIS WITH A VALID USERNAME
diff --git a/configuration_files/lms.yml b/configuration_files/lms.yml
@@ -265,7 +265,6 @@ DCS_SESSION_COOKIE_SAMESITE: Lax
 DCS_SESSION_COOKIE_SAMESITE_FORCE_ALL: true
 DEFAULT_COURSE_VISIBILITY_IN_CATALOG: both
 DEFAULT_FEEDBACK_EMAIL: feedback@example.com
-DEFAULT_FILE_STORAGE: django.core.files.storage.FileSystemStorage
 DEFAULT_FROM_EMAIL: registration@example.com
 DEFAULT_JWT_ISSUER:
     AUDIENCE: lms-key
@@ -304,6 +303,7 @@ ELASTIC_SEARCH_CONFIG:
 -   host: edx.devstack.elasticsearch
     port: 9200
     use_ssl: false
+ENABLE_MKTG_SITE: true    
 EMAIL_BACKEND: django.core.mail.backends.smtp.EmailBackend
 EMAIL_HOST: localhost
 EMAIL_HOST_PASSWORD: ''
@@ -345,7 +345,6 @@ ENABLE_ENROLLMENT_RESET: false
 ENABLE_EXPORT_GIT: false
 ENABLE_GRADE_DOWNLOADS: true
 ENABLE_LTI_PROVIDER: false
-ENABLE_MKTG_SITE: false
 ENABLE_MOBILE_REST_API: false
 ENABLE_OAUTH2_PROVIDER: false
 ENABLE_PUBLISHER: false
@@ -421,8 +420,16 @@ MAILCHIMP_NEW_USER_LIST_ID: null
 MAINTENANCE_BANNER_TEXT: Sample banner message
 MEDIA_ROOT: /edx/var/edxapp/media/
 MEDIA_URL: /media/
-MKTG_URLS: {}
-MKTG_URL_LINK_MAP: {}
+MKTG_URLS:
+  ROOT: http://localhost:18000
+  ABOUT: /about
+  CONTACT: /contact
+  FAQ: /help
+  COURSES: /course
+  TOS: /edx-terms-service
+  HONOR: /honor
+  PRIVACY: /privacy
+  WHAT_IS_VERIFIED_CERT: /verified-certificate
 MOBILE_STORE_URLS: {}
 MODULESTORE:
     default:
@@ -579,6 +586,11 @@ SOCIAL_SHARING_SETTINGS:
     DASHBOARD_TWITTER: false
 STATIC_ROOT_BASE: /edx/var/edxapp/staticfiles
 STATIC_URL_BASE: /static/
+STORAGES:
+    default:
+        BACKEND: django.core.files.storage.FileSystemStorage
+    staticfiles:
+        BACKEND: django.contrib.staticfiles.storage.StaticFilesStorage
 STUDIO_NAME: Studio
 STUDIO_SHORT_NAME: Studio
 SUPPORT_SITE_LINK: ''
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -742,8 +742,8 @@ services:
 
   enterprise-catalog:
     image: edxops/enterprise-catalog-dev
-    container_name: edx.devstack.enterprise-catalog
-    hostname: enterprise-catalog.devstack.edx
+    container_name: enterprise.catalog.app
+    hostname: enterprise.catalog.app 
     command: bash -c 'while true; do python /edx/app/enterprise-catalog/manage.py runserver 0.0.0.0:18160; sleep 2; done'
     ports:
       - "18160:18160"
diff --git a/docs/devstack_faq.rst b/docs/devstack_faq.rst
@@ -115,19 +115,19 @@ Make sure that you enable the following code in ./edx-platform/lms/envs/devstack
    # theme directories to COMPREHENSIVE_THEME_DIRS
 
    # We have to import the private method here because production.py calls
-   # derive_settings('lms.envs.production') which runs _make_mako_template_dirs with
+   # derive_settings('lms.envs.production') which runs make_mako_template_dirs with
    # the settings from production, which doesn't include these theming settings. Thus,
    # the templating engine is unable to find the themed templates because they don't exist
    # in it's path. Re-calling derive_settings doesn't work because the settings was already
    # changed from a function to a list, and it can't be derived again.
 
-   from .common import _make_mako_template_dirs
+   from .common import make_mako_template_dirs
    ENABLE_COMPREHENSIVE_THEMING = True
    COMPREHENSIVE_THEME_DIRS = [
        "/edx/app/edxapp/edx-platform/themes/",
        "/edx/app/edx-themes/edx-platform/",
    ]
-   TEMPLATES[1]["DIRS"] = Derived(_make_mako_template_dirs)
+   TEMPLATES[1]["DIRS"] = Derived(make_mako_template_dirs)
    derive_settings(__name__)
 
 Enabling a theme
diff --git a/provision-set-edx-theme.sh b/provision-set-edx-theme.sh
@@ -21,15 +21,15 @@ fi
 popd
 
 # Uncomment relevant lines in the devstack.py file
-sed -i '' "s|^# from .common import _make_mako_template_dirs|from .common import _make_mako_template_dirs|" "$DEVSTACK_FILE"
+sed -i '' "s|^# from .common import make_mako_template_dirs|from .common import make_mako_template_dirs|" "$DEVSTACK_FILE"
 sed -i '' "s|^# ENABLE_COMPREHENSIVE_THEMING = True|ENABLE_COMPREHENSIVE_THEMING = True|" "$DEVSTACK_FILE"
 sed -i '' "s|^# COMPREHENSIVE_THEME_DIRS = \[|COMPREHENSIVE_THEME_DIRS = \[|" "$DEVSTACK_FILE"
 sed -i '' "s|^#     \"/edx/app/edxapp/edx-platform/themes/\"|    \"/edx/app/edxapp/edx-platform/themes/\",|" "$DEVSTACK_FILE"
 sed -i '' "/COMPREHENSIVE_THEME_DIRS = \[/a\\
 \"$THEME_DIR\",
 " "$DEVSTACK_FILE"
 sed -i '' "s|^# \]|]|" "$DEVSTACK_FILE"
-sed -i '' "s|^# TEMPLATES\[1\]\[\"DIRS\"\] = Derived(_make_mako_template_dirs)|TEMPLATES[1][\"DIRS\"] = Derived(_make_mako_template_dirs)|" "$DEVSTACK_FILE"
+sed -i '' "s|^# TEMPLATES\[1\]\[\"DIRS\"\] = Derived(make_mako_template_dirs)|TEMPLATES[1][\"DIRS\"] = Derived(make_mako_template_dirs)|" "$DEVSTACK_FILE"
 sed -i '' "s|^# derive_settings(__name__)|derive_settings(__name__)|" "$DEVSTACK_FILE"
 
 
diff --git a/py_configuration_files/credentials.py b/py_configuration_files/credentials.py
@@ -42,10 +42,18 @@
 EMAIL_BACKEND = "django.core.mail.backends.filebased.EmailBackend"
 EMAIL_FILE_PATH = "/tmp/credentials-emails"
 
-DEFAULT_FILE_STORAGE = os.environ.get("DEFAULT_FILE_STORAGE", "django.core.files.storage.FileSystemStorage")
+default_file_storage = os.environ.get("DEFAULT_FILE_STORAGE")
+
+if default_file_storage:
+    STORAGES["default"]["BACKEND"] = default_file_storage
+
+staticfiles_storage = os.environ.get("STATICFILES_STORAGE")
+
+if staticfiles_storage:
+    STORAGES["staticfiles"]["BACKEND"] = staticfiles_storage
+
 MEDIA_URL = os.environ.get("MEDIA_URL", "/media/")
 
-STATICFILES_STORAGE = os.environ.get("STATICFILES_STORAGE", "django.contrib.staticfiles.storage.StaticFilesStorage")
 STATIC_URL = os.environ.get("STATIC_URL", "/static/")
 
 # OAuth2 variables specific to social-auth/SSO login use case.
diff --git a/py_configuration_files/enterprise_access.py b/py_configuration_files/enterprise_access.py
@@ -95,7 +95,7 @@
 DISCOVERY_URL = 'http://edx.devstack.discovery:18381'
 ENTERPRISE_LEARNER_PORTAL_URL = 'http://localhost:8734'
 ENTERPRISE_ADMIN_PORTAL_URL = 'http://localhost:1991'
-ENTERPRISE_CATALOG_URL = 'http://edx.devstack.enterprise-catalog:18160'
+ENTERPRISE_CATALOG_URL = 'http://enterprise.catalog.app:18160'
 ENTERPRISE_SUBSIDY_URL = 'http://edx.devstack.enterprise-subsidy:18280'
 ENTERPRISE_ACCESS_URL = 'http://localhost:18270'
 
diff --git a/py_configuration_files/enterprise_subsidy.py b/py_configuration_files/enterprise_subsidy.py
@@ -77,7 +77,7 @@
 })
 
 LMS_URL = 'http://edx.devstack.lms:18000'
-ENTERPRISE_CATALOG_URL = 'http://edx.devstack.enterprise-catalog:18160'
+ENTERPRISE_CATALOG_URL = 'http://enterprise.catalog.app:18160'
 ENTERPRISE_SUBSIDY_URL = 'http://localhost:18280'
 FRONTEND_APP_LEARNING_URL = 'http://localhost:' + LEARNING_MICROFRONTEND_PORT
 
diff --git a/py_configuration_files/license_manager.py b/py_configuration_files/license_manager.py
@@ -74,7 +74,7 @@
 # END CSRF CONFIG
 
 ENTERPRISE_LEARNER_PORTAL_BASE_URL = 'http://localhost:8734'
-ENTERPRISE_CATALOG_URL = 'http://edx.devstack.enterprise-catalog:18160'
+ENTERPRISE_CATALOG_URL = 'http://enterprise.catalog.app:18160'
 LMS_URL = 'http://edx.devstack.lms:18000'
 SUPPORT_SITE_URL = 'https://support.edx.org'
 
diff --git a/py_configuration_files/lms.py b/py_configuration_files/lms.py
@@ -421,7 +421,7 @@ def should_show_debug_toolbar(request):  # lint-amnesty, pylint: disable=missing
 # Toggle this off if you don't want anything to do with enterprise in devstack.
 ENABLE_ENTERPRISE_INTEGRATION = True
 
-ENABLE_MKTG_SITE = os.environ.get('ENABLE_MARKETING_SITE', False)
+ENABLE_MKTG_SITE = os.environ.get('ENABLE_MARKETING_SITE', True)
 MARKETING_SITE_ROOT = os.environ.get('MARKETING_SITE_ROOT', 'http://localhost:8080')
 
 MKTG_URLS = {
@@ -480,19 +480,20 @@ def should_show_debug_toolbar(request):  # lint-amnesty, pylint: disable=missing
 # If you want to enable theming in devstack, uncomment this section and add any relevant
 # theme directories to COMPREHENSIVE_THEME_DIRS
 
-# We have to import the private method here because production.py calls
-# derive_settings('lms.envs.production') which runs _make_mako_template_dirs with
+# We have to import the function here because production.py calls
+# derive_settings('lms.envs.production') which runs make_mako_template_dirs with
 # the settings from production, which doesn't include these theming settings. Thus,
 # the templating engine is unable to find the themed templates because they don't exist
 # in it's path. Re-calling derive_settings doesn't work because the settings was already
 # changed from a function to a list, and it can't be derived again.
 
-# from .common import _make_mako_template_dirs
+# from .common import make_mako_template_dirs
 # ENABLE_COMPREHENSIVE_THEMING = True
 # COMPREHENSIVE_THEME_DIRS = [
+#     "/edx/src/edx-themes/edx-platform",
 #     "/edx/app/edxapp/edx-platform/themes/"
 # ]
-# TEMPLATES[1]["DIRS"] = Derived(_make_mako_template_dirs)
+# TEMPLATES[1]["DIRS"] = Derived(make_mako_template_dirs)
 # derive_settings(__name__)
 
 # Uncomment the lines below if you'd like to see SQL statements in your devstack LMS log.
diff --git a/repo.sh b/repo.sh
diff --git a/requirements/base.txt b/requirements/base.txt
diff --git a/requirements/dev.txt b/requirements/dev.txt
diff --git a/requirements/doc.txt b/requirements/doc.txt
diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt
diff --git a/requirements/pip.txt b/requirements/pip.txt
diff --git a/requirements/test.txt b/requirements/test.txt
diff --git a/tests/test_repo.sh b/tests/test_repo.sh

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,7 @@`
`1`	`1`	`{`
	`2`	`+ "hostRequirements": {`
	`3`	`+ "cpus": 8`
	`4`	`+ },`
`2`	`5`	`"customizations": {`
`3`	`6`	`"vscode": {`
`4`	`7`	`"settings": {`