fix: parse_xml error during import

41e1795
In this commit:
- fix parse_xml error that occurs during importing a course that contains problem-builder component or during copying pasting the problem-builder component by removing unused & unsupported positional argument i.e. "id_generator".
- upgrade requirements especially "xblock[django]" to version "2.0.0" where this extra argument "id_generator" was removed.
    - With this requirement upgrade, also dropped support for django 3.2. due to conflicts in dependencies in CI.
        - ERROR: Cannot install Django<5.0 and >=4.2 and django==3.2.25 because these package versions have conflicting dependencies.
- update ubuntu version ro ubuntu-latest.
- update codecov actions to v5 in CI.

Note: This Change will be incompatible with Palm release of openedx.

Author: Muhammad Faraz Maqsood

.github/workflows/ci.yml

@@ -26,9 +26,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-20.04]
+        os: [ubuntu-latest]
         python-version: [3.8]
-        toxenv: [py38-django32, py38-django42, integration32, integration42, quality]
+        toxenv: [py38-django42, integration42, quality]
 
     steps:
     - name: checkout repo
@@ -54,9 +54,8 @@ jobs:
       run: tox
 
     - name: Run coverage
-      if: matrix.python-version == '3.8' && matrix.toxenv == 'py38-django32'
-      uses: codecov/codecov-action@v3
+      if: matrix.python-version == '3.8' && matrix.toxenv == 'py38-django42'
+      uses: codecov/codecov-action@v5
       with:
-        token: ${{ secrets.CODECOV_TOKEN }}
         flags: unittests
         fail_ci_if_error: true

.github/workflows/pypi-publish.yml

@@ -6,7 +6,7 @@ on:
 
 jobs:
   push:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
 
     steps:
       - name: Checkout

Makefile

@@ -59,7 +59,7 @@ test.unit: ## run all unit tests
 	tox -- $(TEST)
 
 test.integration: ## run all integration tests
-	tox -e integration -- $(TEST)
+	tox -e integration42 -- $(TEST)
 
 test: test.unit test.integration test.quality ## Run all tests
 

problem_builder/__init__.py

@@ -1 +1 @@
-__version__ = "5.1.4"
+__version__ = "5.1.5"

problem_builder/choice.py

@@ -133,7 +133,7 @@ def get_template(cls, template_id):
         return {'metadata': {}, 'data': {}}
 
     @classmethod
-    def parse_xml(cls, node, runtime, keys, id_generator):
+    def parse_xml(cls, node, runtime, keys):
         """
         Construct this XBlock from the given XML node.
         """

problem_builder/message.py

@@ -150,7 +150,7 @@ def get_template(cls, template_id):
         }}
 
     @classmethod
-    def parse_xml(cls, node, runtime, keys, id_generator):
+    def parse_xml(cls, node, runtime, keys):
         """
         Construct this XBlock from the given XML node.
         """

problem_builder/tip.py

@@ -131,7 +131,7 @@ def add_error(msg):
                 add_error(self._("A choice selected for this tip does not exist."))
 
     @classmethod
-    def parse_xml(cls, node, runtime, keys, id_generator):
+    def parse_xml(cls, node, runtime, keys):
         """
         Construct this XBlock from the given XML node.
         """

problem_builder/v1/studio_xml_utils.py

@@ -53,7 +53,7 @@ def create_block_from_node(self, node):
         usage_id = self.id_generator.create_usage(def_id)
         keys = ScopeIds(None, block_type, def_id, usage_id)
         block_class = self.mixologist.mix(self.load_block_type(block_type))
-        block = block_class.parse_xml(node, self, keys, self.id_generator)
+        block = block_class.parse_xml(node, self, keys)
         block.save()
         return block
 

problem_builder/v1/tests/test_upgrade.py

@@ -88,7 +88,7 @@ def create_block_from_node(self, node):
         usage_id = self.runtime.id_generator.create_usage(def_id)
         keys = ScopeIds(None, block_type, def_id, usage_id)
         block_class = self.runtime.mixologist.mix(self.runtime.load_block_type(block_type))
-        block = block_class.parse_xml(node, self.runtime, keys, self.runtime.id_generator)
+        block = block_class.parse_xml(node, self.runtime, keys)
         block.save()
         return block
 

problem_builder/v1/upgrade.py

@@ -70,7 +70,7 @@ def upgrade_block(store, block, from_version="v1"):
         pass  # Perhaps HtmlModule has been converted to an XBlock?
     else:
         @classmethod
-        def parse_xml_for_HtmlDescriptor(cls, node, runtime, keys, id_generator):
+        def parse_xml_for_HtmlDescriptor(cls, node, runtime, keys):
             block = runtime.construct_xblock_from_class(cls, keys)
             block.data = node.text if node.text else ""
             for child in list(node):