diff --git a/.github/workflows/black.yml b/.github/workflows/black.yml deleted file mode 100644 index 794a8a7..0000000 --- a/.github/workflows/black.yml +++ /dev/null @@ -1,21 +0,0 @@ -name: Black - -on: [push, pull_request] - -jobs: - - format: - # We want to run on external PRs, but not on our own internal PRs as they'll be run - # by the push to the branch. Without this if check, checks are duplicated since - # internal PRs match both the push and pull_request events. - if: - github.event_name == 'push' || - github.event.pull_request.head.repo.full_name != github.repository - - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - uses: actions/setup-python@v2 - - uses: psf/black@stable - with: - args: ". --check" diff --git a/.github/workflows/flake8.yml b/.github/workflows/lint.yml similarity index 75% rename from .github/workflows/flake8.yml rename to .github/workflows/lint.yml index 467c94b..15470d4 100644 --- a/.github/workflows/flake8.yml +++ b/.github/workflows/lint.yml @@ -1,9 +1,8 @@ -name: Flake8 +name: Lint on: [push, pull_request] jobs: - lint: # We want to run on external PRs, but not on our own internal PRs as they'll be run # by the push to the branch. Without this if check, checks are duplicated since @@ -15,12 +14,12 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - name: Set up Python 3.8 - uses: actions/setup-python@v2 + - name: Set up Python 3.11 + uses: actions/setup-python@v4 with: - python-version: 3.8 + python-version: 3.11 - name: Lint run: | - pip install flake8 - flake8 lessons + pip install nox + nox -s lint