Skip to content

Commit

Permalink
Merge pull request #20 from edx/BOM-1861
Browse files Browse the repository at this point in the history
Replaced deprecated usage of xblock fragment with web_fragment
  • Loading branch information
awais786 authored Jul 10, 2020
2 parents 1f7c465 + 8d4f115 commit 3eaddb7
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 18 deletions.
4 changes: 2 additions & 2 deletions recommender/recommender.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -1055,7 +1055,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.
Expand Down
1 change: 1 addition & 0 deletions requirements/base.in
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@ fs
mako
simplejson
webob
web_fragments
9 changes: 5 additions & 4 deletions requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions requirements/pip_tools.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
11 changes: 6 additions & 5 deletions requirements/test.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
11 changes: 6 additions & 5 deletions requirements/travis.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 3eaddb7

Please sign in to comment.