Merge branch 'main' into preview

Author: tobiasmcnulty

.coveragerc

@@ -2,4 +2,4 @@
 branch = 1
 
 [report]
-omit = .tox*,*tests*,*migrations*
+omit = *tests*,*migrations*

.github/workflows/tests.yml

@@ -7,19 +7,16 @@ on:
             - main
     pull_request:
 
+env:
+    PYTHON_VERSION: 3.12
+
 jobs:
     tests:
         runs-on: ubuntu-24.04
-        strategy:
-            fail-fast: false
-            matrix:
-                # tox-gh-actions will only run the tox environments which match the currently
-                # running python-version. See [gh-actions] in tox.ini for the mapping.
-                python-version: ["3.12"]
 
         services:
             postgres:
-                image: postgres:14-alpine
+                image: postgres:17-trixie
                 env:
                     POSTGRES_PASSWORD: postgres
                 options: >-
@@ -35,10 +32,11 @@ jobs:
             - name: Set up Python
               uses: actions/setup-python@v5
               with:
-                  python-version: "${{ matrix.python-version }}"
+                  python-version: ${{ env.PYTHON_VERSION }}
             - name: Install dependencies
               run: |
-                  python -m pip install --upgrade pip setuptools coveralls "tox<5" "tox-gh-actions<4"
+                  python -m pip install --upgrade pip setuptools
+                  python -m pip install -r requirements/tests.txt
             - name: Set up databases
               run: |
                   PGPASSWORD="postgres" createuser -U postgres -d djangoproject --superuser -h localhost
@@ -59,15 +57,6 @@ jobs:
                   echo '"trac_db_host": "localhost", ' >> conf/secrets.json
                   echo '"trac_db_password": "secret", ' >> conf/secrets.json
                   echo '"secret_key": "a"}' >> conf/secrets.json
-            - name: Run tox
+            - name: Run tests
               run: |
-                  python -m tox
-            - name: Coveralls
-              env:
-                  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-                  COVERALLS_PARALLEL: true
-                  COVERALLS_FLAG_NAME: "${{ matrix.python-version }}"
-                  COVERALLS_SERVICE_NAME: github
-                  COVERALLS_SERVICE_JOB_ID: "${{ github.run_id }}"
-                  COVERALLS_SERVICE_NUMBER: "${{ github.workflow }}-${{ github.run_number }}"
-              run: coveralls --service=github
+                  make ci

.gitignore

@@ -12,7 +12,6 @@ locale/*/LC_MESSAGES/django.mo
 .coverage
 .direnv
 .envrc
-.tox
 djangoproject/cache
 djangoproject/static/css/*.map
 djangoproject/static/css/*.css

.pre-commit-config.yaml

@@ -61,10 +61,6 @@ repos:
       hooks:
           - id: djhtml
             files: .*/templates/.*\.html$
-    - repo: https://github.com/tox-dev/pyproject-fmt
-      rev: "v2.6.0"
-      hooks:
-          - id: pyproject-fmt
     - repo: https://github.com/mrtazz/checkmake.git
       rev: 0.2.2
       hooks:

Dockerfile

@@ -14,8 +14,12 @@ RUN apt-get update \
         gettext \
         git \
         libpq5 \
+        postgresql-common \
         make \
         rsync \
+    && /usr/share/postgresql-common/pgdg/apt.postgresql.org.sh -y \
+    && apt-get install --assume-yes --no-install-recommends \
+        postgresql-client-17 \
     && apt-get distclean
 
 ARG REQ_FILE=requirements/prod.txt

README.rst

@@ -4,9 +4,6 @@ djangoproject.com source code
 .. image:: https://github.com/django/djangoproject.com/workflows/Tests/badge.svg?branch=main
     :target: https://github.com/django/djangoproject.com/actions
 
-.. image:: https://coveralls.io/repos/django/djangoproject.com/badge.svg?branch=main
-    :target: https://coveralls.io/r/django/djangoproject.com?branch=main
-
 To run locally, you can either:
 
 - Install and run from a virtual environment
@@ -87,7 +84,7 @@ Install and run locally from a virtual environment
 #. For docs (next step requires ``gettext``)::
 
     python -m manage loaddata doc_releases
-    python -m manage update_docs --update-index
+    python -m manage update_docs
 
 #. For dashboard:
 
@@ -130,16 +127,13 @@ Our test results can be found here:
 
 * https://github.com/django/djangoproject.com/actions
 
-For local development don't hesitate to install
-`tox <https://tox.readthedocs.io/>`_ to run the website's test suite.
-
 Then in the root directory (next to the ``manage.py`` file) run::
 
-    tox
+    make test
 
 Behind the scenes, this will run the usual ``python -m manage test`` management
 command with a preset list of apps that we want to test. We
-collect test coverage data as part of that tox run, to show the result
+collect test coverage data as part of that test run, to show the result
 simply run::
 
     python -m coverage report
@@ -239,16 +233,8 @@ minified version of it to this directory.
 Documentation search
 --------------------
 
