Skip to content
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.

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

Remove xblockutils package #177

Merged
merged 2 commits into from
Oct 10, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion done/done.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
from web_fragments.fragment import Fragment
from xblock.core import XBlock
from xblock.fields import Boolean, DateTime, Float, Scope, String
from xblockutils.resources import ResourceLoader
from xblock.utils.resources import ResourceLoader

resource_loader = ResourceLoader(__name__)

Expand Down
1 change: 0 additions & 1 deletion requirements/base.in
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,4 @@
-c constraints.txt

XBlock
xblock-utils
django
47 changes: 5 additions & 42 deletions requirements/base.txt
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.62
# via fs-s3fs
botocore==1.31.62
# via
# boto3
# s3transfer
django==3.2.22
# via
# -c https://raw.githubusercontent.com/openedx/edx-lint/master/edx_lint/files/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.17
# 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
19 changes: 1 addition & 18 deletions requirements/ci.txt
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,6 @@ django==3.2.22
# via
# -c https://raw.githubusercontent.com/openedx/edx-lint/master/edx_lint/files/common_constraints.txt
# -r requirements/test.txt
# openedx-django-pyfs
# xblock-sdk
docopt==0.6.2
# via
Expand All @@ -118,12 +117,10 @@ fs==2.4.16
# via
# -r requirements/test.txt
# fs-s3fs
# openedx-django-pyfs
# xblock
fs-s3fs==1.1.1
# via
# -r requirements/test.txt
# openedx-django-pyfs
# xblock-sdk
idna==3.4
# via
Expand Down Expand Up @@ -169,10 +166,6 @@ keyring==24.2.0
# via
# -r requirements/test.txt
# twine
lazy==1.6
# via
# -r requirements/test.txt
# xblock
lazy-object-proxy==1.9.0
# via
# -r requirements/test.txt
Expand All @@ -186,7 +179,6 @@ mako==1.2.4
# via
# -r requirements/test.txt
# xblock
# xblock-utils
markdown-it-py==3.0.0
# via
# -r requirements/test.txt
Expand All @@ -213,10 +205,6 @@ nh3==0.2.14
# via
# -r requirements/test.txt
# readme-renderer
openedx-django-pyfs==3.4.0
# via
# -r requirements/test.txt
# xblock
packaging==23.2
# via
# -r requirements/test.txt
Expand Down Expand Up @@ -342,7 +330,6 @@ simplejson==3.19.2
# -r requirements/test.txt
# xblock
# xblock-sdk
# xblock-utils
six==1.16.0
# via
# -r requirements/test.txt
Expand Down Expand Up @@ -407,7 +394,6 @@ web-fragments==2.1.0
# -r requirements/test.txt
# xblock
# xblock-sdk
# xblock-utils
webob==1.8.7
# via
# -r requirements/test.txt
Expand All @@ -417,15 +403,12 @@ wrapt==1.15.0
# via
# -r requirements/test.txt
# astroid
xblock[django]==1.8.1
xblock==1.8.1
# via
# -r requirements/test.txt
# xblock-sdk
# xblock-utils
xblock-sdk==0.7.0
# via -r requirements/test.txt
xblock-utils==4.0.0
# via -r requirements/test.txt
zipp==3.17.0
# via
# -r requirements/test.txt
Expand Down
48 changes: 1 addition & 47 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,38 +12,13 @@ asgiref==3.7.2
# via
# -r requirements/base.txt
# django
boto3==1.28.62
# via
# -r requirements/base.txt
# fs-s3fs
botocore==1.31.62
# via
# -r requirements/base.txt
# boto3
# s3transfer
django==3.2.22
# via
# -r requirements/base.txt
# edx-i18n-tools
# openedx-django-pyfs
edx-i18n-tools==1.3.0
# via -r requirements/dev.in
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
jmespath==1.0.1
# via
# -r requirements/base.txt
# boto3
# botocore
lazy==1.6
# via
# -r requirements/base.txt
# xblock
Expand All @@ -56,24 +31,18 @@ mako==1.2.4
# via
# -r requirements/base.txt
# xblock
# xblock-utils
markupsafe==2.1.3
# via
# -r requirements/base.txt
# mako
# xblock
openedx-django-pyfs==3.4.0
# via
# -r requirements/base.txt
# xblock
path==16.7.1
# via edx-i18n-tools
polib==1.2.0
# via edx-i18n-tools
python-dateutil==2.8.2
# via
# -r requirements/base.txt
# botocore
# xblock
pytz==2023.3.post1
# via
Expand All @@ -85,20 +54,14 @@ pyyaml==6.0.1
# -r requirements/base.txt
# edx-i18n-tools
# 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 @@ -108,24 +71,15 @@ typing-extensions==4.8.0
# via
# -r requirements/base.txt
# asgiref
urllib3==1.26.17
# 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-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
Loading