Skip to content

Commit d34b7ca

Browse files
kdmccormickkdmccormick
committed
build: Upgrade xblocks-contrib 0.16 -> xblocks-core 1.0
Same repo, different name, first stable release. Closes: openedx/xblocks-contrib#149 This upgrade contains breaking changes to the structure of the code, addressed in the next commit.
1 parent ddd197e commit d34b7ca

9 files changed

Lines changed: 132 additions & 132 deletions

File tree

‎.github/CODEOWNERS‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ openedx/core/djangoapps/user_authn/ @openedx/com
2222
openedx/core/djangoapps/verified_track_content/ @openedx/committers-openedx-platform-2u-infinity
2323
openedx/features/course_experience/
2424
# The Aximprovements team is working on extracting all built-in XBlocks
25-
# to the external repository (xblocks-contrib). They need to be notified
25+
# to the external repository (xblocks-core). They need to be notified
2626
# about any changes within xmodule to stay aligned with this effort.
2727
# Ticket: https://github.com/openedx/edx-platform/issues/34827
2828
xmodule/ @farhan @irtazaakram @salman2013

‎openedx/core/djangoapps/discussions/services.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
44
This service provides discussion-related configuration and feature flags
55
that are specific to the edx-platform implementation
6-
for the extracted discussion block in xblocks-contrib repository.
6+
for the extracted discussion block in xblocks-core repository.
77
"""
88

99
from django.conf import settings

‎openedx/core/djangoapps/video_config/services.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
44
This service provides video-related configuration and feature flags
55
that are specific to the edx-platform implementation
6-
for the extracted video block in xblocks-contrib repository.
6+
for the extracted video block in xblocks-core repository.
77
"""
88

99
import logging

