merge upstread

Author: Éric Araujo

.github/workflows/cleanup-pr-preview.yml

@@ -10,7 +10,7 @@ jobs:
     permissions:
       contents: write
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           ref: gh-pages
       - run: git config user.name "github-actions[bot]"

.github/workflows/lint.yml

@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           persist-credentials: false
       - uses: actions/setup-python@v6

.github/workflows/run-tests.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           persist-credentials: false
       - uses: actions/setup-python@v6

.github/workflows/update.yml

@@ -17,7 +17,7 @@ jobs:
         with:
           python-version: "3.x"
       - uses: astral-sh/setup-uv@v7
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - run: sudo apt-get install -y gettext
       - run: pip install -r requirements.txt
       - run: uv run generate.py  # generates index.html and index.json

README.md

@@ -0,0 +1,8 @@
+![website status](https://img.shields.io/website?url=https%3A%2F%2Ftranslations.python.org&logoColor=yellow&label=website%20status)
+[![lint](https://github.com/python-docs-translations/dashboard/actions/workflows/lint.yml/badge.svg)](https://github.com/python-docs-translations/dashboard/actions/workflows/lint.yml)
+
+This project generates a dashboard presenting the Python documentation translations projects available at [translations.python.org](https://translations.python.org).
+
+There are two entrypoints:
+- `generate.py`: Generates dashboard HTML and JSON files.
+- `generate_build_details.py`: Generates the build details HTML file and log files for each translation project.

completion.py

@@ -23,14 +23,20 @@ def get_completion(clones_dir: str, repo: str) -> tuple[float, str, float]:
     clone_path = Path(clones_dir, 'translations', repo)
     for branch in branches_from_peps() + ['master', 'main']:
         try:
-            clone_repo = git.Repo.clone_from(
-                f'https://github.com/{repo}.git', clone_path, branch=branch
-            )
+            if not clone_path.exists():
+                clone_repo = git.Repo.clone_from(
+                    f'https://github.com/{repo}.git', clone_path, branch=branch
+                )
+            else:
+                (clone_repo := git.Repo(clone_path)).git.fetch()
+                clone_repo.git.switch(branch)
+                clone_repo.git.pull()
         except git.GitCommandError:
-            print(f'failed to clone {repo} {branch}')
+            print(f'failure: {branch} {repo}: clone or switch, continuing')
             branch = ''
             continue
         else:
+            print(f'success: {branch} {repo}: clone or switch')
             break
     path_for_merge = Path(clones_dir, 'rebased_translations', repo)
     completion = potodo.merge_and_scan_paths(

generate.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import json
 import concurrent.futures
 import itertools
@@ -20,20 +22,26 @@
 generation_time = datetime.now(timezone.utc)
 
 
-def get_completion_progress() -> Iterator['LanguageProjectData']:
+def get_completion_progress() -> Iterator[LanguageProjectData]:
     clones_dir = Path('clones')
-    Repo.clone_from(
-        'https://github.com/python/devguide.git',
-        devguide_dir := Path(clones_dir, 'devguide'),
-        depth=1,
-    )
+    if not (devguide_dir := Path(clones_dir, 'devguide')).exists():
+        Repo.clone_from('https://github.com/python/devguide.git', devguide_dir, depth=1)
+    else:
+        Repo(devguide_dir).git.pull()
     latest_branch = branches_from_peps()[0]
-    Repo.clone_from(
-        'https://github.com/python/cpython.git',
-        cpython_dir := Path(clones_dir, 'cpython'),
-        depth=1,
-        branch=latest_branch,
-    )
+    if not (cpython_dir := Path(clones_dir, 'cpython')).exists():
+        Repo.clone_from(
+            'https://github.com/python/cpython.git',
+            cpython_dir,
+            depth=1,
+            branch=latest_branch,
+        )
+    else:
+        (cpython_repo := Repo(cpython_dir)).git.fetch()
+        cpython_repo.git.switch(latest_branch)
+        cpython_repo.git.pull()
+
+    subprocess.run(['make', '-C', cpython_dir / 'Doc', 'clean'], check=True)
     subprocess.run(['make', '-C', cpython_dir / 'Doc', 'venv'], check=True)
     subprocess.run(['make', '-C', cpython_dir / 'Doc', 'gettext'], check=True)
 
@@ -56,7 +64,7 @@ def get_project_data(
     repo: str | None,
     languages_built: dict[str, str],
     clones_dir: str,
-) -> 'LanguageProjectData':
+) -> LanguageProjectData:
     built = language.code in languages_built
     if repo:
         completion, branch, change = get_completion(clones_dir, repo)

src/style.css

@@ -58,6 +58,11 @@ body {
   flex: 1;
 }
 
+.card:target {
+  scroll-margin-top: 4.5rem;
+  border-color: #1178cc;
+}
+
 .card-body p {
   margin-bottom: 0;
   margin-top: 0;
@@ -67,6 +72,24 @@ body {
   margin-bottom: 0.4rem;
 }
 
+.card-title a {
+  color: inherit;
+  text-decoration: none;
+  border-radius: 4px;
+  padding: 0 4px;
+  margin: 0 -4px;
+}
+
+.card-title a::after {
+  content: " #";
+  font-size: 0.8em;
+  color: #7ec3ff;
+}
+
+.card-title a:focus, .card-title a:hover {
+  background-color: #f5e9a8;
+}
+
 /* ------------------------------ Index ------------------------------------- */
 
 .progress-bar-container {

templates/index.html.jinja

@@ -5,24 +5,24 @@
   <div class="row">
     {% for project in completion_progress | sort(attribute='completion') | reverse %}
       <div class="col-12 col-sm-6 col-md-4 d-flex">
-        <div class="card shadow mb-3 w-100">
+        <div id="{{ project.language.code }}" class="card shadow mb-3 w-100">
           <div class="card-body">
-            <h3 class="card-title">{{ project.language.name }}</h3>
+            <h3 class="card-title"><a href="#{{ project.language.code }}">{{ project.language.name }}</a></h3>
             <h5 class="card-subtitle mb-2 text-muted">{{ project.translated_name }}</h5>
             <p class="text-muted">Completion: <strong>{{ '{:.2f}%'.format(project.completion) }}</strong></p>
             <p class="text-muted">30-day progress: {{ '{:.2f}%'.format(project.change) }}</p>
 
             <p style="text-align: center;">
               {% if project.built %}
-                <a href="https://docs.python.org/{{ project.language.code }}/3/" style="color: #1595fe;">View {{ project.language.name }}</a>
+                <a href="https://docs.python.org/{{ project.language.code }}/3/" style="color: #1178cc;">View {{ project.language.name }}</a>
                 •
               {% endif %}
               {% if project.contribution_link %}
-                <a href="{{ project.contribution_link }}" style="color: #1595fe;">Contribute to {{ project.language.name }}</a>
+                <a href="{{ project.contribution_link }}" style="color: #1178cc;">Contribute</a>
               {% elif project.uses_platform %}
-                <a href="https://app.transifex.com/join/?o=python-doc&p=python-newest&t=opensource" style="color: #1595fe;">Contribute to {{ project.language.name }}</a>
+                <a href="https://app.transifex.com/join/?o=python-doc&p=python-newest&t=opensource" style="color: #1178cc;">Contribute to {{ project.language.name }}</a>
               {% else %}
-                <a href="https://devguide.python.org/documentation/translations/translating/" style="color: #1595fe;">Contribute to {{ project.language.name }}</a>
+                <a href="https://devguide.python.org/documentation/translations/translating/" style="color: #1178cc;">Contribute to {{ project.language.name }}</a>
               {% endif %}
             </p>
             <div class="progress-bar-container">