Skip to content

Commit

Permalink
Merge pull request #104 from farhan/farhan/remove-xblockutils
Browse files Browse the repository at this point in the history 
Migrate from xblockutils package to xblock.utils
  • Loading branch information
Feanil Patel authored Nov 6, 2023
2 parents 3d32cbf + 6bb0af0 commit 5520411
Show file tree
Hide file tree
Showing 9 changed files with 20 additions and 100 deletions.
9 changes: 7 additions & 2 deletions qualtricssurvey/views.py
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,13 @@
"""
Handle view logic for the XBlock
"""
from xblockutils.resources import ResourceLoader
from xblockutils.studio_editable import StudioEditableXBlockMixin
try:
from xblock.utils.resources import ResourceLoader
from xblock.utils.studio_editable import StudioEditableXBlockMixin
except ModuleNotFoundError:
# For backward compatibility with releases older than Quince.
from xblockutils.resources import ResourceLoader
from xblockutils.studio_editable import StudioEditableXBlockMixin

from .mixins.fragment import XBlockFragmentBuilderMixin

Expand Down
1 change: 0 additions & 1 deletion requirements/base.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,3 @@

Django
XBlock
xblock-utils
47 changes: 5 additions & 42 deletions requirements/base.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,80 +8,43 @@ appdirs==1.4.4
# via fs
asgiref==3.7.2
# via django
boto3==1.28.68
# via fs-s3fs
botocore==1.31.68
# via
# boto3
# s3transfer
django==3.2.22
# via
# -c requirements/common_constraints.txt
# -r requirements/base.in
# openedx-django-pyfs
fs==2.4.16
# via
# fs-s3fs
# openedx-django-pyfs
# xblock
fs-s3fs==1.1.1
# via openedx-django-pyfs
jmespath==1.0.1
# via
# boto3
# botocore
lazy==1.6
# via xblock
lxml==4.9.3
# via xblock
mako==1.2.4
# via
# xblock
# xblock-utils
# via xblock
markupsafe==2.1.3
# via
# mako
# xblock
openedx-django-pyfs==3.4.0
# via xblock
python-dateutil==2.8.2
# via
# botocore
# xblock
# via xblock
pytz==2023.3.post1
# via
# django
# xblock
pyyaml==6.0.1
# via xblock
s3transfer==0.7.0
# via boto3
simplejson==3.19.2
# via
# xblock
# xblock-utils
# via xblock
six==1.16.0
# via
# fs
# fs-s3fs
# python-dateutil
sqlparse==0.4.4
# via django
typing-extensions==4.8.0
# via asgiref
urllib3==1.26.18
# via botocore
web-fragments==2.1.0
# via
# xblock
# xblock-utils
# via xblock
webob==1.8.7
# via xblock
xblock[django]==1.8.1
# via
# -r requirements/base.in
# xblock-utils
xblock-utils==4.0.0
xblock==1.8.1
# via -r requirements/base.in

# The following packages are considered to be unsafe in a requirements file:
Expand Down
4 changes: 2 additions & 2 deletions requirements/ci.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ distlib==0.3.7
# virtualenv
docopt==0.6.2
# via coveralls
filelock==3.12.4
filelock==3.13.0
# via
# -r requirements/tox.txt
# tox
Expand Down Expand Up @@ -57,7 +57,7 @@ tox==3.28.0
# -r requirements/tox.txt
urllib3==2.0.7
# via requests
virtualenv==20.24.5
virtualenv==20.24.6
# via
# -r requirements/tox.txt
# tox
2 changes: 1 addition & 1 deletion requirements/pip.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
# make upgrade
#
wheel==0.41.2
wheel==0.41.3
# via -r requirements/pip.in

# The following packages are considered to be unsafe in a requirements file:
Expand Down
2 changes: 1 addition & 1 deletion requirements/pip_tools.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ tomli==2.0.1
# build
# pip-tools
# pyproject-hooks
wheel==0.41.2
wheel==0.41.3
# via pip-tools
zipp==3.17.0
# via importlib-metadata
Expand Down
49 changes: 1 addition & 48 deletions requirements/quality.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,6 @@ asgiref==3.7.2
# django
astroid==3.0.1
# via pylint
boto3==1.28.68
# via
# -r requirements/base.txt
# fs-s3fs
botocore==1.31.68
# via
# -r requirements/base.txt
# boto3
# s3transfer
coverage==7.3.2
# via -r requirements/test.txt
dill==0.3.7
Expand All @@ -31,30 +22,14 @@ django==3.2.22
# via
# -c requirements/common_constraints.txt
# -r requirements/base.txt
# openedx-django-pyfs
edx-opaque-keys==2.5.1
# via -r requirements/test.txt
fs==2.4.16
# via
# -r requirements/base.txt
# fs-s3fs
# openedx-django-pyfs
# xblock
fs-s3fs==1.1.1
# via
# -r requirements/base.txt
# openedx-django-pyfs
isort==5.12.0
# via pylint
jmespath==1.0.1
# via
# -r requirements/base.txt
# boto3
# botocore
lazy==1.6
# via
# -r requirements/base.txt
# xblock
lxml==4.9.3
# via
# -r requirements/base.txt
Expand All @@ -63,7 +38,6 @@ mako==1.2.4
# via
# -r requirements/base.txt
# xblock
# xblock-utils
markupsafe==2.1.3
# via
# -r requirements/base.txt
Expand All @@ -73,10 +47,6 @@ mccabe==0.7.0
# via pylint
mock==5.1.0
# via -r requirements/test.txt
openedx-django-pyfs==3.4.0
# via
# -r requirements/base.txt
# xblock
pbr==5.11.1
# via
# -r requirements/test.txt
Expand All @@ -94,7 +64,6 @@ pymongo==3.13.0
python-dateutil==2.8.2
# via
# -r requirements/base.txt
# botocore
# xblock
pytz==2023.3.post1
# via
Expand All @@ -105,20 +74,14 @@ pyyaml==6.0.1
# via
# -r requirements/base.txt
# xblock
s3transfer==0.7.0
# via
# -r requirements/base.txt
# boto3
simplejson==3.19.2
# via
# -r requirements/base.txt
# xblock
# xblock-utils
six==1.16.0
# via
# -r requirements/base.txt
# fs
# fs-s3fs
# python-dateutil
sqlparse==0.4.4
# via
Expand All @@ -140,25 +103,15 @@ typing-extensions==4.8.0
# astroid
# edx-opaque-keys
# pylint
urllib3==1.26.18
# via
# -r requirements/base.txt
# botocore
web-fragments==2.1.0
# via
# -r requirements/base.txt
# xblock
# xblock-utils
webob==1.8.7
# via
# -r requirements/base.txt
# xblock
xblock[django]==1.8.1
# via
# -r requirements/base.txt
# xblock
# xblock-utils
xblock-utils==4.0.0
xblock==1.8.1
# via -r requirements/base.txt

# The following packages are considered to be unsafe in a requirements file:
Expand Down
4 changes: 2 additions & 2 deletions requirements/tox.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#
distlib==0.3.7
# via virtualenv
filelock==3.12.4
filelock==3.13.0
# via
# tox
# virtualenv
Expand All @@ -26,5 +26,5 @@ tox==3.28.0
# via
# -c requirements/common_constraints.txt
# -r requirements/tox.in
virtualenv==20.24.5
virtualenv==20.24.6
# via tox
2 changes: 1 addition & 1 deletion setup.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
from setuptools import find_packages, setup


version = '1.3.0'
version = '1.4.0'
description = __doc__.strip().split('\n')[0]
this_directory = path.abspath(path.dirname(__file__))
with open(path.join(this_directory, 'README.rst')) as file_in:
Expand Down

0 comments on commit 5520411

Please sign in to comment.