Merge branch 'master' into add-pigeon

.github/workflows/publish-python-package.yml

@@ -26,8 +26,7 @@ jobs:
         run: |
           pip install pipenv
           pipenv install --dev --system
-          pip install -U git+https://github.com/ocadotechnology/codeforlife-portal@python312
-          pip install -U "git+https://github.com/ocadotechnology/codeforlife-portal@python312#egg=cfl-common&subdirectory=cfl_common"
+          pip install -U git+https://github.com/ocadotechnology/codeforlife-portal.git#egg=codeforlife-portal #TODO: Remove as part of #688
           sudo apt-get install gettext
       # TODO: Restore action once we figure out how to use bot token properly (if still needed)
       #      - name: Prepare files for Crowdin

CHANGELOG.md

@@ -2,6 +2,19 @@
 
 <!--next-version-placeholder-->
 
+## v6.3.8 (2024-09-03)
+
+### Fix
+
+* Adjust Python den banner size ([#1715](https://github.com/ocadotechnology/rapid-router/issues/1715)) ([`77ee1ab`](https://github.com/ocadotechnology/rapid-router/commit/77ee1abf48734229ed2a8ea193be4f1ae443a7f4))
+
+## v6.3.7 (2024-09-03)
+
+### Fix
+
+* Install portal master when publishing ([`e5c0682`](https://github.com/ocadotechnology/rapid-router/commit/e5c068261a5c3f47906d296e3a767dd5307d4976))
+* Django js reverse upgrade ([#1714](https://github.com/ocadotechnology/rapid-router/issues/1714)) ([`e6a9fe8`](https://github.com/ocadotechnology/rapid-router/commit/e6a9fe8c84d8ea8ebd317ba7a840ddf4c67ba061))
+
 ## v6.3.6 (2024-09-02)
 
 ### Fix

example_project/rapid_router_test_settings.py

@@ -83,7 +83,7 @@
     "django.contrib.sessions",
     "django.contrib.messages",
     "django.contrib.staticfiles",
-    "django_js_reverse",
+    "django_reverse_js",
     "django_otp",
     "django_otp.plugins.otp_static",
     "django_otp.plugins.otp_totp",

example_project/settings.py

@@ -70,7 +70,7 @@
     "django.contrib.sessions",
     "django.contrib.messages",
     "django.contrib.staticfiles",
-    "django_js_reverse",
+    "django_reverse_js",
     "django_otp",
     "django_otp.plugins.otp_static",
     "django_otp.plugins.otp_totp",

game/__init__.py

@@ -1 +1 @@
-__version__ = "6.3.6"
+__version__ = "6.3.8"

game/templates/game/base.html

@@ -8,9 +8,9 @@
     <script defer id="data">
         var PATH = {{request.path}}
     </script>
-    
+
     <script type='text/javascript' src="{% static 'game/js/foundation/vendor/js.cookie.min.js' %}"></script>
-    <script type='text/javascript' src="{% static 'game/js/js-reverse.js' %}"></script>
+    <script type='text/javascript' src="{% static 'django_reverse_js/js/reverse.js' %}"></script>
     <script type='text/javascript' src="{% url 'rapid-router/javascript-catalog' %}"></script>
     <script type='text/javascript' src="{% static 'game/js/jquery.touchy.min.js' %}"></script>
 {% endblock %}

game/templates/game/python_den_level_selection.html

@@ -32,10 +32,10 @@
 
 {% block header %}
 <section class="banner">
-    {% if user|is_logged_in_as_student %}
-        <img class="banner--python-den--image" title="Python Den logo" alt="Python Den logo" src="{% static 'game/image/Python_Den_student_hero_image.png' %}">
+    {% if user|is_logged_in_as_student or user|is_independent_student %}
+        <img class="banner--python-den--image" title="Python Den logo" alt="Python Den logo" src="{% static 'game/image/Python_Den_hero_student.png' %}">
     {% else %}
-        <img class="banner--python-den--image" title="Python Den logo" alt="Python Den logo" src="{% static 'game/image/Python_Den_hero_image.svg' %}">
+        <img class="banner--python-den--image" title="Python Den logo" alt="Python Den logo" src="{% static 'game/image/Python_levels_page.svg' %}">
     {% endif %}
 </section>
 {% endblock header %}

game/urls.py

@@ -1,6 +1,7 @@
 from django.conf.urls import url, include
+from django.urls import path
 from django.views.i18n import JavaScriptCatalog
-from django_js_reverse.views import urls_js
+from django_reverse_js.views import urls_js
 
 from game.views.api import (
     level_list,
@@ -266,7 +267,7 @@
             ]
         ),
     ),
-    url(r"^js-reverse/$", urls_js, name="js-reverse"),
+    path("reverse.js", urls_js, name="js-reverse"),
     url(
         r"^js-i18n/$",
         JavaScriptCatalog.as_view(packages=["game"]),

setup.py

@@ -23,7 +23,7 @@
     install_requires=[
         "django==3.2.25",
         "django-csp==3.7",
-        "django-js-reverse==0.9.1",
+        "django-reverse-js==0.1.7",
         "django-pipeline==2.0.8",
         "djangorestframework==3.13.1",
         "more-itertools==8.7.0",