Merge pull request #25 from openedx/farhan/remove-xblockutils

refactor: remove xblock-utils package
openedx · Oct 19, 2023 · 8e75dfd · 8e75dfd
2 parents c5ff627 + 92f93fc
commit 8e75dfd
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 112 deletions.
diff --git a/feedback/feedback.py b/feedback/feedback.py
@@ -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__)
 

diff --git a/requirements/base.in b/requirements/base.in
@@ -1,5 +1,4 @@
 # Core requirements for using this package
 -c constraints.txt
 
-XBlock
-xblock-utils
+Xblock[django]
diff --git a/requirements/base.txt b/requirements/base.txt
@@ -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
@@ -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
@@ -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
@@ -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:

diff --git a/requirements/ci.txt b/requirements/ci.txt
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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

diff --git a/requirements/dev.txt b/requirements/dev.txt
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git a/requirements/docs.txt b/requirements/docs.txt
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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