‎openedx/envs/common.py‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2062,7 +2062,7 @@ def add_optional_apps(optional_apps, installed_apps):
20622062
# .. toggle_name: USE_EXTRACTED_WORD_CLOUD_BLOCK
20632063
# .. toggle_default: True
20642064
# .. toggle_implementation: DjangoSetting
2065-
# .. toggle_description: Enables the use of the extracted Word Cloud XBlock, which has been shifted to the 'openedx/xblocks-contrib' repo.
2065+
# .. toggle_description: Enables the use of the extracted Word Cloud XBlock, which has been shifted to the 'openedx/xblocks-core' repo.
20662066
# .. toggle_use_cases: temporary
20672067
# .. toggle_creation_date: 2024-11-10
20682068
# .. toggle_target_removal_date: 2026-04-10
@@ -2071,7 +2071,7 @@ def add_optional_apps(optional_apps, installed_apps):
20712071
# .. toggle_name: USE_EXTRACTED_ANNOTATABLE_BLOCK
20722072
# .. toggle_default: True
20732073
# .. toggle_implementation: DjangoSetting
2074-
# .. toggle_description: Enables the use of the extracted annotatable XBlock, which has been shifted to the 'openedx/xblocks-contrib' repo.
2074+
# .. toggle_description: Enables the use of the extracted annotatable XBlock, which has been shifted to the 'openedx/xblocks-core' repo.
20752075
# .. toggle_use_cases: temporary
20762076
# .. toggle_creation_date: 2024-11-10
20772077
# .. toggle_target_removal_date: 2026-04-10
@@ -2080,7 +2080,7 @@ def add_optional_apps(optional_apps, installed_apps):
20802080
# .. toggle_name: USE_EXTRACTED_POLL_QUESTION_BLOCK
20812081
# .. toggle_default: True
20822082
# .. toggle_implementation: DjangoSetting
2083-
# .. toggle_description: Enables the use of the extracted poll question XBlock, which has been shifted to the 'openedx/xblocks-contrib' repo.
2083+
# .. toggle_description: Enables the use of the extracted poll question XBlock, which has been shifted to the 'openedx/xblocks-core' repo.
20842084
# .. toggle_use_cases: temporary
20852085
# .. toggle_creation_date: 2024-11-10
20862086
# .. toggle_target_removal_date: 2026-04-10
@@ -2089,7 +2089,7 @@ def add_optional_apps(optional_apps, installed_apps):
20892089
# .. toggle_name: USE_EXTRACTED_LTI_BLOCK
20902090
# .. toggle_default: True
20912091
# .. toggle_implementation: DjangoSetting
2092-
# .. toggle_description: Enables the use of the extracted LTI XBlock, which has been shifted to the 'openedx/xblocks-contrib' repo.
2092+
# .. toggle_description: Enables the use of the extracted LTI XBlock, which has been shifted to the 'openedx/xblocks-core' repo.
20932093
# .. toggle_use_cases: temporary
20942094
# .. toggle_creation_date: 2024-11-10
20952095
# .. toggle_target_removal_date: 2026-04-10
@@ -2098,7 +2098,7 @@ def add_optional_apps(optional_apps, installed_apps):
20982098
# .. toggle_name: USE_EXTRACTED_HTML_BLOCK
20992099
# .. toggle_default: True
21002100
# .. toggle_implementation: DjangoSetting
2101-
# .. toggle_description: Enables the use of the extracted HTML XBlock, which has been shifted to the 'openedx/xblocks-contrib' repo.
2101+
# .. toggle_description: Enables the use of the extracted HTML XBlock, which has been shifted to the 'openedx/xblocks-core' repo.
21022102
# .. toggle_use_cases: temporary
21032103
# .. toggle_creation_date: 2024-11-10
21042104
# .. toggle_target_removal_date: 2026-04-10
@@ -2107,7 +2107,7 @@ def add_optional_apps(optional_apps, installed_apps):
21072107
# .. toggle_name: USE_EXTRACTED_DISCUSSION_BLOCK
21082108
# .. toggle_default: False
21092109
# .. toggle_implementation: DjangoSetting
2110-
# .. toggle_description: Enables the use of the extracted Discussion XBlock, which has been shifted to the 'openedx/xblocks-contrib' repo.
2110+
# .. toggle_description: Enables the use of the extracted Discussion XBlock, which has been shifted to the 'openedx/xblocks-core' repo.
21112111
# .. toggle_use_cases: temporary
21122112
# .. toggle_warning: Not production-ready until relevant subtask https://github.com/openedx/edx-platform/issues/34827 is done.
21132113
# .. toggle_creation_date: 2024-11-10
@@ -2117,7 +2117,7 @@ def add_optional_apps(optional_apps, installed_apps):
21172117
# .. toggle_name: USE_EXTRACTED_PROBLEM_BLOCK
21182118
# .. toggle_default: False
21192119
# .. toggle_implementation: DjangoSetting
2120-
# .. toggle_description: Enables the use of the extracted Problem XBlock, which has been shifted to the 'openedx/xblocks-contrib' repo.
2120+
# .. toggle_description: Enables the use of the extracted Problem XBlock, which has been shifted to the 'openedx/xblocks-core' repo.
21212121
# .. toggle_use_cases: temporary
21222122
# .. toggle_warning: Not production-ready until relevant subtask https://github.com/openedx/edx-platform/issues/34827 is done.
21232123
# .. toggle_creation_date: 2024-11-10
@@ -2127,7 +2127,7 @@ def add_optional_apps(optional_apps, installed_apps):
21272127
# .. toggle_name: USE_EXTRACTED_VIDEO_BLOCK
21282128
# .. toggle_default: True
21292129
# .. toggle_implementation: DjangoSetting
2130-
# .. toggle_description: Enables the use of the extracted Video XBlock, which has been shifted to the 'openedx/xblocks-contrib' repo.
2130+
# .. toggle_description: Enables the use of the extracted Video XBlock, which has been shifted to the 'openedx/xblocks-core' repo.
21312131
# .. toggle_use_cases: temporary
21322132
# .. toggle_creation_date: 2024-11-10
21332133
# .. toggle_target_removal_date: 2026-04-10

‎requirements/edx/base.txt‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ beautifulsoup4==4.14.3
5757
# via
5858
# openedx-forum
5959
# pynliner
60-
# xblocks-contrib
60+
# xblocks-core
6161
billiard==4.2.4
6262
# via celery
6363
bleach[css]==6.3.0
@@ -126,7 +126,7 @@ charset-normalizer==3.4.7
126126
chem==2.0.0
127127
# via
128128
# -r requirements/edx/kernel.in
129-
# xblocks-contrib
129+
# xblocks-core
130130
click==8.3.3
131131
# via
132132
# celery
@@ -172,7 +172,7 @@ defusedxml==0.7.1
172172
# ora2
173173
# python3-openid
174174
# social-auth-core
175-
# xblocks-contrib
175+
# xblocks-core
176176
django==5.2.13
177177
# via
178178
# -c requirements/common_constraints.txt
@@ -248,7 +248,7 @@ django==5.2.13
248248
# social-auth-app-django
249249
# super-csv
250250
# xblock-google-drive
251-
# xblocks-contrib
251+
# xblocks-core
252252
# xss-utils
253253
django-appconf==1.2.0
254254
# via django-statici18n
@@ -440,7 +440,7 @@ edx-celeryutils==2.0.0
440440
edx-codejail==4.1.0
441441
# via
442442
# -r requirements/edx/kernel.in
443-
# xblocks-contrib
443+
# xblocks-core
444444
edx-completion==5.0.0
445445
# via -r requirements/edx/kernel.in
446446
edx-django-release-util==1.5.0
@@ -469,7 +469,7 @@ edx-django-utils==8.0.1
469469
# openedx-events
470470
# ora2
471471
# super-csv
472-
# xblocks-contrib
472+
# xblocks-core
473473
edx-drf-extensions==10.6.0
474474
# via
475475
# -r requirements/edx/kernel.in
@@ -515,7 +515,7 @@ edx-opaque-keys[django]==4.0.0
515515
# openedx-events
516516
# openedx-filters
517517
# ora2
518-
# xblocks-contrib
518+
# xblocks-core
519519
edx-organizations==8.0.0
520520
# via
521521
# -r requirements/edx/kernel.in
@@ -543,7 +543,7 @@ edx-submissions==4.0.0
543543
# via
544544
# -r requirements/edx/kernel.in
545545
# ora2
546-
# xblocks-contrib
546+
# xblocks-core
547547
edx-tincan-py35==2.0.0
548548
# via enterprise-integrated-channels
549549
edx-toggles==6.0.0
@@ -558,15 +558,15 @@ edx-toggles==6.0.0
558558
# edxval
559559
# event-tracking
560560
# ora2
561-
# xblocks-contrib
561+
# xblocks-core
562562
edx-when==4.0.0
563563
# via
564564
# -r requirements/edx/kernel.in
565565
# edx-proctoring
566566
edxval==4.0.0
567567
# via
568568
# -r requirements/edx/kernel.in
569-
# xblocks-contrib
569+
# xblocks-core
570570
elasticsearch==7.9.1
571571
# via
572572
# -c requirements/common_constraints.txt
@@ -603,7 +603,7 @@ fs==2.4.16
603603
# fs-s3fs
604604
# openedx-django-pyfs
605605
# xblock
606-
# xblocks-contrib
606+
# xblocks-core
607607
fs-s3fs==1.1.1
608608
# via
609609
# -r requirements/edx/kernel.in
@@ -663,7 +663,7 @@ html5lib==1.1
663663
# via
664664
# -r requirements/edx/kernel.in
665665
# ora2
666-
# xblocks-contrib
666+
# xblocks-core
667667
httpcore==1.0.9
668668
# via httpx
669669
httpx[http2]==0.28.1
@@ -750,7 +750,7 @@ lxml[html-clean]==5.3.2
750750
# ora2
751751
# python3-saml
752752
# xblock
753-
# xblocks-contrib
753+
# xblocks-core
754754
# xmlsec
755755
lxml-html-clean==0.4.4
756756
# via lxml
@@ -776,7 +776,7 @@ markupsafe==3.0.3
776776
# mako
777777
# openedx-calc
778778
# xblock
779-
# xblocks-contrib
779+
# xblocks-core
780780
maxminddb==3.1.1
781781
# via geoip2
782782
meilisearch==0.41.0
@@ -804,7 +804,7 @@ mysqlclient==2.2.8
804804
nh3==0.3.5
805805
# via
806806
# -r requirements/edx/kernel.in
807-
# xblocks-contrib
807+
# xblocks-core
808808
nltk==3.9.4
809809
# via chem
810810
nodeenv==1.10.0
@@ -816,15 +816,15 @@ numpy==1.26.4
816816
# openedx-calc
817817
# scipy
818818
# shapely
819-
# xblocks-contrib
819+
# xblocks-core
820820
oauthlib==3.3.1
821821
# via
822822
# -r requirements/edx/kernel.in
823823
# django-oauth-toolkit
824824
# lti-consumer-xblock
825825
# requests-oauthlib
826826
# social-auth-core
827-
# xblocks-contrib
827+
# xblocks-core
828828
olxcleaner==0.3.0
829829
# via -r requirements/edx/kernel.in
830830
openedx-atlas==0.7.0
@@ -839,7 +839,7 @@ openedx-authz==1.14.0
839839
openedx-calc==5.0.0
840840
# via
841841
# -r requirements/edx/kernel.in
842-
# xblocks-contrib
842+
# xblocks-core
843843
openedx-core==0.47.0
844844
# via
845845
# -c requirements/constraints.txt
@@ -888,7 +888,7 @@ path==16.11.0
888888
# -r requirements/edx/kernel.in
889889
# edx-i18n-tools
890890
# path-py
891-
# xblocks-contrib
891+
# xblocks-core
892892
path-py==12.5.0
893893
# via
894894
# edx-enterprise
@@ -993,7 +993,7 @@ pyparsing==3.3.2
993993
# via
994994
# chem
995995
# openedx-calc
996-
# xblocks-contrib
996+
# xblocks-core
997997
pyrsistent==0.20.0
998998
# via optimizely-sdk
999999
pysrt==1.1.2
@@ -1041,7 +1041,7 @@ pytz==2026.1.post1
10411041
# snowflake-connector-python
10421042
# tincan
10431043
# xblock
1044-
# xblocks-contrib
1044+
# xblocks-core
10451045
pyuca==1.2
10461046
# via -r requirements/edx/kernel.in
10471047
pyyaml==6.0.3
@@ -1057,7 +1057,7 @@ pyyaml==6.0.3
10571057
random2==1.0.2
10581058
# via
10591059
# -r requirements/edx/kernel.in
1060-
# xblocks-contrib
1060+
# xblocks-core
10611061
recommender-xblock==5.0.0
10621062
# via -r requirements/edx/bundled.in
10631063
redis==7.4.0
@@ -1095,7 +1095,7 @@ requests==2.33.1
10951095
# snowflake-connector-python
10961096
# social-auth-core
10971097
# xblock-google-drive
1098-
# xblocks-contrib
1098+
# xblocks-core
10991099
requests-oauthlib==2.0.0
11001100
# via
11011101
# -r requirements/edx/kernel.in
@@ -1121,7 +1121,7 @@ semantic-version==2.10.0
11211121
shapely==2.1.2
11221122
# via
11231123
# -r requirements/edx/kernel.in
1124-
# xblocks-contrib
1124+
# xblocks-core
11251125
simpleeval==1.0.7
11261126
# via pycasbin
11271127
simplejson==4.1.1
@@ -1131,7 +1131,7 @@ simplejson==4.1.1
11311131
# super-csv
11321132
# xblock
11331133
# xblock-utils
1134-
# xblocks-contrib
1134+
# xblocks-core
11351135
six==1.17.0
11361136
# via
11371137
# -r requirements/edx/kernel.in
@@ -1275,7 +1275,7 @@ web-fragments==4.0.0
12751275
# staff-graded-xblock
12761276
# xblock
12771277
# xblock-utils
1278-
# xblocks-contrib
1278+
# xblocks-core
12791279
webencodings==0.5.1
12801280
# via
12811281
# bleach
@@ -1285,13 +1285,13 @@ webob==1.8.9
12851285
# via
12861286
# -r requirements/edx/kernel.in
12871287
# xblock
1288-
# xblocks-contrib
1288+
# xblocks-core
12891289
wheel==0.47.0
12901290
# via django-pipeline
12911291
wrapt==2.1.2
12921292
# via
12931293
# -r requirements/edx/kernel.in
1294-
# xblocks-contrib
1294+
# xblocks-core
12951295
xblock[django]==6.1.0
12961296
# via
12971297
# -r requirements/edx/kernel.in
@@ -1307,7 +1307,7 @@ xblock[django]==6.1.0
13071307
# xblock-drag-and-drop-v2
13081308
# xblock-google-drive
13091309
# xblock-utils
1310-
# xblocks-contrib
1310+
# xblocks-core
13111311
xblock-drag-and-drop-v2==5.0.5
13121312
# via -r requirements/edx/bundled.in
13131313
xblock-google-drive==0.8.2
@@ -1318,7 +1318,7 @@ xblock-utils==4.0.0
13181318
# via
13191319
# edx-sga
13201320
# xblock-poll
1321-
xblocks-contrib==0.16.0
1321+
xblocks-core==1.0.0
13221322
# via -r requirements/edx/bundled.in
13231323
xmlsec==1.3.14
13241324
# via

‎requirements/edx/bundled.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ ora2>=4.5.0 # Open Response Assessment XBlock
3939
xblock-poll # Xblock for polling users
4040
xblock-drag-and-drop-v2 # Drag and Drop XBlock
4141
xblock-google-drive # XBlock for google docs and calendar
42-
xblocks-contrib # Package having multiple core XBlocks, https://github.com/openedx/xblocks-contrib?tab=readme-ov-file#xblocks-being-moved-here
42+
xblocks-core # Package having multiple core XBlocks, https://github.com/openedx/xblocks-core?tab=readme-ov-file#xblocks-being-moved-here
4343

4444

4545
## Integrated Channels

0 commit comments

Comments
 (0)