Skip to content
This repository was archived by the owner on Apr 16, 2026. It is now read-only.

Commit 1534d4c

Browse files
author
Feanil Patel
authored
Merge pull request #127 from farhan/farhan/remove-xblockutils
Remove xblock-utils package
2 parents 9d4b963 + 0a053cd commit 1534d4c

10 files changed

Lines changed: 21 additions & 100 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,7 @@ Version 1.1.0
3333
Version 1.2.0
3434

3535
Added support for django 4.2
36-
36+
37+
Version 1.3.0
38+
39+
Remove xblock-utils package and migrate to xblock.utils

‎requirements/base.in‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,3 @@
44
Django
55
six
66
XBlock
7-
xblock-utils

‎requirements/base.txt‎

Lines changed: 5 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -8,81 +8,44 @@ appdirs==1.4.4
88
# via fs
99
asgiref==3.7.2
1010
# via django
11-
boto3==1.28.68
12-
# via fs-s3fs
13-
botocore==1.31.68
14-
# via
15-
# boto3
16-
# s3transfer
1711
django==3.2.22
1812
# via
1913
# -c requirements/common_constraints.txt
2014
# -r requirements/base.in
21-
# openedx-django-pyfs
2215
fs==2.4.16
23-
# via
24-
# fs-s3fs
25-
# openedx-django-pyfs
26-
# xblock
27-
fs-s3fs==1.1.1
28-
# via openedx-django-pyfs
29-
jmespath==1.0.1
30-
# via
31-
# boto3
32-
# botocore
33-
lazy==1.6
3416
# via xblock
3517
lxml==4.9.3
3618
# via xblock
3719
mako==1.2.4
38-
# via
39-
# xblock
40-
# xblock-utils
20+
# via xblock
4121
markupsafe==2.1.3
4222
# via
4323
# mako
4424
# xblock
45-
openedx-django-pyfs==3.4.0
46-
# via xblock
4725
python-dateutil==2.8.2
48-
# via
49-
# botocore
50-
# xblock
26+
# via xblock
5127
pytz==2023.3.post1
5228
# via
5329
# django
5430
# xblock
5531
pyyaml==6.0.1
5632
# via xblock
57-
s3transfer==0.7.0
58-
# via boto3
5933
simplejson==3.19.2
60-
# via
61-
# xblock
62-
# xblock-utils
34+
# via xblock
6335
six==1.16.0
6436
# via
6537
# -r requirements/base.in
6638
# fs
67-
# fs-s3fs
6839
# python-dateutil
6940
sqlparse==0.4.4
7041
# via django
7142
typing-extensions==4.8.0
7243
# via asgiref
73-
urllib3==1.26.18
74-
# via botocore
7544
web-fragments==2.1.0
76-
# via
77-
# xblock
78-
# xblock-utils
45+
# via xblock
7946
webob==1.8.7
8047
# via xblock
81-
xblock[django]==1.8.1
82-
# via
83-
# -r requirements/base.in
84-
# xblock-utils
85-
xblock-utils==4.0.0
48+
xblock==1.8.1
8649
# via -r requirements/base.in
8750

8851
# The following packages are considered to be unsafe in a requirements file:

‎requirements/ci.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ distlib==0.3.7
1818
# virtualenv
1919
docopt==0.6.2
2020
# via coveralls
21-
filelock==3.12.4
21+
filelock==3.13.0
2222
# via
2323
# -r requirements/tox.txt
2424
# tox
@@ -57,7 +57,7 @@ tox==3.28.0
5757
# -r requirements/tox.txt
5858
urllib3==2.0.7
5959
# via requests
60-
virtualenv==20.24.5
60+
virtualenv==20.24.6
6161
# via
6262
# -r requirements/tox.txt
6363
# tox

‎requirements/pip.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
# make upgrade
66
#
7-
wheel==0.41.2
7+
wheel==0.41.3
88
# via -r requirements/pip.in
99

1010
# The following packages are considered to be unsafe in a requirements file:

‎requirements/pip_tools.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ tomli==2.0.1
2121
# build
2222
# pip-tools
2323
# pyproject-hooks
24-
wheel==0.41.2
24+
wheel==0.41.3
2525
# via pip-tools
2626
zipp==3.17.0
2727
# via importlib-metadata

‎requirements/quality.txt‎

