Skip to content

refactor: Upgrade to XBlock 6.0.0, which mandates OpaqueKeys #37935

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
kdmccormick wants to merge 2 commits into
base: master
Choose a base branch
from
+6 −6
Draft

refactor: Upgrade to XBlock 6.0.0, which mandates OpaqueKeys #37935

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cd4ce51
temp: install xblock 6.0.0 from github
kdmccormick Jan 24, 2026
e250df9
refactor: Remove unneeded usage of MemoryIdManager in new Runtime
kdmccormick Jan 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions openedx/core/djangoapps/xblock/runtime/runtime.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion requirements/edx/base.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion requirements/edx/development.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion requirements/edx/doc.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion requirements/edx/testing.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading