Merge branch 'main' into katex-for-slides

.github/workflows/pytest-report.yml

@@ -0,0 +1,24 @@
+name: Pytest Report
+on:
+  workflow_run:
+    workflows: [Pytest]
+    types: [completed]
+permissions:
+    checks: write
+jobs:
+  checks:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Download Test Report
+        uses: actions/download-artifact@v6
+        with:
+          name: pytest-report
+          github-token: ${{ secrets.GH_PAT }}
+          run-id: ${{ github.event.workflow_run.id }}
+      - name: Publish Test Report
+        uses: mikepenz/action-junit-report@v6
+        with:
+          commit: ${{github.event.workflow_run.head_sha}}
+          report_paths: pytest.xml
+          comment: true
+          pr_id: ${{ github.event.workflow_run.pull_requests[0].number }}

.github/workflows/pytest.yml

@@ -2,8 +2,6 @@ name: Pytest
 on: pull_request
 permissions:
   contents: read
-  checks: write
-  pull-requests: write
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
@@ -21,12 +19,10 @@ jobs:
       - name: Install failure annotation plugin
         run: pip install pytest-github-actions-annotate-failures
       - name: Test with pytest
-        run: |
+        run: pytest --junitxml=pytest.xml
-          set -o pipefail
+      - name: Upload Test Report
-          pytest --junitxml=pytest.xml --cov-report=term-missing:skip-covered --cov-report=html --cov | tee pytest-coverage.txt
+        uses: actions/upload-artifact@v6
-      - name: Comment pytest code coverage
-        uses: MishaKav/pytest-coverage-comment@main
-        if: ${{ always() }}
         with:
-          pytest-coverage-path: ./pytest-coverage.txt
+          name: pytest-report
-          junitxml-path: ./pytest.xml
+          path: pytest.xml
+          retention-days: 1

assets/script.js

@@ -44,8 +44,10 @@ document.addEventListener("DOMContentLoaded", function() {
     "\\farad": "\\text{F}",
     "\\coulomb": "\\text{C}",
     "\\ohm": "\\Omega",
+    "\\Ohm": "\\Omega",
     "\\weber": "\\text{Wb}",
     "\\tesla": "\\text{T}",
+    "\\bit": "\\text{b}",
   };
 
   renderMathInElement(document.body, {

templates/html/index.html

@@ -118,10 +118,11 @@
       <div class="feature-icon bg-primary bg-gradient">
         <svg xmlns="http://www.w3.org/2000/svg" height="48" viewBox="0 -960 960 960" width="48" fill="#5f6368"><path d="m380-300 280-180-280-180v360ZM160-160q-33 0-56.5-23.5T80-240v-480q0-33 23.5-56.5T160-800h640q33 0 56.5 23.5T880-720v480q0 33-23.5 56.5T800-160H160Zm0-80h640v-480H160v480Zm0 0v-480 480Z"/></svg>
       </div>
-      <h2>Videokurs Klasse N</h2>
+      <h2>Videokurse</h2>
       <p>In Zusammenarbeit mit DL2YMR ist ein Videokurs für die Klasse N entstanden, der auf seinem YouTube-Kanal abrufbar ist.</p>
       <div class="d-grid gap-2 d-md-block mb-5">
-        <a href="https://www.youtube.com/playlist?list=PLDpWnjHk5ERbcgpLPUaU0iTsD-wrmfENk" class="btn btn-primary">Zum Videokurs</a>
+        <a href="https://www.youtube.com/playlist?list=PLDpWnjHk5ERbcgpLPUaU0iTsD-wrmfENk" class="btn btn-primary">Zum Videokurs Klasse N</a>
+        <a href="https://www.youtube.com/playlist?list=PL_JZo16Mzs5XGeN5N81MwQ70dp7478VkM" class="btn btn-primary">Vorlesung Klasse N+E</a>
       </div>
     </div>
     <div class="feature col">

templates/html/page.html

@@ -127,7 +127,7 @@
                 <div class="d-flex flex-column align-items-center">
                   <div class="d-flex gap-1 align-items-center mb-1">
                     Mit
-                    <svg class="text-primary" xmlns="http://www.w3.org/2000/svg" width="1rem" height="1rem" fill="currentColor" viewBox="0 0 512 512"><path d="M47.6 300.4L228.3 469.1c7.5 7 17.4 10.9 27.7 10.9s20.2-3.9 27.7-10.9L464.4 300.4c30.4-28.3 47.6-68 47.6-109.5v-5.8c0-69.9-50.5-129.5-119.4-141C347 36.5 300.6 51.4 268 84L256 96 244 84c-32.6-32.6-79-47.5-124.6-39.9C50.5 55.6 0 115.2 0 185.1v5.8c0 41.5 17.2 81.2 47.6 109.5z"/></svg></span>
+                    <svg class="text-primary" xmlns="http://www.w3.org/2000/svg" width="1rem" height="1rem" fill="#FE756C" viewBox="0 0 512 512"><path d="M47.6 300.4L228.3 469.1c7.5 7 17.4 10.9 27.7 10.9s20.2-3.9 27.7-10.9L464.4 300.4c30.4-28.3 47.6-68 47.6-109.5v-5.8c0-69.9-50.5-129.5-119.4-141C347 36.5 300.6 51.4 268 84L256 96 244 84c-32.6-32.6-79-47.5-124.6-39.9C50.5 55.6 0 115.2 0 185.1v5.8c0 41.5 17.2 81.2 47.6 109.5z"/></svg></span>
                     vom <a class=link-secondary href="/infos#contributors">50ohm-Team</a> entwickelt
                   </div>
                   <div class="mb-1">Ein Angebot des Deutschen Amateur-Radio-Clubs e.&nbsp;V.</div>

test/test_dash.py

@@ -10,6 +10,7 @@ from test.util import paragraph
 def test_dash_html():
     assertions = {
         "Foo - Bar": "Foo – Bar",
+        "Foo-Bar": "Foo-Bar",
     }
 
     for assertion in assertions: