chore: mark the enabled built-in blocks deprecated (#38174)

Author: farhan

openedx/envs/common.py

@@ -2039,53 +2039,48 @@ def add_optional_apps(optional_apps, installed_apps):
 # Ticket: https://github.com/openedx/edx-platform/issues/35308
 
 # .. toggle_name: USE_EXTRACTED_WORD_CLOUD_BLOCK
-# .. toggle_default: False
+# .. toggle_default: True
 # .. toggle_implementation: DjangoSetting
 # .. toggle_description: Enables the use of the extracted Word Cloud XBlock, which has been shifted to the 'openedx/xblocks-contrib' repo.
 # .. toggle_use_cases: temporary
-# .. toggle_warning: Not production-ready until https://github.com/openedx/edx-platform/issues/34840 is done.
 # .. toggle_creation_date: 2024-11-10
-# .. toggle_target_removal_date: 2025-06-01
+# .. toggle_target_removal_date: 2026-04-10
 USE_EXTRACTED_WORD_CLOUD_BLOCK = True
 
 # .. toggle_name: USE_EXTRACTED_ANNOTATABLE_BLOCK
-# .. toggle_default: False
+# .. toggle_default: True
 # .. toggle_implementation: DjangoSetting
 # .. toggle_description: Enables the use of the extracted annotatable XBlock, which has been shifted to the 'openedx/xblocks-contrib' repo.
 # .. toggle_use_cases: temporary
-# .. toggle_warning: Not production-ready until https://github.com/openedx/edx-platform/issues/34841 is done.
 # .. toggle_creation_date: 2024-11-10
-# .. toggle_target_removal_date: 2025-06-01
+# .. toggle_target_removal_date: 2026-04-10
 USE_EXTRACTED_ANNOTATABLE_BLOCK = True
 
 # .. toggle_name: USE_EXTRACTED_POLL_QUESTION_BLOCK
-# .. toggle_default: False
+# .. toggle_default: True
 # .. toggle_implementation: DjangoSetting
 # .. toggle_description: Enables the use of the extracted poll question XBlock, which has been shifted to the 'openedx/xblocks-contrib' repo.
 # .. toggle_use_cases: temporary
-# .. toggle_warning: Not production-ready until https://github.com/openedx/edx-platform/issues/34839 is done.
 # .. toggle_creation_date: 2024-11-10
-# .. toggle_target_removal_date: 2025-06-01
+# .. toggle_target_removal_date: 2026-04-10
 USE_EXTRACTED_POLL_QUESTION_BLOCK = True
 
 # .. toggle_name: USE_EXTRACTED_LTI_BLOCK
-# .. toggle_default: False
+# .. toggle_default: True
 # .. toggle_implementation: DjangoSetting
 # .. toggle_description: Enables the use of the extracted LTI XBlock, which has been shifted to the 'openedx/xblocks-contrib' repo.
 # .. toggle_use_cases: temporary
-# .. toggle_warning: Not production-ready until relevant subtask https://github.com/openedx/edx-platform/issues/34827 is done.
 # .. toggle_creation_date: 2024-11-10
-# .. toggle_target_removal_date: 2025-06-01
+# .. toggle_target_removal_date: 2026-04-10
 USE_EXTRACTED_LTI_BLOCK = True
 
 # .. toggle_name: USE_EXTRACTED_HTML_BLOCK
-# .. toggle_default: False
+# .. toggle_default: True
 # .. toggle_implementation: DjangoSetting
 # .. toggle_description: Enables the use of the extracted HTML XBlock, which has been shifted to the 'openedx/xblocks-contrib' repo.
 # .. toggle_use_cases: temporary
-# .. toggle_warning: Not production-ready until relevant subtask https://github.com/openedx/edx-platform/issues/34827 is done.
 # .. toggle_creation_date: 2024-11-10
-# .. toggle_target_removal_date: 2025-06-01
+# .. toggle_target_removal_date: 2026-04-10
 USE_EXTRACTED_HTML_BLOCK = True
 
 # .. toggle_name: USE_EXTRACTED_DISCUSSION_BLOCK
@@ -2095,7 +2090,7 @@ def add_optional_apps(optional_apps, installed_apps):
 # .. toggle_use_cases: temporary
 # .. toggle_warning: Not production-ready until relevant subtask https://github.com/openedx/edx-platform/issues/34827 is done.
 # .. toggle_creation_date: 2024-11-10
-# .. toggle_target_removal_date: 2025-06-01
+# .. toggle_target_removal_date: 2026-04-10
 USE_EXTRACTED_DISCUSSION_BLOCK = False
 
 # .. toggle_name: USE_EXTRACTED_PROBLEM_BLOCK
@@ -2105,17 +2100,16 @@ def add_optional_apps(optional_apps, installed_apps):
 # .. toggle_use_cases: temporary
 # .. toggle_warning: Not production-ready until relevant subtask https://github.com/openedx/edx-platform/issues/34827 is done.
 # .. toggle_creation_date: 2024-11-10
-# .. toggle_target_removal_date: 2025-06-01
+# .. toggle_target_removal_date: 2026-04-10
 USE_EXTRACTED_PROBLEM_BLOCK = False
 
 # .. toggle_name: USE_EXTRACTED_VIDEO_BLOCK
-# .. toggle_default: False
+# .. toggle_default: True
 # .. toggle_implementation: DjangoSetting
 # .. toggle_description: Enables the use of the extracted Video XBlock, which has been shifted to the 'openedx/xblocks-contrib' repo.
 # .. toggle_use_cases: temporary
-# .. toggle_warning: Not production-ready until relevant subtask https://github.com/openedx/edx-platform/issues/34827 is done.
 # .. toggle_creation_date: 2024-11-10
-# .. toggle_target_removal_date: 2025-06-01
+# .. toggle_target_removal_date: 2026-04-10
 USE_EXTRACTED_VIDEO_BLOCK = True
 
 ############################## Marketing Site ##############################

xmodule/annotatable_block.py

@@ -2,6 +2,7 @@
 
 import logging
 import textwrap
+import warnings
 
 from django.conf import settings
 from lxml import etree
@@ -40,6 +41,10 @@ class _BuiltInAnnotatableBlock(
 ):
     """
     Annotatable XBlock.
+
+    .. deprecated:: 2026-03
+       This built-in annotatable block is deprecated. Please use the extracted ``AnnotatableBlock``
+       from ``xblocks_contrib.annotatable`` instead.
     """
 
     is_extracted = False
@@ -216,3 +221,14 @@ def reset_class():
 
 reset_class()
 AnnotatableBlock.__name__ = "AnnotatableBlock"
+
+if not settings.USE_EXTRACTED_ANNOTATABLE_BLOCK:
+    warnings.warn(
+        "The built-in `xmodule.annotatable_block` AnnotatableBlock implementation is deprecated. "
+        "To fix this warning, enable `USE_EXTRACTED_ANNOTATABLE_BLOCK` (set it to True) to use "
+        "`xblocks_contrib.annotatable.AnnotatableBlock` instead. "
+        "Support for the built-in implementation, and the `USE_EXTRACTED_ANNOTATABLE_BLOCK` setting, "
+        "will be removed in Willow.",
+        DeprecationWarning,
+        stacklevel=2,
+    )

xmodule/html_block.py

@@ -6,6 +6,7 @@
 import re
 import sys
 import textwrap
+import warnings
 from datetime import datetime
 
 from django.conf import settings
@@ -51,6 +52,10 @@ class _BuiltinHtmlBlockMixin(  # lint-amnesty, pylint: disable=abstract-method
     """
     The HTML XBlock mixin.
     This provides the base class for all Html-ish blocks (including the HTML XBlock).
+
+    .. deprecated:: 2026-03
+       This built-in HTML block mixin is deprecated. Please use the extracted ``HtmlBlockMixin``
+       from ``xblocks_contrib.html`` instead.
     """
 
     display_name = String(
@@ -375,6 +380,10 @@ class _BuiltInHtmlBlock(_BuiltinHtmlBlockMixin):  # lint-amnesty, pylint: disabl
     """
     This is the actual HTML XBlock.
     Nothing extra is required; this is just a wrapper to include edxnotes support.
+
+    .. deprecated:: 2026-03
+       This built-in HTML block is deprecated. Please use the extracted ``HtmlBlock``
+       from ``xblocks_contrib.html`` instead.
     """
     is_extracted = False
 
@@ -542,3 +551,14 @@ def reset_class():
 
 reset_class()
 HtmlBlock.__name__ = "HtmlBlock"
+
+if not settings.USE_EXTRACTED_HTML_BLOCK:
+    warnings.warn(
+        "The built-in `xmodule.html_block` HtmlBlock implementation is deprecated. "
+        "To fix this warning, enable `USE_EXTRACTED_HTML_BLOCK` (set it to True) to use "
+        "`xblocks_contrib.html.HtmlBlock` instead. "
+        "Support for the built-in implementation, and the `USE_EXTRACTED_HTML_BLOCK` setting, "
+        "will be removed in Willow.",
+        DeprecationWarning,
+        stacklevel=2,
+    )

xmodule/lti_block.py

@@ -59,6 +59,7 @@
 import hashlib
 import logging
 import textwrap
+import warnings
 from unittest import mock
 from urllib import parse
 from xml.sax.saxutils import escape
@@ -290,6 +291,10 @@ class _BuiltInLTIBlock(
 
     Module provides LTI integration to course.
 
+    .. deprecated:: 2026-03
+       This built-in LTI block is deprecated. Please use the extracted ``LTIBlock``
+       from ``xblocks_contrib.lti`` instead.
+
     Except usual Xmodule structure it proceeds with OAuth signing.
     How it works::
 
@@ -1006,3 +1011,14 @@ def reset_class():
 
 reset_class()
 LTIBlock.__name__ = "LTIBlock"
+
+if not settings.USE_EXTRACTED_LTI_BLOCK:
+    warnings.warn(
+        "The built-in `xmodule.lti_block` LTIBlock implementation is deprecated. "
+        "To fix this warning, enable `USE_EXTRACTED_LTI_BLOCK` (set it to True) to use "
+        "`xblocks_contrib.lti.LTIBlock` instead. "
+        "Support for the built-in implementation, and the `USE_EXTRACTED_LTI_BLOCK` setting, "
+        "will be removed in Willow.",
+        DeprecationWarning,
+        stacklevel=2,
+    )

xmodule/poll_block.py

@@ -9,6 +9,7 @@
 import html
 import json
 import logging
+import warnings
 from copy import deepcopy
 
 from collections import OrderedDict
@@ -43,7 +44,13 @@ class _BuiltInPollBlock(
     ResourceTemplates,
     XModuleMixin,
 ):  # pylint: disable=abstract-method
-    """Poll Block"""
+    """
+    Poll Block.
+
+    .. deprecated:: 2026-03
+       This built-in poll block is deprecated. Please use the extracted ``PollBlock``
+       from ``xblocks_contrib.poll`` instead.
+    """
 
     is_extracted = False
 
@@ -263,3 +270,14 @@ def reset_class():
 
 reset_class()
 PollBlock.__name__ = "PollBlock"
+
+if not settings.USE_EXTRACTED_POLL_QUESTION_BLOCK:
+    warnings.warn(
+        "The built-in `xmodule.poll_block` PollBlock implementation is deprecated. "
+        "To fix this warning, enable `USE_EXTRACTED_POLL_QUESTION_BLOCK` (set it to True) to use "
+        "`xblocks_contrib.poll.PollBlock` instead. "
+        "Support for the built-in implementation, and the `USE_EXTRACTED_POLL_QUESTION_BLOCK` setting, "
+        "will be removed in Willow.",
+        DeprecationWarning,
+        stacklevel=2,
+    )

xmodule/video_block/video_block.py

@@ -16,6 +16,7 @@
 import copy
 import json
 import logging
+import warnings
 from collections import OrderedDict, defaultdict
 from operator import itemgetter
 
@@ -121,6 +122,10 @@ class _BuiltInVideoBlock(
             <source src=".../mit-3091x/M-3091X-FA12-L21-3_100.webm"/>
             <source src=".../mit-3091x/M-3091X-FA12-L21-3_100.ogv"/>
         </video>
+
+    .. deprecated:: 2026-03
+       This built-in video block is deprecated. Please use the extracted ``VideoBlock``
+       from ``xblocks_contrib.video`` instead.
     """
     is_extracted = False
     has_custom_completion = True
@@ -1196,3 +1201,14 @@ def _poster(self):
     else _BuiltInVideoBlock
 )
 VideoBlock.__name__ = "VideoBlock"
+
+if not settings.USE_EXTRACTED_VIDEO_BLOCK:
+    warnings.warn(
+        "The built-in `xmodule.video_block` VideoBlock implementation is deprecated. "
+        "To fix this warning, enable `USE_EXTRACTED_VIDEO_BLOCK` (set it to True) to use "
+        "`xblocks_contrib.video.VideoBlock` instead. "
+        "Support for the built-in implementation, and the `USE_EXTRACTED_VIDEO_BLOCK` setting, "
+        "will be removed in Willow.",
+        DeprecationWarning,
+        stacklevel=2,
+    )

xmodule/word_cloud_block.py

@@ -10,6 +10,7 @@
 
 import json
 import logging
+import warnings
 
 from django.conf import settings
 from web_fragments.fragment import Fragment
@@ -55,6 +56,10 @@ class _BuiltInWordCloudBlock(  # pylint: disable=abstract-method
 ):
     """
     Word Cloud XBlock.
+
+    .. deprecated:: 2026-03
+       This built-in word cloud block is deprecated. Please use the extracted ``WordCloudBlock``
+       from ``xblocks_contrib.word_cloud`` instead.
     """
 
     is_extracted = False
@@ -330,3 +335,14 @@ def reset_class():
 
 reset_class()
 WordCloudBlock.__name__ = "WordCloudBlock"
+
+if not settings.USE_EXTRACTED_WORD_CLOUD_BLOCK:
+    warnings.warn(
+        "The built-in `xmodule.word_cloud_block` WordCloudBlock implementation is deprecated. "
+        "To fix this warning, enable `USE_EXTRACTED_WORD_CLOUD_BLOCK` (set it to True) to use "
+        "`xblocks_contrib.word_cloud.WordCloudBlock` instead. "
+        "Support for the built-in implementation, and the `USE_EXTRACTED_WORD_CLOUD_BLOCK` setting, "
+        "will be removed in Willow.",
+        DeprecationWarning,
+        stacklevel=2,
+    )