From 368733f79a50c456957c49518867fe6b6cc6b76d Mon Sep 17 00:00:00 2001
From: Adam Turner <9087854+aa-turner@users.noreply.github.com>
Date: Sat, 12 Apr 2025 03:15:40 +0100
Subject: [PATCH 1/4] Add a simple integration test
---
.github/workflows/test.yml | 89 ++++++++++++++++++++++++++------------
1 file changed, 61 insertions(+), 28 deletions(-)
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index e272e76..0b789de 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -1,6 +1,9 @@
name: Test
-on: [push, pull_request, workflow_dispatch]
+on:
+ push:
+ pull_request:
+ workflow_dispatch:
permissions: {}
@@ -8,35 +11,65 @@ env:
FORCE_COLOR: 1
jobs:
- test:
- runs-on: ${{ matrix.os }}
+ integration:
+ name: Integration test
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v4
+ - uses: actions/setup-python@v5
+ with:
+ python-version: "3.13"
+
+ - name: Set up requirements
+ run: |
+ python -m pip install --upgrade pip
+ python -m pip install -r requirements.txt
+
+ - name: Build documentation
+ run: >
+ python ./build_docs.py
+ --quick
+ --build-root ./build_root
+ --www-root ./www
+ --log-directory ./logs
+ --group "$(id -g)"
+ --skip-cache-invalidation
+ --languages en
+ --branches 3.14
+
+ - name: Display docsbuild.log
+ if: always()
+ run: cat ./logs/docsbuild.log
+
+ unit:
+ name: Unit tests
+ runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
- python-version: ["3.13", "3.14"]
- os: [ubuntu-latest]
+ python-version:
+ - "3.13"
+ - "3.14"
steps:
- - uses: actions/checkout@v4
- with:
- persist-credentials: false
-
- - name: Set up Python ${{ matrix.python-version }}
- uses: actions/setup-python@v5
- with:
- python-version: ${{ matrix.python-version }}
- allow-prereleases: true
-
- - name: Install uv
- uses: hynek/setup-cached-uv@v2
-
- - name: Tox tests
- run: |
- uvx --with tox-uv tox -e py
-
- - name: Upload coverage
- uses: codecov/codecov-action@v5
- with:
- flags: ${{ matrix.os }}
- name: ${{ matrix.os }} Python ${{ matrix.python-version }}
- token: ${{ secrets.CODECOV_ORG_TOKEN }}
+ - uses: actions/checkout@v4
+ with:
+ persist-credentials: false
+
+ - name: Set up Python ${{ matrix.python-version }}
+ uses: actions/setup-python@v5
+ with:
+ python-version: ${{ matrix.python-version }}
+ allow-prereleases: true
+
+ - name: Install uv
+ uses: hynek/setup-cached-uv@v2
+
+ - name: Tox tests
+ run: uvx --with tox-uv tox -e py
+
+ - name: Upload coverage
+ uses: codecov/codecov-action@v5
+ with:
+ name: Python ${{ matrix.python-version }}
+ token: ${{ secrets.CODECOV_ORG_TOKEN }}
From da8e01f98b2fbcdc50da68890ee07ea3408de6f9 Mon Sep 17 00:00:00 2001
From: Adam Turner <9087854+aa-turner@users.noreply.github.com>
Date: Sat, 12 Apr 2025 03:18:17 +0100
Subject: [PATCH 2/4] Lint
---
.github/workflows/test.yml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 0b789de..17d9628 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -16,6 +16,8 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
+ with:
+ persist-credentials: false
- uses: actions/setup-python@v5
with:
python-version: "3.13"
From 6a4c2bc5403901f754b095b1afbaf189f9e27bb3 Mon Sep 17 00:00:00 2001
From: Adam Turner <9087854+aa-turner@users.noreply.github.com>
Date: Sat, 12 Apr 2025 03:20:23 +0100
Subject: [PATCH 3/4] Log to console in CI
---
.github/workflows/test.yml | 4 ----
build_docs.py | 2 +-
2 files changed, 1 insertion(+), 5 deletions(-)
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 17d9628..d7ebf7f 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -39,10 +39,6 @@ jobs:
--languages en
--branches 3.14
- - name: Display docsbuild.log
- if: always()
- run: cat ./logs/docsbuild.log
-
unit:
name: Unit tests
runs-on: ubuntu-latest
diff --git a/build_docs.py b/build_docs.py
index 0eb900e..cbbeff4 100755
--- a/build_docs.py
+++ b/build_docs.py
@@ -1042,7 +1042,7 @@ def parse_args() -> argparse.Namespace:
def setup_logging(log_directory: Path, select_output: str | None) -> None:
"""Setup logging to stderr if run by a human, or to a file if run from a cron."""
log_format = "%(asctime)s %(levelname)s: %(message)s"
- if sys.stderr.isatty():
+ if sys.stderr.isatty() or 'CI' in os.environ:
logging.basicConfig(format=log_format, stream=sys.stderr)
else:
log_directory.mkdir(parents=True, exist_ok=True)
From e0601130a6ff538f35d843a1cd962d87b2dbdc23 Mon Sep 17 00:00:00 2001
From: Adam Turner <9087854+aa-turner@users.noreply.github.com>
Date: Sat, 12 Apr 2025 03:27:28 +0100
Subject: [PATCH 4/4] Format
---
build_docs.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build_docs.py b/build_docs.py
index cbbeff4..8c81737 100755
--- a/build_docs.py
+++ b/build_docs.py
@@ -1042,7 +1042,7 @@ def parse_args() -> argparse.Namespace:
def setup_logging(log_directory: Path, select_output: str | None) -> None:
"""Setup logging to stderr if run by a human, or to a file if run from a cron."""
log_format = "%(asctime)s %(levelname)s: %(message)s"
- if sys.stderr.isatty() or 'CI' in os.environ:
+ if sys.stderr.isatty() or "CI" in os.environ:
logging.basicConfig(format=log_format, stream=sys.stderr)
else:
log_directory.mkdir(parents=True, exist_ok=True)
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy