Merge branch 'django:main' into dont-exclude-migrations-from-black

Author: ulgens

.github/workflows/tests.yml

@@ -16,7 +16,7 @@ jobs:
 
         services:
             postgres:
-                image: postgres:14-alpine
+                image: postgres:17-trixie
                 env:
                     POSTGRES_PASSWORD: postgres
                 options: >-
@@ -35,7 +35,7 @@ jobs:
                   python-version: ${{ env.PYTHON_VERSION }}
             - name: Install dependencies
               run: |
-                  python -m pip install --upgrade pip setuptools coveralls
+                  python -m pip install --upgrade pip setuptools
                   python -m pip install -r requirements/tests.txt
             - name: Set up databases
               run: |
@@ -60,12 +60,3 @@ jobs:
             - name: Run tests
               run: |
                   make ci
-            - name: Coveralls
-              env:
-                  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-                  COVERALLS_PARALLEL: true
-                  COVERALLS_FLAG_NAME: "${{ env.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

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
@@ -41,5 +45,7 @@ RUN apt-get update \
 # copy project
 COPY . .
 
+RUN python -m django compilemessages
+
 # ENTRYPOINT is specified only in the local docker-compose.yml to avoid
 # accidentally running it in deployed environments.

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:
 
@@ -236,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
 --------------------------------

dashboard/locale/ja/LC_MESSAGES/django.po

@@ -0,0 +1,77 @@
+# Copyright (C) Django Software Foundation and contributors
+# This file is distributed under the same license as the djangoproject.com
+# source files.
+#
+# Translators:
+# Yuuki Ebihara <[email protected]>, 2019
+# TANIGUCHI Taichi, 2025
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2025-09-04 10:04-0500\n"
+"PO-Revision-Date: 2019-02-21 14:15+0000\n"
+"Last-Translator: TANIGUCHI Taichi, 2025\n"
+"Language-Team: Japanese (https://app.transifex.com/django/teams/17080/ja/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ja\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+msgid "Instant"
+msgstr "即時"
+
+msgid "Daily"
+msgstr "日次"
+
+msgid "Weekly"
+msgstr "週次"
+
+msgid "categories"
+msgstr "カテゴリー"
+
+msgid "Jenkins instance root URL"
+msgstr "Jenkins インスタンスのルート URL"
+
+msgid "E.g. http://ci.djangoproject.com/"
+msgstr "例： http://ci.djangoproject.com/"
+
+msgid "E.g. Django Python3"
+msgstr "例： Django Python3"
+
+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 ""
+"例：50件のテストのうち30件が失敗している場合、この指標の値は20（または40％）"
+"になります。"
+
+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 ""
+"例：50 件のテストのうち 30 件が失敗している場合、この指標の値は 60% になりま"
+"す。"
+
+msgid "Development dashboard"
+msgstr "開発用ダッシュボード"
+
+msgid "All metrics"
+msgstr "すべての指標"
+
+#, python-format
+msgid "Updated %(timestamp)s ago."
+msgstr "%(timestamp)s前に更新"
+
+#, python-format
+msgid "Could not find metric with slug %s"
+msgstr "スラグ %s の指標は見つかりませんでした"

dashboard/locale/sv/LC_MESSAGES/django.po

@@ -0,0 +1,76 @@
+# Copyright (C) Django Software Foundation and contributors
+# This file is distributed under the same license as the djangoproject.com
+# source files.
+#
+# Translators:
+# Daniel Nylander <[email protected]>, 2025
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2025-09-04 10:04-0500\n"
+"PO-Revision-Date: 2019-02-21 14:15+0000\n"
+"Last-Translator: Daniel Nylander <[email protected]>, 2025\n"
+"Language-Team: Swedish (https://app.transifex.com/django/teams/17080/sv/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sv\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "Instant"
+msgstr "Direkt"
+
+msgid "Daily"
+msgstr "Dagligen"
+
+msgid "Weekly"
+msgstr "Veckovis"
+
+msgid "categories"
+msgstr "kategorier"
+
+msgid "Jenkins instance root URL"
+msgstr "Jenkins-instansens rot-URL"
+
+msgid "E.g. http://ci.djangoproject.com/"
+msgstr "T.ex. http://ci.djangoproject.com/"
+
+msgid "E.g. Django Python3"
+msgstr "T.ex. Django Python3"
+
+msgid "Should the metric be a value representing success ratio?"
+msgstr "Bör måttet vara ett värde som representerar framgångskvoten?"
+
+msgid ""
+"E.g. if there are 50 tests of which 30 are failing the value of this metric "
+"will be 20 (or 40%.)"
+msgstr ""
+"Om det t.ex. finns 50 tester varav 30 underkänns blir värdet på detta mått "
+"20 (eller 40 %)"
+
+msgid "Should the metric be a percentage value?"
+msgstr "Bör måttet vara ett procentvärde?"
+
+msgid ""
+"E.g. if there are 50 tests of which 30 are failing the value of this metric "
+"will be 60%."
+msgstr ""
+"Om det t.ex. finns 50 tester varav 30 underkänns blir värdet på detta mått "
+"60%."
+
+msgid "Development dashboard"
+msgstr "Instrumentpanel för utveckling"
+
+msgid "All metrics"
+msgstr "Alla mätvärden"
+
+#, python-format
+msgid "Updated %(timestamp)s ago."
+msgstr "Uppdaterades %(timestamp)s sedan."
+
+#, python-format
+msgid "Could not find metric with slug %s"
+msgstr "Kunde inte hitta metric med slug %s"

