Skip to content

Commit

Permalink
Merge pull request #205 from farhan/farhan/remove-xblock-utils
Browse files Browse the repository at this point in the history 
Migrate from xblock-utils package to xblock.utils
  • Loading branch information
Feanil Patel authored Nov 6, 2023
2 parents e494f3f + b5403da commit 95f375d
Show file tree
Hide file tree
Showing 10 changed files with 31 additions and 150 deletions.
1 change: 0 additions & 1 deletion requirements/base.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,3 @@ markdown
path.py
web-fragments
XBlock
xblock-utils
44 changes: 5 additions & 39 deletions requirements/base.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,6 @@ backports-zoneinfo[tzdata]==0.2.1
# kombu
billiard==4.1.0
# via celery
boto3==1.28.68
# via fs-s3fs
botocore==1.31.68
# via
# boto3
# s3transfer
celery==5.3.4
# via edx-celeryutils
certifi==2023.7.22
Expand Down Expand Up @@ -54,7 +48,6 @@ django==3.2.22
# edx-celeryutils
# edx-django-utils
# jsonfield
# openedx-django-pyfs
# super-csv
django-crum==0.7.9
# via
Expand All @@ -78,32 +71,19 @@ edx-django-utils==5.7.0
edx-opaque-keys==2.5.1
# via edx-bulk-grades
fs==2.4.16
# via
# fs-s3fs
# openedx-django-pyfs
# xblock
fs-s3fs==1.1.1
# via openedx-django-pyfs
# via xblock
idna==3.4
# via requests
importlib-metadata==6.8.0
# via markdown
jmespath==1.0.1
# via
# boto3
# botocore
jsonfield==3.1.0
# via edx-celeryutils
kombu==5.3.2
# via celery
lazy==1.6
# via xblock
lxml==4.9.3
# via xblock
mako==1.2.4
# via
# xblock
# xblock-utils
# via xblock
markdown==3.5
# via -r requirements/base.in
markupsafe==2.1.3
Expand All @@ -112,8 +92,6 @@ markupsafe==2.1.3
# xblock
newrelic==9.1.1
# via edx-django-utils
openedx-django-pyfs==3.4.0
# via xblock
path==16.7.1
# via path-py
path-py==12.5.0
Expand All @@ -132,7 +110,6 @@ pynacl==1.5.0
# via edx-django-utils
python-dateutil==2.8.2
# via
# botocore
# celery
# xblock
pytz==2023.3.post1
Expand All @@ -146,17 +123,13 @@ requests==2.31.0
# via
# edx-bulk-grades
# slumber
s3transfer==0.7.0
# via boto3
simplejson==3.19.2
# via
# super-csv
# xblock
# xblock-utils
six==1.16.0
# via
# fs
# fs-s3fs
# python-dateutil
slumber==0.7.1
# via edx-bulk-grades
Expand All @@ -177,10 +150,8 @@ tzdata==2023.3
# via
# backports-zoneinfo
# celery
urllib3==1.26.18
# via
# botocore
# requests
urllib3==2.0.7
# via requests
vine==5.0.0
# via
# amqp
Expand All @@ -192,14 +163,9 @@ web-fragments==2.1.0
# via
# -r requirements/base.in
# xblock
# xblock-utils
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
zipp==3.17.0
# via importlib-metadata
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 @@ -8,7 +8,7 @@ distlib==0.3.7
# via
# -r requirements/tox.txt
# virtualenv
filelock==3.12.4
filelock==3.13.0
# via
# -r requirements/tox.txt
# tox
Expand Down Expand Up @@ -42,7 +42,7 @@ tox==3.28.0
# via
# -c requirements/common_constraints.txt
# -r requirements/tox.txt
virtualenv==20.24.5
virtualenv==20.24.6
# via
# -r requirements/tox.txt
# tox
60 changes: 8 additions & 52 deletions requirements/dev.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,6 @@ billiard==4.1.0
# via
# -r requirements/base.txt
# celery
boto3==1.28.68
# via
# -r requirements/base.txt
# fs-s3fs
botocore==1.31.68
# via
# -r requirements/base.txt
# boto3
# s3transfer
build==1.0.3
# via pip-tools
celery==5.3.4
Expand Down Expand Up @@ -110,7 +101,6 @@ django==3.2.22
# edx-django-utils
# edx-i18n-tools
# jsonfield
# openedx-django-pyfs
# super-csv
django-appconf==1.0.5
# via django-statici18n
Expand Down Expand Up @@ -149,29 +139,23 @@ edx-django-utils==5.7.0
# super-csv
edx-i18n-tools==1.3.0
# via -r requirements/dev.in
edx-lint==5.3.4
edx-lint==5.3.6
# via -r requirements/test.in
edx-opaque-keys==2.5.1
# via
# -r requirements/base.txt
# edx-bulk-grades
exceptiongroup==1.1.3
# via pytest
filelock==3.12.4
filelock==3.13.0
# via
# -r requirements/tox.txt
# tox
# virtualenv
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
idna==3.4
# via
# -r requirements/base.txt
Expand All @@ -187,11 +171,6 @@ isort==5.12.0
# via pylint
jinja2==3.1.2
# via code-annotations
jmespath==1.0.1
# via
# -r requirements/base.txt
# boto3
# botocore
jsonfield==3.1.0
# via
# -r requirements/base.txt
Expand All @@ -200,10 +179,6 @@ kombu==5.3.2
# via
# -r requirements/base.txt
# celery
lazy==1.6
# via
# -r requirements/base.txt
# xblock
lxml==4.9.3
# via
# -r requirements/base.txt
Expand All @@ -213,7 +188,6 @@ mako==1.2.4
# via
# -r requirements/base.txt
# xblock
# xblock-utils
markdown==3.5
# via
# -r requirements/base.in
Expand All @@ -230,10 +204,6 @@ newrelic==9.1.1
# via
# -r requirements/base.txt
# edx-django-utils
openedx-django-pyfs==3.4.0
# via
# -r requirements/base.txt
# xblock
packaging==23.2
# via
# -r requirements/tox.txt
Expand Down Expand Up @@ -291,7 +261,7 @@ pylint==3.0.2
# pylint-plugin-utils
pylint-celery==0.3
# via edx-lint
pylint-django==2.5.4
pylint-django==2.5.5
# via edx-lint
pylint-plugin-utils==0.8.2
# via
Expand All @@ -307,14 +277,13 @@ pynacl==1.5.0
# edx-django-utils
pyproject-hooks==1.0.0
# via build
pytest==7.4.2
pytest==7.4.3
# via pytest-cov
pytest-cov==4.1.0
# via -r requirements/test.in
python-dateutil==2.8.2
# via
# -r requirements/base.txt
# botocore
# celery
# xblock
python-slugify==8.0.1
Expand All @@ -336,24 +305,18 @@ requests==2.31.0
# -r requirements/base.txt
# edx-bulk-grades
# slumber
s3transfer==0.7.0
# via
# -r requirements/base.txt
# boto3
simplejson==3.19.2
# via
# -r requirements/base.txt
# super-csv
# xblock
# xblock-utils
six==1.16.0
# via
# -r requirements/base.txt
# -r requirements/ci.in
# -r requirements/tox.txt
# edx-lint
# fs
# fs-s3fs
# python-dateutil
# tox
slumber==0.7.1
Expand Down Expand Up @@ -406,18 +369,17 @@ tzdata==2023.3
# -r requirements/base.txt
# backports-zoneinfo
# celery
urllib3==1.26.18
urllib3==2.0.7
# via
# -r requirements/base.txt
# botocore
# requests
vine==5.0.0
# via
# -r requirements/base.txt
# amqp
# celery
# kombu
virtualenv==20.24.5
virtualenv==20.24.6
# via
# -r requirements/tox.txt
# tox
Expand All @@ -430,19 +392,13 @@ web-fragments==2.1.0
# -r requirements/base.in
# -r requirements/base.txt
# xblock
# xblock-utils
webob==1.8.7
# via
# -r requirements/base.txt
# xblock
wheel==0.41.2
wheel==0.41.3
# via pip-tools
xblock[django]==1.8.1
# via
# -r requirements/base.in
# -r requirements/base.txt
# xblock-utils
xblock-utils==4.0.0
xblock==1.8.1
# via
# -r requirements/base.in
# -r requirements/base.txt
Expand Down
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
Loading

0 comments on commit 95f375d

Please sign in to comment.