refactor: Upgrade to XBlock 6.0.0, which mandates OpaqueKeys

cms/lib/xblock/tagging/test.py

@@ -10,7 +10,7 @@
 import ddt
 from django.test.client import RequestFactory
 from lxml import etree
-from opaque_keys.edx.asides import AsideUsageKeyV1, AsideUsageKeyV2
+from opaque_keys.edx.asides import AsideUsageKeyV1, AsideUsageKeyV2, UsageKey
 from pytz import UTC
 from xblock.fields import ScopeIds
 from xblock.runtime import DictKeyValueStore, KvsFieldData
@@ -118,10 +118,12 @@ def test_aside_contains_tags(self):
         """
         Checks that available_tags list is not empty
         """
-        sids = ScopeIds(user_id="bob",
-                        block_type="bobs-type",
-                        def_id="definition-id",
-                        usage_id="usage-id")
+        sids = ScopeIds(
+            user_id="bob",
+            block_type="bobs-type",
+            def_id="definition-id",
+            usage_id=UsageKey.from_string("block-v1:myOrg+myCourse+myRun+type@bobs-type+block@usage-id"),
+        )
         key_store = DictKeyValueStore()
         field_data = KvsFieldData(key_store)
         runtime = TestRuntime(services={'field-data': field_data})

openedx/core/djangoapps/xblock/runtime/runtime.py

@@ -20,7 +20,7 @@
 from xblock.exceptions import NoSuchServiceError
 from xblock.field_data import DictFieldData, FieldData, SplitFieldData
 from xblock.fields import Scope, ScopeIds
-from xblock.runtime import IdReader, KvsFieldData, MemoryIdManager, Runtime
+from xblock.runtime import IdReader, KvsFieldData, Runtime
 
 from xmodule.errortracker import make_error_tracker
 from xmodule.contentstore.django import contentstore
@@ -127,7 +127,7 @@ def __init__(
             ),
             default_class=None,
             select=None,
-            id_generator=MemoryIdManager(),  # We don't really use id_generator until we need to support asides
+            id_generator=None,  # We won't need an id_generator until we need to support asides
         )
         assert student_data_mode in (StudentDataMode.Ephemeral, StudentDataMode.Persisted)
         self.authored_data_mode = authored_data_mode

requirements/edx/base.txt

@@ -1241,7 +1241,7 @@ wheel==0.45.1
     # via django-pipeline
 wrapt==2.0.1
     # via -r requirements/edx/kernel.in
-xblock[django]==5.3.0
+git+https://github.com/kdmccormick/XBlock.git@kdmccormick/scope-id-types#egg=xblock[django]==6.0.0
     # via
     #   -r requirements/edx/kernel.in
     #   acid-xblock

requirements/edx/development.txt

@@ -2264,7 +2264,7 @@ wrapt==2.0.1
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
-xblock[django]==5.3.0
+git+https://github.com/kdmccormick/XBlock.git@kdmccormick/scope-id-types#egg=xblock[django]==6.0.0
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt

requirements/edx/doc.txt

@@ -1582,7 +1582,7 @@ wheel==0.45.1
     #   django-pipeline
 wrapt==2.0.1
     # via -r requirements/edx/base.txt
-xblock[django]==5.3.0
+git+https://github.com/kdmccormick/XBlock.git@kdmccormick/scope-id-types#egg=xblock[django]==6.0.0
     # via
     #   -r requirements/edx/base.txt
     #   acid-xblock

requirements/edx/testing.txt

@@ -1672,7 +1672,7 @@ wheel==0.45.1
     #   django-pipeline
 wrapt==2.0.1
     # via -r requirements/edx/base.txt
-xblock[django]==5.3.0
+git+https://github.com/kdmccormick/XBlock.git@kdmccormick/scope-id-types#egg=xblock[django]==6.0.0
     # via
     #   -r requirements/edx/base.txt
     #   acid-xblock