djangoproject/settings/docker.py

@@ -11,11 +11,21 @@
     }
 }
 
+# Trac connection
+DATABASES["trac"] = {
+    "ENGINE": "django.db.backends.postgresql",
+    "NAME": os.environ.get("TRAC_DATABASE", "code.djangoproject"),
+    "USER": os.environ.get("TRAC_USER", "code.djangoproject"),
+    "PASSWORD": os.environ.get("TRAC_PASSWORD", ""),
+    "HOST": os.environ.get("TRAC_HOST", "db"),
+    "PORT": os.environ.get("TRAC_PORT", "5432"),
+}
+
 SECRET_KEY = os.environ.get("SECRET_KEY")
 
 ALLOWED_HOSTS = [".localhost", "127.0.0.1", "www.127.0.0.1"]
 
 LOCALE_MIDDLEWARE_EXCLUDED_HOSTS = ["docs.djangoproject.localhost"]
 
 # django-hosts settings
-PARENT_HOST = "localhost:8000"
+PARENT_HOST = "djangoproject.localhost:8000"

djangoproject/templates/includes/footer.html

@@ -1,3 +1,5 @@
+{% load hosts %}
+
 <footer>
   <div class="subfooter">
     <div class="container">
@@ -59,9 +61,9 @@ <h3>Follow Us</h3>
           <h3>Support Us</h3>
           <ul>
             <li><a href="{% url "fundraising:index" %}">Sponsor Django</a></li>
-            <li><a href="/foundation/corporate-membership/">Corporate membership</a></li>
+            <li><a href="{% host_url "homepage" host "www" %}foundation/corporate-membership/">Corporate membership</a></li>
             <li><a href="https://django.threadless.com/" target="_blank">Official merchandise store</a></li>
-            <li><a href="/foundation/donate/#benevity-giving">Benevity Workplace Giving Program</a></li>
+            <li><a href="{% host_url "homepage" host "www" %}foundation/donate/#benevity-giving">Benevity Workplace Giving Program</a></li>
           </ul>
         </div>
       </div>

docker-compose.yml

@@ -21,11 +21,17 @@ services:
             - SQL_PASSWORD=secret
             - SQL_HOST=db
             - SQL_PORT=5432
+            - TRAC_DATABASE=code.djangoproject
+            - TRAC_USER=code.djangoproject
+            - TRAC_PASSWORD=secret
+            - TRAC_HOST=db
+            - TRAC_PORT=5432
+
         depends_on:
             db:
                 condition: service_healthy
     db:
-        image: postgres:14-bookworm
+        image: postgres:17-trixie
         environment:
             - POSTGRES_USER=djangoproject
             - POSTGRES_PASSWORD=secret
@@ -35,3 +41,5 @@ services:
             interval: 1s
             timeout: 10s
             retries: 10
+        volumes:
+            - ./initdb/tracdb.sql:/docker-entrypoint-initdb.d/tracdb.sql

docker-entrypoint.dev.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 python -m manage flush --no-input
-# PGPASSWORD=djangoproject psql --host db --port 5432 --username=code.djangoproject --dbname=code.djangoproject < tracdb/trac.sql
+PGPASSWORD=secret psql --host db --port 5432 --username=code.djangoproject --dbname=code.djangoproject < tracdb/trac.sql
 python -m manage migrate
 make compile-scss # must come before collectstatic
 python -m manage collectstatic --no-input --clear
@@ -12,6 +12,5 @@ python -m manage loaddata doc_releases
 python -m manage loaddata dashboard_production_metrics
 # python -m manage loaddata dashboard_example_data
 python -m manage update_metrics
-#python -m manage update_index
 
 exec "$@"