diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 6196101..9f1c3ab 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -16,10 +16,6 @@ jobs: run: | python -m pip install --upgrade pip pip install tox - - name: Run lint 💅 - run: tox - env: - TOXENV: flake8 - name: Run pre-commit 💅 run: tox env: diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index f077196..e6c79ac 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -23,7 +23,6 @@ repos: rev: 22.3.0 hooks: - id: black - exclude: migrations/ - repo: https://github.com/PyCQA/flake8 rev: 4.0.1 hooks: diff --git a/Makefile b/Makefile index b850ae8..6ecb25a 100644 --- a/Makefile +++ b/Makefile @@ -14,7 +14,7 @@ test: tests # Alias test -> tests .PHONY: format format: - black --exclude "/migrations/" graphene_django examples setup.py + black graphene_django examples setup.py .PHONY: lint lint: diff --git a/setup.cfg b/setup.cfg index 52f6bf6..c725df1 100644 --- a/setup.cfg +++ b/setup.cfg @@ -5,7 +5,7 @@ test=pytest universal=1 [flake8] -exclude = docs,graphene_django/debug/sql/*,migrations +exclude = docs,graphene_django/debug/sql/* max-line-length = 120 select = # Dictionary key repeated diff --git a/tox.ini b/tox.ini index c936a37..6a8f6c6 100644 --- a/tox.ini +++ b/tox.ini @@ -3,7 +3,7 @@ envlist = py{36,37,38,39}-django{22,30,31}, py{36,37,38,39,310}-django32, py{38,39,310}-django{40,main}, - black,flake8 + pre-commit [gh-actions] python = @@ -38,18 +38,6 @@ deps = djangomain: https://github.com/django/django/archive/main.zip commands = {posargs:py.test --cov=graphene_django graphene_django examples} -[testenv:black] -basepython = python3.9 -deps = -e.[dev] -commands = - black --exclude "/migrations/" graphene_django examples setup.py --check - -[testenv:flake8] -basepython = python3.9 -deps = -e.[dev] -commands = - flake8 graphene_django examples setup.py - [testenv:pre-commit] skip_install = true deps = pre-commit