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.

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

refactor: remove xblock-utils package #25

Merged
merged 2 commits into from
Oct 19, 2023
Merged

refactor: remove xblock-utils package #25

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
ceb9614
refactor: remove xblock-utils package
farhan Oct 10, 2023
92f93fc
chore: Upgrading python requirements
farhan Oct 19, 2023
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 feedback/feedback.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
from xblock.core import XBlock
from xblock.fields import Scope, Integer, String, List, Float
from web_fragments.fragment import Fragment
from xblockutils.resources import ResourceLoader
from xblock.utils.resources import ResourceLoader

resource_loader = ResourceLoader(__name__)

Expand Down
3 changes: 1 addition & 2 deletions requirements/base.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
# Core requirements for using this package
-c constraints.txt

XBlock
xblock-utils
Xblock[django]
22 changes: 6 additions & 16 deletions requirements/base.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ appdirs==1.4.4
# via fs
asgiref==3.7.2
# via django
boto3==1.28.63
boto3==1.28.66
# via fs-s3fs
botocore==1.31.63
botocore==1.31.66
# via
# boto3
# s3transfer
Expand All @@ -34,9 +34,7 @@ lazy==1.6
lxml==4.9.3
# via xblock
mako==1.2.4
# via
# xblock
# xblock-utils
# via xblock
markupsafe==2.1.3
# via
# mako
Expand All @@ -56,9 +54,7 @@ pyyaml==6.0.1
s3transfer==0.7.0
# via boto3
simplejson==3.19.2
# via
# xblock
# xblock-utils
# via xblock
six==1.16.0
# via
# fs
Expand All @@ -68,19 +64,13 @@ sqlparse==0.4.4
# via django
typing-extensions==4.8.0
# via asgiref
urllib3==1.26.17
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
# via -r requirements/base.in

# The following packages are considered to be unsafe in a requirements file:
Expand Down
33 changes: 3 additions & 30 deletions requirements/ci.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@ binaryornot==0.4.4
# via
# -r requirements/test.txt
# cookiecutter
boto3==1.28.63
boto3==1.28.66
# via
# -r requirements/test.txt
# fs-s3fs
botocore==1.31.63
botocore==1.31.66
# via
# -r requirements/test.txt
# boto3
Expand All @@ -38,10 +38,6 @@ certifi==2023.7.22
# via
# -r requirements/test.txt
# requests
cffi==1.16.0
# via
# -r requirements/test.txt
# cryptography
chardet==5.2.0
# via
# -r requirements/test.txt
Expand Down Expand Up @@ -75,10 +71,6 @@ coverage==6.5.0
# coveralls
coveralls==3.3.1
# via -r requirements/test.txt
cryptography==41.0.4
# via
# -r requirements/test.txt
# secretstorage
ddt==1.6.0
# via -r requirements/test.txt
dill==0.3.7
Expand Down Expand Up @@ -150,11 +142,6 @@ jaraco-classes==3.3.0
# via
# -r requirements/test.txt
# keyring
jeepney==0.8.0
# via
# -r requirements/test.txt
# keyring
# secretstorage
jinja2==3.1.2
# via
# -r requirements/test.txt
Expand Down Expand Up @@ -186,7 +173,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 Down Expand Up @@ -251,10 +237,6 @@ py==1.11.0
# tox
pycodestyle==2.11.1
# via -r requirements/test.txt
pycparser==2.21
# via
# -r requirements/test.txt
# cffi
pygments==2.16.1
# via
# -r requirements/test.txt
Expand Down Expand Up @@ -341,16 +323,11 @@ s3transfer==0.7.0
# via
# -r requirements/test.txt
# boto3
secretstorage==3.3.3
# via
# -r requirements/test.txt
# keyring
simplejson==3.19.2
# via
# -r requirements/test.txt
# xblock
# xblock-sdk
# xblock-utils
six==1.16.0
# via
# -r requirements/test.txt
Expand Down Expand Up @@ -400,7 +377,7 @@ typing-extensions==4.8.0
# astroid
# pylint
# rich
urllib3==1.26.17
urllib3==1.26.18
# via
# -r requirements/test.txt
# botocore
Expand All @@ -415,7 +392,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 @@ -430,11 +406,8 @@ xblock[django]==1.8.1
# -r requirements/test.txt
# xblock
# 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
12 changes: 3 additions & 9 deletions requirements/dev.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ asgiref==3.7.2
# via
# -r requirements/base.txt
# django
boto3==1.28.63
boto3==1.28.66
# via
# -r requirements/base.txt
# fs-s3fs
botocore==1.31.63
botocore==1.31.66
# via
# -r requirements/base.txt
# boto3
Expand Down Expand Up @@ -56,7 +56,6 @@ mako==1.2.4
# via
# -r requirements/base.txt
# xblock
# xblock-utils
markupsafe==2.1.3
# via
# -r requirements/base.txt
Expand Down Expand Up @@ -93,7 +92,6 @@ simplejson==3.19.2
# via
# -r requirements/base.txt
# xblock
# xblock-utils
six==1.16.0
# via
# -r requirements/base.txt
Expand All @@ -108,15 +106,14 @@ typing-extensions==4.8.0
# via
# -r requirements/base.txt
# asgiref
urllib3==1.26.17
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
Expand All @@ -125,9 +122,6 @@ xblock[django]==1.8.1
# via
# -r requirements/base.txt
# xblock
# xblock-utils
xblock-utils==4.0.0
# via -r requirements/base.txt

# The following packages are considered to be unsafe in a requirements file:
# setuptools
12 changes: 3 additions & 9 deletions requirements/docs.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ babel==2.13.0
# sphinx
beautifulsoup4==4.12.2
# via pydata-sphinx-theme
boto3==1.28.63
boto3==1.28.66
# via
# -r requirements/base.txt
# fs-s3fs
botocore==1.31.63
botocore==1.31.66
# via
# -r requirements/base.txt
# boto3
Expand Down Expand Up @@ -78,7 +78,6 @@ mako==1.2.4
# via
# -r requirements/base.txt
# xblock
# xblock-utils
markupsafe==2.1.3
# via
# -r requirements/base.txt
Expand Down Expand Up @@ -125,7 +124,6 @@ simplejson==3.19.2
# via
# -r requirements/base.txt
# xblock
# xblock-utils
six==1.16.0
# via
# -r requirements/base.txt
Expand Down Expand Up @@ -164,7 +162,7 @@ typing-extensions==4.8.0
# -r requirements/base.txt
# asgiref
# pydata-sphinx-theme
urllib3==1.26.17
urllib3==1.26.18
# via
# -r requirements/base.txt
# botocore
Expand All @@ -173,7 +171,6 @@ web-fragments==2.1.0
# via
# -r requirements/base.txt
# xblock
# xblock-utils
webob==1.8.7
# via
# -r requirements/base.txt
Expand All @@ -182,9 +179,6 @@ xblock[django]==1.8.1
# via
# -r requirements/base.txt
# xblock
# xblock-utils
xblock-utils==4.0.0
# via -r requirements/base.txt
zipp==3.17.0
# via importlib-metadata

Expand Down
Loading