diff --git a/openassessment/__init__.py b/openassessment/__init__.py index d4ff9301d8..c43f9c9e3f 100644 --- a/openassessment/__init__.py +++ b/openassessment/__init__.py @@ -2,4 +2,4 @@ Initialization Information for Open Assessment Module """ -__version__ = '6.6.0' +__version__ = '6.6.1' diff --git a/openassessment/xblock/openassessmentblock.py b/openassessment/xblock/openassessmentblock.py index 0d4d33b730..21d31ec1cf 100644 --- a/openassessment/xblock/openassessmentblock.py +++ b/openassessment/xblock/openassessmentblock.py @@ -895,7 +895,7 @@ def workbench_scenarios(): ] @classmethod - def parse_xml(cls, node, runtime, keys, id_generator): + def parse_xml(cls, node, runtime, keys): """Instantiate XBlock object from runtime XML definition. Inherited by XBlock core. diff --git a/openassessment/xblock/test/base.py b/openassessment/xblock/test/base.py index 393bba2281..43a23c325a 100644 --- a/openassessment/xblock/test/base.py +++ b/openassessment/xblock/test/base.py @@ -184,9 +184,7 @@ def load_scenario(self, xml_path): Returns: XBlock """ - block_id = self.runtime.parse_xml_string( - self.load_fixture_str(xml_path), self.runtime.id_generator - ) + block_id = self.runtime.parse_xml_string(self.load_fixture_str(xml_path)) return self.runtime.get_block(block_id) def request( diff --git a/openassessment/xblock/test/test_export_import.py b/openassessment/xblock/test/test_export_import.py index 2202474ae9..cd0df1c1aa 100644 --- a/openassessment/xblock/test/test_export_import.py +++ b/openassessment/xblock/test/test_export_import.py @@ -22,7 +22,7 @@ def test_export_import(self, xblock): self.runtime.export_to_xml(xblock, output_buffer) # Re-import the XBlock - block_id = self.runtime.parse_xml_string(output_buffer.getvalue(), self.runtime.id_generator) + block_id = self.runtime.parse_xml_string(output_buffer.getvalue()) new_block = self.runtime.get_block(block_id) # Check that the values of all fields are the same @@ -39,7 +39,7 @@ def test_teams_export_import(self, xblock): self.runtime.export_to_xml(xblock, output_buffer) # Re-import the XBlock - block_id = self.runtime.parse_xml_string(output_buffer.getvalue(), self.runtime.id_generator) + block_id = self.runtime.parse_xml_string(output_buffer.getvalue()) new_block = self.runtime.get_block(block_id) # Check that we've loaded exported team settings correctly diff --git a/requirements/base.txt b/requirements/base.txt index 50605463b6..e973b2207e 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -105,7 +105,7 @@ loremipsum==1.0.5 # via # -c requirements/constraints.txt # -r requirements/base.in -lxml==5.1.0 +lxml==4.9.4 # via # -r requirements/base.in # edx-i18n-tools @@ -203,10 +203,8 @@ webencodings==0.5.1 # html5lib webob==1.8.7 # via xblock -xblock==1.10.0 - # via - # -c requirements/constraints.txt - # -r requirements/base.in +xblock==2.0.0 + # via -r requirements/base.in # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/requirements/constraints.txt b/requirements/constraints.txt index 6f183d2e77..74bc4aab53 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -31,8 +31,7 @@ setuptools<60.0 # incremental upgrade plan. django-simple-history<=3.1.1 -# xblock==1.10.0 upgrade causes test failures which need to be fixed separately -xblock==1.10.0 +lxml<5.0.0 # xblock-sdk # backports.zoneinfo is only needed for Python < 3.9 backports.zoneinfo; python_version<'3.9' diff --git a/requirements/quality.txt b/requirements/quality.txt index ac0bc2e1e2..0d51dd80c5 100644 --- a/requirements/quality.txt +++ b/requirements/quality.txt @@ -253,7 +253,7 @@ loremipsum==1.0.5 # via # -c requirements/constraints.txt # -r requirements/test.txt -lxml==5.1.0 +lxml==4.9.4 # via # -r requirements/test.txt # edx-i18n-tools @@ -542,12 +542,17 @@ werkzeug==3.0.1 # via # -r requirements/test.txt # moto -xblock==1.10.0 +wrapt==1.11.2 + # via + # -c requirements/constraints.txt + # -r requirements/test.txt + # aws-xray-sdk +xblock==2.0.0 # via # -c requirements/constraints.txt # -r requirements/test.txt # xblock-sdk -xblock-sdk==0.7.0 +xblock-sdk==0.9.0 # via -r requirements/test.txt xmltodict==0.13.0 # via diff --git a/requirements/test-acceptance.txt b/requirements/test-acceptance.txt index 96a4011249..719e13509d 100644 --- a/requirements/test-acceptance.txt +++ b/requirements/test-acceptance.txt @@ -239,7 +239,7 @@ loremipsum==1.0.5 # via # -c requirements/constraints.txt # -r requirements/test.txt -lxml==5.1.0 +lxml==4.9.4 # via # -r requirements/test.txt # edx-i18n-tools @@ -506,12 +506,17 @@ werkzeug==3.0.1 # via # -r requirements/test.txt # moto -xblock==1.10.0 +wrapt==1.11.2 + # via + # -c requirements/constraints.txt + # -r requirements/test.txt + # aws-xray-sdk +xblock==2.0.0 # via # -c requirements/constraints.txt # -r requirements/test.txt # xblock-sdk -xblock-sdk==0.7.0 +xblock-sdk==0.9.0 # via -r requirements/test.txt xmltodict==0.13.0 # via diff --git a/requirements/test.txt b/requirements/test.txt index bf3c713d13..76d02d271e 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -201,7 +201,7 @@ loremipsum==1.0.5 # via # -c requirements/constraints.txt # -r requirements/base.txt -lxml==5.1.0 +lxml==4.9.4 # via # -r requirements/base.txt # edx-i18n-tools @@ -435,12 +435,16 @@ webob==1.8.7 # xblock-sdk werkzeug==3.0.1 # via moto -xblock==1.10.0 +wrapt==1.11.2 + # via + # -c requirements/constraints.txt + # aws-xray-sdk +xblock==2.0.0 # via # -c requirements/constraints.txt # -r requirements/base.txt # xblock-sdk -xblock-sdk==0.7.0 +xblock-sdk==0.9.0 # via -r requirements/test.in xmltodict==0.13.0 # via moto