Merge branch 'release/5.0.1'

uccser · Oct 17, 2022 · 70e3e8b · 70e3e8b
2 parents 8f47942 + 7e31f22
commit 70e3e8b
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 26 deletions.
diff --git a/.github/workflows/auto-merge-dependency-updates.yaml b/.github/workflows/auto-merge-dependency-updates.yaml
@@ -13,7 +13,7 @@ jobs:
     steps:
       - name: Dependabot metadata
         id: metadata
-        uses: dependabot/[email protected].3
+        uses: dependabot/[email protected].4
         with:
           github-token: "${{ secrets.GITHUB_TOKEN }}"
       - name: Approve

diff --git a/.github/workflows/test-and-deploy.yaml b/.github/workflows/test-and-deploy.yaml
@@ -131,7 +131,7 @@ jobs:
           tar -xz --file artifacts/static-files/static-files.tar.gz --directory codewof/staticfiles
 
       - name: Log in to the Container registry
-        uses: docker/login-action@v2.0.0
+        uses: docker/login-action@v2.1.0
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
@@ -147,7 +147,7 @@ jobs:
             type=ref,event=branch,priority=2
 
       - name: Build and push Docker image
-        uses: docker/build-push-action@v3.1.1
+        uses: docker/build-push-action@v3.2.0
         with:
           file: ./infrastructure/production/django/Dockerfile
           context: .

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,22 @@
 # Changelog
 
+## 5.0.1
+
+- Fix bug where a sequence of code characters could stop the JavaScript file from parsing correctly.
+- Delete management command with duplicated command name
+- Dependency updates:
+    - Update dependabot/fetch-metadata from v1.3.3 to v1.3.4.
+    - Update docker/login-action from v2.0.0 to v2.1.0.
+    - Update docker/build-push-action from v3.1.1 to v3.2.0.
+    - Update postcss from 8.4.16 to 8.4.18.
+    - Update yargs from 17.5.1 to 17.6.0.
+    - Update psycopg2 from 2.9.3 to 2.9.4.
+    - Update pytz from 2022.2.1 to 2022.4.
+    - Update django-modeltranslation from 0.18.4 to 0.18.5.
+    - Update mypy from 0.971 to 0.982.
+    - Update coverage from 6.4.4 to 6.5.0.
+    - Update django-debug-toolbar from 3.6.0 to 3.7.0.
+
 ## 5.0.0
 
 - Add question recommendations to users.

diff --git a/codewof/config/__init__.py b/codewof/config/__init__.py
@@ -1,6 +1,6 @@
 """Configuration for Django system."""
 
-__version__ = "5.0.0"
+__version__ = "5.0.1"
 __version_info__ = tuple(
     [
         int(num) if num.isdigit() else num

diff --git a/codewof/package.json b/codewof/package.json
@@ -30,13 +30,13 @@
         "jquery": "3.6.1",
         "pixrem": "5.0.0",
         "popper.js": "1.16.1",
-        "postcss": "8.4.16",
+        "postcss": "8.4.18",
         "postcss-flexbugs-fixes": "5.0.2",
         "sass": "1.55.0",
         "skulpt": "0.11.1",
         "sortablejs": "1.15.0",
         "vinyl-buffer": "1.0.1",
-        "yargs": "17.5.1"
+        "yargs": "17.6.0"
     },
     "engines": {
         "node": ">=8"

diff --git a/codewof/programming/management/commands/update_data.py b/codewof/programming/management/commands/update_data.py
diff --git a/codewof/templates/programming/question.html b/codewof/templates/programming/question.html
@@ -115,7 +115,7 @@ <h3 class="d-inline">{{ question.title }}</h3>
         {% if question.QUESTION_TYPE == QUESTION_TYPE_DEBUGGING %}
             var read_only_lines_top = {{ question.read_only_lines_top }};
             var read_only_lines_bottom = {{ question.read_only_lines_bottom }};
-            var initial_code = `{{ question.initial_code|escapejs }}`;
+            var initial_code = '{{ question.initial_code|escapejs }}';
         {% endif %}
     </script>
     <script src="{% static question_js %}"></script>

diff --git a/requirements/base.txt b/requirements/base.txt
@@ -21,7 +21,7 @@ gunicorn==20.1.0
 whitenoise==6.2.0
 
 # Database APIs
-psycopg2==2.9.3
+psycopg2==2.9.4
 
 # Content loading
 verto==1.0.1
@@ -35,12 +35,12 @@ flake8-quotes==3.3.1
 pep8-naming==0.13.2
 
 # Other
-pytz==2022.2.1
+pytz==2022.4
 python-dateutil==2.8.2
 argon2-cffi==21.3.0
 
 # I18n
-django-modeltranslation==0.18.4
+django-modeltranslation==0.18.5
 
 # CORS
 django-cors-headers==3.13.0
diff --git a/requirements/local.txt b/requirements/local.txt
@@ -3,18 +3,18 @@
 
 # Testing
 # ------------------------------------------------------------------------------
-mypy==0.971  # https://github.com/python/mypy
+mypy==0.982  # https://github.com/python/mypy
 pytest==7.1.3  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.5  # https://github.com/Frozenball/pytest-sugar
 
 # Code quality
 # ------------------------------------------------------------------------------
 # flake8 is installed as dependency in base.txt
-coverage==6.4.4  # https://github.com/nedbat/coveragepy
+coverage==6.5.0  # https://github.com/nedbat/coveragepy
 pydocstyle==6.1.1
 
 # Django
 # ------------------------------------------------------------------------------
-django-debug-toolbar==3.6.0  # https://github.com/jazzband/django-debug-toolbar
+django-debug-toolbar==3.7.0  # https://github.com/jazzband/django-debug-toolbar
 django-extensions==3.2.1  # https://github.com/django-extensions/django-extensions
 pytest-django==4.5.2  # https://github.com/pytest-dev/pytest-django