From f4ad4660b96a3cf1cf79493647a8a6116a5860ce Mon Sep 17 00:00:00 2001 From: Blair Bonnett Date: Sun, 26 Jan 2025 14:25:24 +0100 Subject: [PATCH] Update workflows --- .github/workflows/ci-tests.yml | 11 ++++++----- .github/workflows/lint.yml | 23 +++++------------------ .github/workflows/matplotlib-main.yml | 15 +++++---------- 3 files changed, 16 insertions(+), 33 deletions(-) diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml index 82fedd3..806ee5d 100644 --- a/.github/workflows/ci-tests.yml +++ b/.github/workflows/ci-tests.yml @@ -17,14 +17,14 @@ jobs: strategy: fail-fast: false matrix: - python-version: [ "3.9", "3.11" ] - matplotlib-version: [ "3.5.3", "3.7.1" ] + python-version: [3.11, 3.13] + matplotlib-version: [ "3.7.5", "3.10.0" ] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: "${{ matrix.python-version }}" architecture: x64 @@ -42,7 +42,8 @@ jobs: run: pytest --cov-report=xml - name: Upload coverage report - uses: codecov/codecov-action@v3 + uses: codecov/codecov-action@v5 with: files: coverage.xml flags: "Matplotlib-${{ matrix.matplotlib-version}}-Python-${{ matrix.python-version }}" + token: ${{ secrets.CODECOV_TOKEN }} diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index a07aabc..f8682ef 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -13,28 +13,15 @@ jobs: run-linters: runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python id: setup - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: - python-version: "3.x" + python-version: 3.x architecture: x64 - - name: Check import ordering with isort - id: isort - continue-on-error: true - uses: isort/isort-action@master - - - name: Check code style with Black - id: black - continue-on-error: true - uses: psf/black@stable - - - name: Check overall status - run: | - if [ ${{steps.isort.outcome}} = "failure" ]; then exit 1; fi - if [ ${{steps.black.outcome}} = "failure" ]; then exit 1; fi + - name: Check with ruff + uses: astral-sh/ruff-action@v3 diff --git a/.github/workflows/matplotlib-main.yml b/.github/workflows/matplotlib-main.yml index 0ecdbd2..52c17fe 100644 --- a/.github/workflows/matplotlib-main.yml +++ b/.github/workflows/matplotlib-main.yml @@ -14,18 +14,12 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - - name: Decide on Python version - id: mpl-main-nep29 - uses: mstimberg/github-calc-nep29@v0.2 - with: - token: ${{ secrets.GITHUB_TOKEN }} + - uses: actions/checkout@v4 - name: Set up Python - uses: actions/setup-python@v2 + uses: actions/setup-python@v5 with: - python-version: "${{ steps.mpl-main-nep29.outputs.max-python }}" + python-version: 3.11 architecture: x64 - name: Install system libraries @@ -47,7 +41,8 @@ jobs: run: pytest --cov-report=xml - name: Upload coverage report - uses: codecov/codecov-action@v2.1.0 + uses: codecov/codecov-action@v5 with: files: coverage.xml name: "Matplob main branch ${{ steps.mpl-main-version.outputs.matplotlib-version }}" + token: ${{ secrets.CODECOV_TOKEN }}