From 9a85c4c6c8da4ecc23cf62259210fbee45c373d4 Mon Sep 17 00:00:00 2001 From: Emanuele Bellocchia <54482000+ebellocchia@users.noreply.github.com> Date: Wed, 24 Apr 2024 23:20:08 +0200 Subject: [PATCH] Fix macOS version, update to python setup v4 --- .github/workflows/code-analysis.yml | 2 +- .github/workflows/code-coverage.yml | 2 +- .github/workflows/test.yml | 29 +++++++++++++++++++++++++++-- .github/workflows/test_min_reqs.yml | 14 +++++++------- 4 files changed, 36 insertions(+), 11 deletions(-) diff --git a/.github/workflows/code-analysis.yml b/.github/workflows/code-analysis.yml index dab518b3..123b87ed 100644 --- a/.github/workflows/code-analysis.yml +++ b/.github/workflows/code-analysis.yml @@ -14,7 +14,7 @@ jobs: steps: - uses: actions/checkout@v4 - name: Set up Python 3.11 - uses: actions/setup-python@v3 + uses: actions/setup-python@v4 with: python-version: "3.11" - name: Install dependencies diff --git a/.github/workflows/code-coverage.yml b/.github/workflows/code-coverage.yml index c4dc340a..2e65fcf4 100644 --- a/.github/workflows/code-coverage.yml +++ b/.github/workflows/code-coverage.yml @@ -10,7 +10,7 @@ jobs: steps: - uses: actions/checkout@v4 - name: Set up Python 3.11 - uses: actions/setup-python@v3 + uses: actions/setup-python@v4 with: python-version: "3.11" - name: Install dependencies diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 565d83d5..b77d50c7 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -9,11 +9,11 @@ on: branches: [ "master" ] jobs: - build_test: + build_test_older_than_py310: strategy: fail-fast: false matrix: - python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"] + python-version: ["3.7", "3.8", "3.9", "3.10"] os: - ubuntu-latest - macOS-13 @@ -33,3 +33,28 @@ jobs: - name: Run tests run: | pytest + + build_test_newer_than_py311: + strategy: + fail-fast: false + matrix: + python-version: ["3.11", "3.12"] + os: + - ubuntu-latest + - macOS-latest + - windows-latest + runs-on: ${{ matrix.os }} + steps: + - uses: actions/checkout@v4 + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v4 + with: + python-version: ${{ matrix.python-version }} + - name: Install dependencies + run: | + python -m pip install --upgrade pip + pip install -r requirements.txt + pip install -r requirements-dev.txt + - name: Run tests + run: | + pytest diff --git a/.github/workflows/test_min_reqs.yml b/.github/workflows/test_min_reqs.yml index 67d0da08..3869bdb2 100644 --- a/.github/workflows/test_min_reqs.yml +++ b/.github/workflows/test_min_reqs.yml @@ -9,7 +9,7 @@ on: branches: [ "master" ] jobs: - build_test_py37: + test_min_reqs_py37: strategy: fail-fast: false matrix: @@ -41,14 +41,14 @@ jobs: run: | pytest - build_test_py38_39: + test_min_reqs_py38_39: strategy: fail-fast: false matrix: python-version: ["3.8", "3.9"] # Same minimum requirements os: - ubuntu-latest - - macOS-latest + - macOS-13 - windows-latest runs-on: ${{ matrix.os }} steps: @@ -73,13 +73,13 @@ jobs: run: | pytest - build_test_py310: + test_min_reqs_py310: strategy: fail-fast: false matrix: os: - ubuntu-latest - - macOS-latest + - macOS-13 - windows-latest runs-on: ${{ matrix.os }} steps: @@ -104,7 +104,7 @@ jobs: run: | pytest - build_test_py311: + test_min_reqs_py311: strategy: fail-fast: false matrix: @@ -135,7 +135,7 @@ jobs: run: | pytest - build_test_py312: + test_min_reqs_py312: strategy: fail-fast: false matrix: