Refresh: Add CTA pencil banner

.github/l10n/linter_config.yml

@@ -27,6 +27,4 @@ CO01:
     - "{ -brand-name-mozilla } account"
   exclusions:
     files: []
-    messages:
-      # firefox/features/translate.ftl
-      - features-translate-for-everyone
+    messages: []

.github/workflows/fluent_linter.yml

@@ -26,7 +26,7 @@ jobs:
       - name: Set up Python 3
         uses: actions/setup-python@v5
         with:
-          python-version: "3.11"
+          python-version: "3.12"
       - name: Install Python dependencies
         run: |
           pip install moz-fluent-linter==0.4.*

.github/workflows/pull_request_tests.yml

@@ -28,7 +28,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
         with:
-          python-version: "3.11"  # matches current Python in production
+          python-version: "3.12"  # matches current Python in production
       - name: "Run Python tests (on Docker)"
         run: |
             make clean test-image

.pre-commit-config.yaml

@@ -65,7 +65,7 @@ repos:
           - --comment-style
           - "|#|"
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.6.3
+    rev: v0.6.9
     hooks:
       - id: ruff
       - id: ruff-format

.readthedocs.yaml

@@ -8,7 +8,7 @@ version: 2
 build:
   os: ubuntu-20.04
   tools:
-    python: "3.11"
+    python: "3.12"
 
 # Build documentation in the docs/ directory with Sphinx
 sphinx:

Dockerfile

@@ -1,7 +1,7 @@
 ########
 # Python dependencies builder
 #
-FROM python:3.11-slim-bookworm AS python-builder
+FROM python:3.12-slim-bookworm AS python-builder
 
 WORKDIR /app
 ENV LANG=C.UTF-8
@@ -52,7 +52,7 @@ RUN npm run build --verbose
 ########
 # django app container
 #
-FROM python:3.11-slim-bookworm AS app-base
+FROM python:3.12-slim-bookworm AS app-base
 
 # Extra python env
 ENV PYTHONDONTWRITEBYTECODE=1

Makefile

@@ -4,6 +4,13 @@ DOCKER = $(shell which docker)
 TEST_DOMAIN = www.mozilla.org
 POCKET_MODE = Pocket
 
+# Check if 'uv' exists and set the command accordingly
+ifneq (, $(shell which uv 2>/dev/null))
+	pip = uv pip
+else
+	pip = pip
+endif
+
 all: help
 
 help:
@@ -164,7 +171,7 @@ compile-requirements: .docker-build-pull
 	${DC} run --rm compile-requirements
 
 check-requirements: .docker-build-pull
-	${DC} run --rm test pip list -o
+	${DC} run --rm app ./bin/check-pinned-requirements.py
 
 ######################################################
 # For use in local-machine development (not in Docker)
@@ -184,8 +191,8 @@ install-local-python-deps:
 	# Dev requirements are a superset of prod requirements, but we install
 	# them in the same separate steps that we use for our Docker-based build,
 	# so that it mirrors Production and Dev image building
-	pip install -r requirements/prod.txt
-	pip install -r requirements/dev.txt
+	$(pip) install -r requirements/prod.txt
+	$(pip) install -r requirements/dev.txt
 
 run-local-task-queue:
 	# We temporarily source the .env for the command's duration only
@@ -195,7 +202,7 @@ run-local-task-queue:
 
 
 clean-local-deps:
-	pip uninstall mdx_outline -y && pip freeze | xargs pip uninstall -y
+	$(pip) uninstall mdx_outline -y && $(pip) freeze | xargs $(pip) uninstall -y
 
 # Done explicitly to avoid surprises
 install-custom-git-hooks:

bedrock/base/management/commands/import_waffle_switches.py

@@ -0,0 +1,29 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+from django.core.management.base import BaseCommand
+
+from waffle.models import Switch
+
+from bedrock.base.models import ConfigValue
+from bedrock.utils.management.decorators import alert_sentry_on_exception
+
+
+@alert_sentry_on_exception
+class Command(BaseCommand):
+    def handle(self, *args, **options):
+        prefix = "SWITCH_"
+
+        for config in ConfigValue.objects.all():
+            # Ignore funnelcakes and other yummy things.
+            if not config.name.startswith(prefix):
+                continue
+
+            # Remove prefix.
+            name = config.name[len(prefix) :]
+            # Set active to boolean.
+            active = config.value == "on"
+
+            switch, created = Switch.objects.update_or_create(name=name, defaults={"active": active})
+            print(f"{'Created new' if created else 'Updated'} switch: {name} = {'on' if active else 'off'}")

bedrock/base/models.py

@@ -14,7 +14,3 @@ class Meta:
 
     def __str__(self):
         return f"{self.name}={self.value}"
-
-
-def get_config_dict():
-    return {c.name: c.value for c in ConfigValue.objects.all()}

bedrock/base/templates/base-protocol-mozilla.html

@@ -9,7 +9,11 @@
 {% block body_class %}mzp-t-mozilla{% endblock %}
 
 {% block site_css %}
-  {{ css_bundle('protocol-mozilla') }}
+  {% if switch('m24-global-styles') %}
+    {{ css_bundle('protocol-mozilla-2024') }}
+  {% else %}
+    {{ css_bundle('protocol-mozilla') }}
+  {% endif %}
   {% if switch('m24-navigation-and-footer') and LANG.startswith('en-') %}
     {{ css_bundle('m24-navigation-and-footer') }}
   {% endif %}

bedrock/base/templates/base-protocol.html

@@ -72,7 +72,11 @@
     <!--[if !IE]><!-->
     {# Global styles, hidden from IE9 and lower #}
     {% block site_css %}
-      {{ css_bundle('protocol-firefox') }}
+      {% if switch('m24-global-styles') %}
+        {{ css_bundle('protocol-mozilla-2024') }}
+      {% else %}
+        {{ css_bundle('protocol-firefox') }}
+      {% endif %}
       {% if switch('m24-navigation-and-footer') and LANG.startswith('en-') %}
         {{ css_bundle('m24-navigation-and-footer') }}
       {% endif %}

bedrock/base/templates/cron-health-check.html

@@ -130,5 +130,28 @@ <h1 id="git-repos">External Git Repos</h1>
       {% endfor %}
     </tbody>
   </table>
+
+  <h1 id="waffle-switches">Waffle Switches</h1>
+  <table>
+    <thead>
+      <tr>
+        <th>Name</th>
+        <th>Active</th>
+      </tr>
+    </thead>
+    <tbody>
+      {% for switch in switches %}
+      <tr>
+        <td>{{ switch.name }}</td>
+        <td>{% if switch.active %}✅{% else %}❌{% endif %}</td>
+      </tr>
+      {% else %}
+      <tr>
+        <td colspan="2">No switches found</td>
+      </tr>
+      {% endfor %}
+    </tbody>
+  </table>
+
 </body>
 </html>