From 2940b44e29fd8e4a510da7f9dc0f9dcbffa375f2 Mon Sep 17 00:00:00 2001 From: rocky Date: Wed, 7 Aug 2024 16:49:47 -0400 Subject: [PATCH] Sync workflows and versions with mathics-core --- ...utoblack.yml => isort-and-black-checks.yml} | 18 +++++++++--------- .github/workflows/osx.yaml | 4 ++-- .github/workflows/ubuntu.yml | 4 ++-- .github/workflows/windows.yml | 4 ++-- 4 files changed, 15 insertions(+), 15 deletions(-) rename .github/workflows/{autoblack.yml => isort-and-black-checks.yml} (73%) diff --git a/.github/workflows/autoblack.yml b/.github/workflows/isort-and-black-checks.yml similarity index 73% rename from .github/workflows/autoblack.yml rename to .github/workflows/isort-and-black-checks.yml index 1a3d95976..8d0d48090 100644 --- a/.github/workflows/autoblack.yml +++ b/.github/workflows/isort-and-black-checks.yml @@ -3,21 +3,21 @@ # Othewrwise, Black is run and its changes are committed back to the incoming pull request. # https://github.com/cclauss/autoblack -name: autoblack +name: isort and black check on: [pull_request] jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - name: Set up Python 3.9 - uses: actions/setup-python@v3 + - uses: actions/checkout@v4 + - name: Set up Python 3.11 + uses: actions/setup-python@v5 with: - python-version: 3.9 - - name: Install click - run: pip install 'click==8.0.4' - - name: Install Black - run: pip install 'black==22.3.0' + python-version: 3.11 + - name: Install click, black and isort + run: pip install 'click==8.0.4' 'black==23.12.1' 'isort==5.13.2' + - name: Run isort --check . + run: isort --check . - name: Run black --check . run: black --check . - name: If needed, commit black changes to the pull request diff --git a/.github/workflows/osx.yaml b/.github/workflows/osx.yaml index 352b2b088..7d3853dc9 100644 --- a/.github/workflows/osx.yaml +++ b/.github/workflows/osx.yaml @@ -13,9 +13,9 @@ jobs: matrix: python-version: ['3.9', '3.10', '3.11'] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - name: Install OS dependencies diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 4b42bc7e4..696c9f8ed 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -13,9 +13,9 @@ jobs: matrix: python-version: ['3.8', '3.9', '3.10', '3.11'] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v3 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - name: Install OS dependencies diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 3723324f0..6cd1eb012 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -14,9 +14,9 @@ jobs: os: [windows] python-version: ['3.11'] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v3 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - name: Install OS dependencies