From 8d4f115eb57b6111b59fd17a81005134861b9fa1 Mon Sep 17 00:00:00 2001 From: Aarif Date: Wed, 1 Jul 2020 04:36:54 +0500 Subject: [PATCH] removed deprecated usage of xblock.fragment --- recommender/recommender.py | 4 ++-- requirements/base.in | 1 + requirements/base.txt | 9 +++++---- requirements/pip_tools.txt | 4 ++-- requirements/test.txt | 11 ++++++----- requirements/travis.txt | 11 ++++++----- setup.py | 2 +- 7 files changed, 23 insertions(+), 19 deletions(-) diff --git a/recommender/recommender.py b/recommender/recommender.py index 15cf914..fcf882b 100644 --- a/recommender/recommender.py +++ b/recommender/recommender.py @@ -23,7 +23,7 @@ from xblock.core import XBlock from xblock.exceptions import JsonHandlerError from xblock.fields import Scope, List, Dict, Boolean, String, JSONField -from xblock.fragment import Fragment +from web_fragments.fragment import Fragment from xblock.reference.plugins import Filesystem # TODO: Should be updated once XBlocks and tracking logs have finalized APIs @@ -1049,7 +1049,7 @@ def workbench_scenarios(): ] @classmethod - def parse_xml(cls, node, runtime, keys, _id_generator): # pylint: disable=unused-argument + def parse_xml(cls, node, runtime, keys): """ Parse the XML for the XBlock. It is a list of dictionaries of default recommendations. diff --git a/requirements/base.in b/requirements/base.in index 7ab2fc8..f8fbddc 100644 --- a/requirements/base.in +++ b/requirements/base.in @@ -8,3 +8,4 @@ fs mako simplejson webob +web_fragments diff --git a/requirements/base.txt b/requirements/base.txt index 3d2b582..b77a0ee 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -4,18 +4,19 @@ # # make upgrade # -appdirs==1.4.3 # via fs +appdirs==1.4.4 # via fs bleach==3.1.5 # via -r requirements/base.in boto==2.49.0 # via -r requirements/base.in fs==2.4.11 # via -r requirements/base.in -mako==1.1.2 # via -r requirements/base.in +mako==1.1.3 # via -r requirements/base.in markupsafe==1.1.1 # via mako -packaging==20.3 # via bleach +packaging==20.4 # via bleach pyparsing==2.4.7 # via packaging pytz==2020.1 # via fs simplejson==3.17.0 # via -r requirements/base.in -six==1.14.0 # via bleach, fs, packaging +six==1.15.0 # via bleach, fs, packaging typing==3.7.4.1 # via fs +web-fragments==0.3.2 # via -r requirements/base.in webencodings==0.5.1 # via bleach webob==1.8.6 # via -r requirements/base.in diff --git a/requirements/pip_tools.txt b/requirements/pip_tools.txt index 937f1d6..279019f 100644 --- a/requirements/pip_tools.txt +++ b/requirements/pip_tools.txt @@ -5,8 +5,8 @@ # make upgrade # click==7.1.2 # via pip-tools -pip-tools==5.1.2 # via -r requirements/pip_tools.in -six==1.14.0 # via pip-tools +pip-tools==5.2.1 # via -r requirements/pip_tools.in +six==1.15.0 # via pip-tools # The following packages are considered to be unsafe in a requirements file: # pip diff --git a/requirements/test.txt b/requirements/test.txt index 4a768c9..ec1702b 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -4,19 +4,20 @@ # # make upgrade # -appdirs==1.4.3 # via -r requirements/base.txt, fs +appdirs==1.4.4 # via -r requirements/base.txt, fs bleach==3.1.5 # via -r requirements/base.txt boto==2.49.0 # via -r requirements/base.txt fs==2.4.11 # via -r requirements/base.txt -mako==1.1.2 # via -r requirements/base.txt +mako==1.1.3 # via -r requirements/base.txt markupsafe==1.1.1 # via -r requirements/base.txt, mako -packaging==20.3 # via -r requirements/base.txt, bleach -pycodestyle==2.5.0 # via -r requirements/test.in +packaging==20.4 # via -r requirements/base.txt, bleach +pycodestyle==2.6.0 # via -r requirements/test.in pyparsing==2.4.7 # via -r requirements/base.txt, packaging pytz==2020.1 # via -r requirements/base.txt, fs simplejson==3.17.0 # via -r requirements/base.txt -six==1.14.0 # via -r requirements/base.txt, bleach, fs, packaging +six==1.15.0 # via -r requirements/base.txt, bleach, fs, packaging typing==3.7.4.1 # via -r requirements/base.txt, fs +web-fragments==0.3.2 # via -r requirements/base.txt webencodings==0.5.1 # via -r requirements/base.txt, bleach webob==1.8.6 # via -r requirements/base.txt diff --git a/requirements/travis.txt b/requirements/travis.txt index 9bd555f..3d8677e 100644 --- a/requirements/travis.txt +++ b/requirements/travis.txt @@ -4,19 +4,20 @@ # # make upgrade # -appdirs==1.4.3 # via -r requirements/test.txt, fs +appdirs==1.4.4 # via -r requirements/test.txt, fs bleach==3.1.5 # via -r requirements/test.txt boto==2.49.0 # via -r requirements/test.txt fs==2.4.11 # via -r requirements/test.txt -mako==1.1.2 # via -r requirements/test.txt +mako==1.1.3 # via -r requirements/test.txt markupsafe==1.1.1 # via -r requirements/test.txt, mako -packaging==20.3 # via -r requirements/test.txt, bleach -pycodestyle==2.5.0 # via -r requirements/test.txt +packaging==20.4 # via -r requirements/test.txt, bleach +pycodestyle==2.6.0 # via -r requirements/test.txt pyparsing==2.4.7 # via -r requirements/test.txt, packaging pytz==2020.1 # via -r requirements/test.txt, fs simplejson==3.17.0 # via -r requirements/test.txt -six==1.14.0 # via -r requirements/test.txt, bleach, fs, packaging +six==1.15.0 # via -r requirements/test.txt, bleach, fs, packaging typing==3.7.4.1 # via -r requirements/test.txt, fs +web-fragments==0.3.2 # via -r requirements/test.txt webencodings==0.5.1 # via -r requirements/test.txt, bleach webob==1.8.6 # via -r requirements/test.txt diff --git a/setup.py b/setup.py index 5785576..a15a4b6 100644 --- a/setup.py +++ b/setup.py @@ -47,7 +47,7 @@ def package_data(pkg, root_list): setup( name='recommender-xblock', - version='1.4.8', + version='1.4.9', description='recommender XBlock', # TODO: write a better description. long_description=README, author='edX',