Merge pull request #458 from Faraz32123/fix/parse_xml_error_during_import

fix: parse_xml error during import

Author: Agrendalath

.github/workflows/ci.yml

@@ -15,27 +15,19 @@ concurrency:
 jobs:
   tests:
     runs-on: ${{ matrix.os }}
-    services:
-      # Using SQLite3 for integration tests throws `django.db.utils.OperationalError: database table is locked: workbench_xblockstate`.
-      mysql:
-        image: mysql:8
-        env:
-          MYSQL_ROOT_PASSWORD: rootpw
-        ports:
-          - 3307:3306
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-20.04]
-        python-version: [3.8]
-        toxenv: [py38-django32, py38-django42, integration32, integration42, quality]
+        os: [ubuntu-latest]
+        python-version: [3.11, 3.12]
+        toxenv: [django42, django52, quality]
 
     steps:
     - name: checkout repo
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: setup python
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
 
@@ -54,8 +46,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.11' && matrix.toxenv == 'django42'
+      uses: codecov/codecov-action@v5
       with:
         token: ${{ secrets.CODECOV_TOKEN }}
         flags: unittests

.github/workflows/pypi-publish.yml

@@ -6,16 +6,16 @@ on:
 
 jobs:
   push:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: setup python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
-          python-version: 3.8
+          python-version: 3.11
 
       - name: Install Dependencies
         run: pip install -r requirements/pip.txt

.gitignore

@@ -1,6 +1,8 @@
 *~
 *.pyc
-/.coverage*
+.coverage
+.coverage.*
+coverage.xml
 /xblock_problem_builder.egg-info
 /workbench*
 /dist

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
 

codecov.yml

@@ -0,0 +1,6 @@
+coverage:
+  status:
+    project:
+      default:
+        target: auto
+        threshold: 0.1%

problem_builder/__init__.py

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

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