Lines changed: 1 addition & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,6 @@ asgiref==3.7.2
1414
# django
1515
astroid==3.0.1
1616
# via pylint
17-
boto3==1.28.68
18-
# via
19-
# -r requirements/base.txt
20-
# fs-s3fs
21-
botocore==1.31.68
22-
# via
23-
# -r requirements/base.txt
24-
# boto3
25-
# s3transfer
2617
coverage==7.3.2
2718
# via -r requirements/test.txt
2819
dill==0.3.7
@@ -31,30 +22,14 @@ django==3.2.22
3122
# via
3223
# -c requirements/common_constraints.txt
3324
# -r requirements/base.txt
34-
# openedx-django-pyfs
3525
edx-opaque-keys==2.5.1
3626
# via -r requirements/test.txt
3727
fs==2.4.16
3828
# via
3929
# -r requirements/base.txt
40-
# fs-s3fs
41-
# openedx-django-pyfs
4230
# xblock
43-
fs-s3fs==1.1.1
44-
# via
45-
# -r requirements/base.txt
46-
# openedx-django-pyfs
4731
isort==5.12.0
4832
# via pylint
49-
jmespath==1.0.1
50-
# via
51-
# -r requirements/base.txt
52-
# boto3
53-
# botocore
54-
lazy==1.6
55-
# via
56-
# -r requirements/base.txt
57-
# xblock
5833
lxml==4.9.3
5934
# via
6035
# -r requirements/base.txt
@@ -63,7 +38,6 @@ mako==1.2.4
6338
# via
6439
# -r requirements/base.txt
6540
# xblock
66-
# xblock-utils
6741
markupsafe==2.1.3
6842
# via
6943
# -r requirements/base.txt
@@ -73,10 +47,6 @@ mccabe==0.7.0
7347
# via pylint
7448
mock==5.1.0
7549
# via -r requirements/test.txt
76-
openedx-django-pyfs==3.4.0
77-
# via
78-
# -r requirements/base.txt
79-
# xblock
8050
pbr==5.11.1
8151
# via
8252
# -r requirements/test.txt
@@ -94,7 +64,6 @@ pymongo==3.13.0
9464
python-dateutil==2.8.2
9565
# via
9666
# -r requirements/base.txt
97-
# botocore
9867
# xblock
9968
pytz==2023.3.post1
10069
# via
@@ -105,20 +74,14 @@ pyyaml==6.0.1
10574
# via
10675
# -r requirements/base.txt
10776
# xblock
108-
s3transfer==0.7.0
109-
# via
110-
# -r requirements/base.txt
111-
# boto3
11277
simplejson==3.19.2
11378
# via
11479
# -r requirements/base.txt
11580
# xblock
116-
# xblock-utils
11781
six==1.16.0
11882
# via
11983
# -r requirements/base.txt
12084
# fs
121-
# fs-s3fs
12285
# python-dateutil
12386
sqlparse==0.4.4
12487
# via
@@ -140,25 +103,15 @@ typing-extensions==4.8.0
140103
# astroid
141104
# edx-opaque-keys
142105
# pylint
143-
urllib3==1.26.18
144-
# via
145-
# -r requirements/base.txt
146-
# botocore
147106
web-fragments==2.1.0
148107
# via
149108
# -r requirements/base.txt
150109
# xblock
151-
# xblock-utils
152110
webob==1.8.7
153111
# via
154112
# -r requirements/base.txt
155113
# xblock
156-
xblock[django]==1.8.1
157-
# via
158-
# -r requirements/base.txt
159-
# xblock
160-
# xblock-utils
161-
xblock-utils==4.0.0
114+
xblock==1.8.1
162115
# via -r requirements/base.txt
163116

164117
# The following packages are considered to be unsafe in a requirements file:

‎requirements/tox.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#
77
distlib==0.3.7
88
# via virtualenv
9-
filelock==3.12.4
9+
filelock==3.13.0
1010
# via
1111
# tox
1212
# virtualenv
@@ -26,5 +26,5 @@ tox==3.28.0
2626
# via
2727
# -c requirements/common_constraints.txt
2828
# -r requirements/tox.in
29-
virtualenv==20.24.5
29+
virtualenv==20.24.6
3030
# via tox

‎setup.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
from setuptools import find_packages, setup
99

10-
version = '1.2.0'
10+
version = '1.3.0'
1111
description = __doc__.strip().split('\n')[0]
1212
this_directory = path.abspath(path.dirname(__file__))
1313
with open(path.join(this_directory, 'README.rst')) as file_in:

‎submit_and_compare/views.py‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,10 @@
88
from lxml import etree
99
from six import StringIO
1010
from xblock.core import XBlock
11-
from xblockutils.resources import ResourceLoader
11+
try:
12+
from xblock.utils.resources import ResourceLoader
13+
except ModuleNotFoundError: # For backward compatibility with releases older than Quince.
14+
from xblockutils.resources import ResourceLoader
1215

1316
from .mixins.fragment import XBlockFragmentBuilderMixin
1417

0 commit comments

Comments
 (0)