Merge branch 'main' into build-warnings-new-tab

StanFromIreland · StanFromIreland · commit e44b0ff393c4 · 2025-02-18T11:54:26.000Z
# Conflicts:
#	completion.py
#	template.html.jinja
diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml
@@ -30,7 +30,8 @@ jobs:
           git-config-name: github-actions[bot]
           git-config-email: 41898282+github-actions[bot]@users.noreply.github.com
       - name: Deploy to subdirectory if pull request 🚀
-        if: github.event_name == 'pull_request'
+        # This does not work for PRs from forks
+        if: github.event_name == 'pull_request' && !github.event.pull_request.head.repo.fork
         uses: JamesIves/github-pages-deploy-action@v4
         with:
           folder: build
@@ -39,7 +40,8 @@ jobs:
           git-config-name: github-actions[bot]
           git-config-email: 41898282+github-actions[bot]@users.noreply.github.com
       - name: Update PR description if pull request
-        if: github.event_name == 'pull_request'
+        # This does not work for PRs from forks
+        if: github.event_name == 'pull_request' && !github.event.pull_request.head.repo.fork
         uses: chabroA/action-append-pr-description@v1.2.1
         with:
           auth: ${{ secrets.GITHUB_TOKEN }}
diff --git a/completion.py b/completion.py
@@ -22,14 +22,14 @@ def branches_from_devguide(devguide_dir: Path) -> list[str]:
 
 def get_completion(
     clones_dir: str, repo: str
-) -> tuple[float, 'TranslatorsData', str | None]:
+) -> tuple[float, 'TranslatorsData', str, float]:
     clone_path = Path(clones_dir, repo)
     for branch in branches_from_devguide(Path(clones_dir, 'devguide')) + [
         'master',
         'main',
     ]:
         try:
-            git.Repo.clone_from(
+            clone_repo = git.Repo.clone_from(
                 f'https://github.com/{repo}.git', clone_path, branch=branch
             )
         except git.GitCommandError:
@@ -50,7 +50,27 @@ def get_completion(
             hide_reserved=False,
             api_url='',
         ).completion
-    return completion, translators_data, branch or None
+
+    if completion:
+        # Fetch commit from before 30 days ago and checkout
+        commit = next(
+            clone_repo.iter_commits('HEAD', max_count=1, before='30 days ago')
+        )
+        clone_repo.git.checkout(commit.hexsha)
+        with TemporaryDirectory() as tmpdir:
+            month_ago_completion = potodo.merge_and_scan_path(
+                clone_path,
+                pot_path=Path(clones_dir, 'cpython/Doc/build/gettext'),
+                merge_path=Path(tmpdir),
+                hide_reserved=False,
+                api_url='',
+            ).completion
+    else:
+        month_ago_completion = 0.0
+
+    change = completion - month_ago_completion
+
+    return completion, translators_data, branch or None, change
 
 
 @dataclass(frozen=True)
diff --git a/generate.py b/generate.py
@@ -69,18 +69,20 @@ def get_project_data(
 ) -> 'LanguageProjectData':
     built = language.code in languages_built
     if repo:
-        completion, translators_data, branch = get_completion(clones_dir, repo)
+        completion, translators_data, branch, change = get_completion(clones_dir, repo)
         visitors_num = get_number_of_visitors(language.code, http) if built else 0
     else:
         completion = 0.0
         translators_data = TranslatorsData(0, False)
+        change = 0.0
         visitors_num = 0
         branch = None
     return LanguageProjectData(
         language,
         repo,
         branch,
         completion,
+        change,
         translators_data,
         visitors_num,
         built,
@@ -96,6 +98,7 @@ class LanguageProjectData:
     repository: str | None
     branch: str | None
     completion: float
+    change: float
     translators: TranslatorsData
     visitors: int
     built: bool
diff --git a/template.html.jinja b/template.html.jinja
@@ -3,6 +3,7 @@
   <title>Python Docs Translation Dashboard</title>
   <link rel="stylesheet" href="style.css">
   <meta charset="UTF-8">
+  <meta name="description" content="Python Docs Translation Dashboard">
   <base target="_blank">
 </head>
 <body>
@@ -12,8 +13,7 @@
 <thead>
 <tr>
   <th>language</th>
-  <th>contribute</th>
-  <th>build</th>
+  <th>switcher</th>
   <th>visitors*</th>
   <th>translators</th>
   <th>completion</th>
@@ -22,17 +22,14 @@
 <tbody>
 {% for project in completion_progress | sort(attribute='completion,translators.number') | reverse %}
 <tr>
-  <td data-label="language">{{ project.language.name }} ({{ project.language.code }})</td>
-  <td data-label="contribute">
-    {% if project.contribution_link %}<a href="{{ project.contribution_link }}">{% endif %}
-    {% if project.uses_platform %}platform{% else %}repository{% endif %}
-    {% if project.contribution_link %}</a>{% endif %}
+  <td data-label="language">
+    <a href="{{ project.contribution_link }}" target="_blank">{{ project.language.name }} ({{ project.language.code }})</a>
   </td>
   <td data-label="build">
-    {% if project.built %}
-      <a href="https://docs.python.org/{{ project.language.code }}/">✓{% if project.in_switcher %} in switcher{% endif %}</a>
-    {% else %}
-      ✗
+    {% if project.in_switcher %}
+      <a href="https://docs.python.org/{{ project.language.code }}/" target="_blank">✓</a>
+    {% elif project.built %}
+      <a href="https://docs.python.org/{{ project.language.code }}/" target="_blank">✗</a>
     {% endif %}
   </td>
   <td data-label="visitors">
diff --git a/visitors.py b/visitors.py
@@ -2,17 +2,23 @@
 import io
 import urllib.parse
 import zipfile
+from logging import info
 
-from urllib3 import PoolManager
+from urllib3 import PoolManager, Retry
 
 
 def get_number_of_visitors(language: str, http: PoolManager) -> int:
     params = urllib.parse.urlencode(
         {'filters': f'[["contains","event:page",["/{language}/"]]]', 'period': 'all'}
     )
-    r = http.request('GET', f'https://plausible.io/docs.python.org/export?{params}')
+    response = http.request(
+        'GET',
+        f'https://plausible.io/docs.python.org/export?{params}',
+        retries=Retry(status_forcelist=(500,502)),
+    )
+    info(f'visitors {response.status=} ({language=})')
     with (
-        zipfile.ZipFile(io.BytesIO(r.data), 'r') as z,
+        zipfile.ZipFile(io.BytesIO(response.data), 'r') as z,
         z.open('visitors.csv') as csv_file,
     ):
         csv_reader = csv.DictReader(io.TextIOWrapper(csv_file))