-When running ``python -m manage update_docs --update-index`` to build all
-documents it will also automatically index every document it builds in the
-search engine as well. In case you've already built the documents and would like
-to reindex the search index, run the command::
-
-    python -m manage update_index
-
-This is also the right command to run when you work on the search feature
-itself. You can pass the ``-d`` option to try to drop the search index
-first before indexing all the documents.
+When running ``python -m manage update_docs`` to build all documents it will
+also automatically index every document it builds in the search engine as well.
 
 Updating metrics from production
 --------------------------------
@@ -325,28 +311,25 @@ Updating translations from Transifex
 Anytime translations on Transifex have been updated, someone should update
 our translation files as follows:
 
-1. Review the translations in Transifex and add to the space-delimited
-   ``LANGUAGES`` list in ``update-translations.sh``, any new languages that have
-   reached 100% translation.
-
-2. Pull the updated translation files::
+1. Pull the updated translation files::
 
     ./update-translations.sh
 
-3. Use ``git diff`` to see if any translations have actually changed. If not,
+2. Use ``git diff`` to see if any translations have actually changed. If not,
    you can just revert the .po file changes and stop here.
 
-4. Compile the messages::
+3. Compile the messages::
 
     python -m manage compilemessages
 
-5. Run the test suite one more time::
+4. Run the test suite one more time::
 
     python -m manage test
 
-6. Commit and push the changes to GitHub::
+5. Commit and push the changes to GitHub::
 
-    git commit -m "Updated translations" locale/*/LC_MESSAGES/*
+    git add dashboard/locale/ docs/locale/ locale/
+    git commit -m "Updated translations"
     git push
 
 Running Locally with Docker
@@ -364,7 +347,6 @@ Running Locally with Docker
 
 4. Run the tests::
 
-    docker compose run --rm web tox
     docker compose run --rm web python -m manage test
 
 Pre-commit checks

dashboard/locale/en/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-03-11 20:38-0500\n"
+"POT-Creation-Date: 2025-09-04 10:04-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -17,11 +17,53 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: dashboard/templates/base_dashboard.html:6
+msgid "Instant"
+msgstr ""
+
+msgid "Daily"
+msgstr ""
+
+msgid "Weekly"
+msgstr ""
+
+msgid "categories"
+msgstr ""
+
+msgid "Jenkins instance root URL"
+msgstr ""
+
+msgid "E.g. http://ci.djangoproject.com/"
+msgstr ""
+
+msgid "E.g. Django Python3"
+msgstr ""
+
+msgid "Should the metric be a value representing success ratio?"
+msgstr ""
+
+msgid ""
+"E.g. if there are 50 tests of which 30 are failing the value of this metric "
+"will be 20 (or 40%.)"
+msgstr ""
+
+msgid "Should the metric be a percentage value?"
+msgstr ""
+
+msgid ""
+"E.g. if there are 50 tests of which 30 are failing the value of this metric "
+"will be 60%."
+msgstr ""
+
 msgid "Development dashboard"
 msgstr ""
 
-#: dashboard/templates/dashboard/index.html:22
+msgid "All metrics"
+msgstr ""
+
 #, python-format
 msgid "Updated %(timestamp)s ago."
 msgstr ""
+
+#, python-format
+msgid "Could not find metric with slug %s"
+msgstr ""

dashboard/locale/pt_BR/LC_MESSAGES/django.po

@@ -14,8 +14,8 @@ msgstr ""
 "POT-Creation-Date: 2019-03-11 20:38-0500\n"
 "PO-Revision-Date: 2019-02-21 14:15+0000\n"
 "Last-Translator: Claudio Rogerio, 2019\n"
-"Language-Team: Portuguese (Brazil) (https://www.transifex.com/django/"
-"teams/17080/pt_BR/)\n"
+"Language-Team: Portuguese (Brazil) (https://www.transifex.com/django/teams/"
+"17080/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

dashboard/templates/base_dashboard.html

@@ -1,5 +1,6 @@
 {% extends "base.html" %}
 {% load i18n %}
+{% load static %}
 
 {% block sectionid %}dashboard{% endblock %}
 
@@ -8,3 +9,9 @@
 {% block header %}
   <h1>Development <em>dashboard</em></h1>
 {% endblock %}
+
+{% block javascript %}
+  <script src="{% static "js/lib/jquery.min.js" %}"></script>
+  <script src="{% static "js/lib/jquery.flot.min.js" %}"></script>
+  <script src="{% static "js/dashboard/utils.js" %}"></script>
+{% endblock %}

dashboard/templates/dashboard/detail.html

@@ -1,14 +1,20 @@
 {% extends "base_dashboard.html" %}
-{% load i18n %}
+{% load i18n static %}
 
 {% block title %}{{ metric }} | {{ block.super }}{% endblock %}
 
 {% block content %}
-  <div class="dashboard-detail">
+  <div>
     <h2><a href="{{ metric.link }}">{{ metric }}</a></h2>
     <div class="graph-wrapper">
       <div id="graph" class="graph" data-path="{% url "metric-list" host "dashboard" %}" data-metric="{{ metric.slug }}"></div>
     </div>
     <a class="link-readmore back-link" href="{% url "dashboard-index" host "dashboard" %}">{% translate "All metrics" %}</a>
   </div>
 {% endblock %}
+
+{% block javascript %}
+  {{ block.super }}
+
+  <script src="{% static "js/dashboard/detail.js" %}"></script>
+{% endblock %}