Merge pull request #108 from salman2013/salman/remove-bok-choy

chore: remove bok-choy usage
openedx · Nov 6, 2023 · c930c52 · c930c52
2 parents 6b35f7f + f7040f4
commit c930c52
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 109 deletions.
diff --git a/image_explorer/utils.py b/image_explorer/utils.py
@@ -27,7 +27,10 @@
 
 import logging
 
-from xblockutils.resources import ResourceLoader
+try:
+    from xblock.utils.resources import ResourceLoader
+except ModuleNotFoundError:
+    from xblockutils.resources import ResourceLoader
 
 
 log = logging.getLogger(__name__)

diff --git a/setup.py b/setup.py
@@ -23,7 +23,7 @@ def package_data(pkg, root_list):
 
 setup(
     name='xblock-image-explorer',
-    version='2.0',
+    version='2.1.0',
     description='XBlock - Image Explorer',
     packages=['image_explorer'],
     install_requires=[

diff --git a/test_requirements.txt b/test_requirements.txt
@@ -1,4 +1,3 @@
-bok-choy==1.1.1
 edx-lint==5.3.2
 mock==5.0.1
 pytest==7.2.1

diff --git a/tests/integration/test_image_explorer.py b/tests/integration/test_image_explorer.py