From: Sofie Van Landeghem Date: Wed, 17 Sep 2025 22:19:41 +0000 (+0200) Subject: 💚 Fix CI test suite for Windows and MacOS (#1307) X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=35c0005f441cb6b2e34fa1ff45a6c73e721a14ac;p=thirdparty%2Ffastapi%2Fsqlmodel.git 💚 Fix CI test suite for Windows and MacOS (#1307) --- diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 570941f5..c4fdb911 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -25,17 +25,30 @@ jobs: test: strategy: matrix: - os: [ ubuntu-latest ] - python-version: - - "3.8" - - "3.9" - - "3.10" - - "3.11" - - "3.12" - - "3.13" + os: [ ubuntu-latest, windows-latest, macos-latest ] + python-version: [ "3.13" ] pydantic-version: - pydantic-v1 - pydantic-v2 + include: + - os: macos-latest + python-version: "3.8" + pydantic-version: pydantic-v1 + - os: windows-latest + python-version: "3.9" + pydantic-version: pydantic-v2 + - os: ubuntu-latest + python-version: "3.10" + pydantic-version: pydantic-v1 + - os: macos-latest + python-version: "3.11" + pydantic-version: pydantic-v2 + - os: windows-latest + python-version: "3.12" + pydantic-version: pydantic-v1 + - os: ubuntu-latest + python-version: "3.12" + pydantic-version: pydantic-v2 fail-fast: false runs-on: ${{ matrix.os }} steps: @@ -78,7 +91,7 @@ jobs: - name: Store coverage files uses: actions/upload-artifact@v4 with: - name: coverage-${{ matrix.python-version }}-${{ matrix.pydantic-version }} + name: coverage-${{ runner.os }}-${{ matrix.python-version }}-${{ matrix.pydantic-version }} path: coverage include-hidden-files: true diff --git a/pyproject.toml b/pyproject.toml index 766b0558..4ae195ac 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -81,6 +81,7 @@ source = [ ] context = '${CONTEXT}' dynamic_context = "test_function" +relative_files = true [tool.coverage.report] show_missing = true diff --git a/tests/test_select_gen.py b/tests/test_select_gen.py index e14200d5..664cebf2 100644 --- a/tests/test_select_gen.py +++ b/tests/test_select_gen.py @@ -13,7 +13,7 @@ def test_select_gen() -> None: env = os.environ.copy() env["CHECK_JINJA"] = "1" result = subprocess.run( - [sys.executable, "scripts/generate_select.py"], + [sys.executable, Path("scripts") / "generate_select.py"], env=env, check=True, cwd=root_path,