From b0919b57fc1aef484559d909a337202ad2ac303b Mon Sep 17 00:00:00 2001 From: Raymond Penners Date: Mon, 28 Aug 2023 21:29:20 +0200 Subject: [PATCH] chore(ci): Split checkqa stage --- .github/workflows/ci.yml | 2 +- tox.ini | 24 +++++++++++++++--------- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 40b15f7a0c..fba2b4a5be 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -63,7 +63,7 @@ jobs: runs-on: ubuntu-22.04 strategy: matrix: - extra-env: ['docs', 'checkqa', 'standardjs'] + extra-env: ['docs', 'black', 'isort', 'flake8', 'standardjs'] steps: - uses: actions/checkout@v3 - uses: actions/setup-node@v3 diff --git a/tox.ini b/tox.ini index 01a5af319c..6fc888033e 100644 --- a/tox.ini +++ b/tox.ini @@ -4,7 +4,9 @@ envlist = py{38,39,310,311}-django{40,41,42} py{310,311}-djangomain docs - checkqa + isort + black + flake8 standardjs [testenv] @@ -38,25 +40,29 @@ whitelist_externals = make commands = make -C {toxinidir}/docs html -[testenv:checkqa] +[testenv:isort] skip_install = True ignore_errors = True deps = - flake8==6.0.0 isort==5.12.0 - black==23.1.0 commands = - flake8 {posargs:{toxinidir}/allauth} isort --check-only --skip-glob '*/migrations/*' --diff {posargs:{toxinidir}/allauth} + +[testenv:black] +skip_install = True +ignore_errors = True +deps = + black==23.1.0 +commands = black --check {posargs:{toxinidir}/allauth} {posargs:{toxinidir}/setup.py} -[testenv:isort] -basepython = python3.7 +[testenv:flake8] skip_install = True +ignore_errors = True deps = - isort >5 + flake8==6.0.0 commands = - isort --skip-glob '*/migrations/*' {posargs:{toxinidir}/allauth} + flake8 {posargs:{toxinidir}/allauth} [testenv:standardjs] skip_install = True