diff --git a/recommender/recommender.py b/recommender/recommender.py index 38f9157..6a81552 100644 --- a/recommender/recommender.py +++ b/recommender/recommender.py @@ -24,7 +24,7 @@ from xblock.fields import Scope, List, Dict, Boolean, String, JSONField from web_fragments.fragment import Fragment from xblock.reference.plugins import Filesystem -from xblockutils.resources import ResourceLoader +from xblock.utils.resources import ResourceLoader # TODO: Should be updated once XBlocks and tracking logs have finalized APIs # and documentation. diff --git a/requirements/base.in b/requirements/base.in index 7a8fbb9..b58a305 100644 --- a/requirements/base.in +++ b/requirements/base.in @@ -9,3 +9,4 @@ simplejson webob web_fragments edx-i18n-tools +xblock \ No newline at end of file diff --git a/requirements/base.txt b/requirements/base.txt index ea40e4d..520aa57 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.9 # by the following command: # # make upgrade @@ -8,47 +8,69 @@ appdirs==1.4.4 # via fs asgiref==3.8.1 # via django -backports-zoneinfo==0.2.1 ; python_version < "3.9" - # via - # -c requirements/constraints.txt - # django bleach==6.1.0 # via -r requirements/base.in -django==4.2.11 +django==4.2.14 # via # -c requirements/common_constraints.txt # edx-i18n-tools -edx-i18n-tools==1.3.0 +edx-i18n-tools==1.6.0 # via -r requirements/base.in fs==2.4.16 - # via -r requirements/base.in -lxml==5.1.0 - # via edx-i18n-tools -mako==1.3.2 - # via -r requirements/base.in + # via + # -r requirements/base.in + # xblock +lxml[html-clean,html_clean]==5.2.2 + # via + # edx-i18n-tools + # lxml-html-clean + # xblock +lxml-html-clean==0.1.1 + # via lxml +mako==1.3.5 + # via + # -r requirements/base.in + # xblock markupsafe==2.1.5 - # via mako -path==16.10.0 + # via + # mako + # xblock +path==16.14.0 # via edx-i18n-tools polib==1.2.0 # via edx-i18n-tools +python-dateutil==2.9.0.post0 + # via xblock +pytz==2024.1 + # via xblock pyyaml==6.0.1 - # via edx-i18n-tools + # via + # edx-i18n-tools + # xblock simplejson==3.19.2 - # via -r requirements/base.in + # via + # -r requirements/base.in + # xblock six==1.16.0 # via # bleach # fs -sqlparse==0.4.4 + # python-dateutil +sqlparse==0.5.1 # via django -typing-extensions==4.10.0 +typing-extensions==4.12.2 # via asgiref -web-fragments==2.1.0 - # via -r requirements/base.in +web-fragments==2.2.0 + # via + # -r requirements/base.in + # xblock webencodings==0.5.1 # via bleach webob==1.8.7 + # via + # -r requirements/base.in + # xblock +xblock==5.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 index 28a82f2..1afd47f 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.9 # by the following command: # # make upgrade @@ -12,33 +12,39 @@ asgiref==3.8.1 # via # -r requirements/test.txt # django -backports-zoneinfo==0.2.1 ; python_version < "3.9" - # via - # -c requirements/constraints.txt - # -r requirements/test.txt - # django bleach==6.1.0 # via -r requirements/test.txt -django==4.2.11 +django==4.2.14 # via # -c requirements/common_constraints.txt # -r requirements/test.txt # edx-i18n-tools -edx-i18n-tools==1.3.0 +edx-i18n-tools==1.6.0 # via -r requirements/test.txt fs==2.4.16 - # via -r requirements/test.txt -lxml==5.1.0 + # via + # -r requirements/test.txt + # xblock +lxml[html-clean]==5.2.2 # via # -r requirements/test.txt # edx-i18n-tools -mako==1.3.2 - # via -r requirements/test.txt + # lxml-html-clean + # xblock +lxml-html-clean==0.1.1 + # via + # -r requirements/test.txt + # lxml +mako==1.3.5 + # via + # -r requirements/test.txt + # xblock markupsafe==2.1.5 # via # -r requirements/test.txt # mako -path==16.10.0 + # xblock +path==16.14.0 # via # -r requirements/test.txt # edx-i18n-tools @@ -46,34 +52,52 @@ polib==1.2.0 # via # -r requirements/test.txt # edx-i18n-tools -pycodestyle==2.11.1 +pycodestyle==2.12.0 # via -r requirements/test.txt +python-dateutil==2.9.0.post0 + # via + # -r requirements/test.txt + # xblock +pytz==2024.1 + # via + # -r requirements/test.txt + # xblock pyyaml==6.0.1 # via # -r requirements/test.txt # edx-i18n-tools + # xblock simplejson==3.19.2 - # via -r requirements/test.txt + # via + # -r requirements/test.txt + # xblock six==1.16.0 # via # -r requirements/test.txt # bleach # fs -sqlparse==0.4.4 + # python-dateutil +sqlparse==0.5.1 # via # -r requirements/test.txt # django -typing-extensions==4.10.0 +typing-extensions==4.12.2 # via # -r requirements/test.txt # asgiref -web-fragments==2.1.0 - # via -r requirements/test.txt +web-fragments==2.2.0 + # via + # -r requirements/test.txt + # xblock webencodings==0.5.1 # via # -r requirements/test.txt # bleach webob==1.8.7 + # via + # -r requirements/test.txt + # xblock +xblock==5.0.0 # via -r requirements/test.txt # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/pip.txt b/requirements/pip.txt index cf44902..9ef0a77 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.9 # by the following command: # # make upgrade @@ -8,7 +8,7 @@ wheel==0.43.0 # via -r requirements/pip.in # The following packages are considered to be unsafe in a requirements file: -pip==24.0 +pip==24.1.2 # via -r requirements/pip.in -setuptools==69.2.0 +setuptools==71.1.0 # via -r requirements/pip.in diff --git a/requirements/pip_tools.txt b/requirements/pip_tools.txt index 3db2d4c..22d70da 100644 --- a/requirements/pip_tools.txt +++ b/requirements/pip_tools.txt @@ -1,10 +1,10 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.9 # by the following command: # # make upgrade # -build==1.1.1 +build==1.2.1 # via pip-tools click==8.1.7 # via pip-tools @@ -12,11 +12,11 @@ importlib-metadata==6.11.0 # via # -c requirements/common_constraints.txt # build -packaging==24.0 +packaging==24.1 # via build pip-tools==7.4.1 # via -r requirements/pip_tools.in -pyproject-hooks==1.0.0 +pyproject-hooks==1.1.0 # via # build # pip-tools @@ -24,10 +24,9 @@ tomli==2.0.1 # via # build # pip-tools - # pyproject-hooks wheel==0.43.0 # via pip-tools -zipp==3.18.1 +zipp==3.19.2 # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/test.txt b/requirements/test.txt index 28d048c..e6ab08d 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.9 # by the following command: # # make upgrade @@ -12,33 +12,39 @@ asgiref==3.8.1 # via # -r requirements/base.txt # django -backports-zoneinfo==0.2.1 ; python_version < "3.9" - # via - # -c requirements/constraints.txt - # -r requirements/base.txt - # django bleach==6.1.0 # via -r requirements/base.txt -django==4.2.11 +django==4.2.14 # via # -c requirements/common_constraints.txt # -r requirements/base.txt # edx-i18n-tools -edx-i18n-tools==1.3.0 +edx-i18n-tools==1.6.0 # via -r requirements/base.txt fs==2.4.16 - # via -r requirements/base.txt -lxml==5.1.0 + # via + # -r requirements/base.txt + # xblock +lxml[html-clean]==5.2.2 # via # -r requirements/base.txt # edx-i18n-tools -mako==1.3.2 - # via -r requirements/base.txt + # lxml-html-clean + # xblock +lxml-html-clean==0.1.1 + # via + # -r requirements/base.txt + # lxml +mako==1.3.5 + # via + # -r requirements/base.txt + # xblock markupsafe==2.1.5 # via # -r requirements/base.txt # mako -path==16.10.0 + # xblock +path==16.14.0 # via # -r requirements/base.txt # edx-i18n-tools @@ -46,34 +52,52 @@ polib==1.2.0 # via # -r requirements/base.txt # edx-i18n-tools -pycodestyle==2.11.1 +pycodestyle==2.12.0 # via -r requirements/test.in +python-dateutil==2.9.0.post0 + # via + # -r requirements/base.txt + # xblock +pytz==2024.1 + # via + # -r requirements/base.txt + # xblock pyyaml==6.0.1 # via # -r requirements/base.txt # edx-i18n-tools + # xblock simplejson==3.19.2 - # via -r requirements/base.txt + # via + # -r requirements/base.txt + # xblock six==1.16.0 # via # -r requirements/base.txt # bleach # fs -sqlparse==0.4.4 + # python-dateutil +sqlparse==0.5.1 # via # -r requirements/base.txt # django -typing-extensions==4.10.0 +typing-extensions==4.12.2 # via # -r requirements/base.txt # asgiref -web-fragments==2.1.0 - # via -r requirements/base.txt +web-fragments==2.2.0 + # via + # -r requirements/base.txt + # xblock webencodings==0.5.1 # via # -r requirements/base.txt # bleach webob==1.8.7 + # via + # -r requirements/base.txt + # xblock +xblock==5.0.0 # via -r requirements/base.txt # The following packages are considered to be unsafe in a requirements file: