From 11a6917238ec9150b8029b013931709a1582d94d Mon Sep 17 00:00:00 2001 From: blag Date: Sun, 15 Oct 2023 17:19:19 -0700 Subject: [PATCH] Remove setup.cfg, and remove last references to flake8 --- Makefile | 6 +++--- setup.cfg | 13 ------------- tox.ini | 8 +------- 3 files changed, 4 insertions(+), 23 deletions(-) delete mode 100644 setup.cfg diff --git a/Makefile b/Makefile index 4a05d30..5a87979 100644 --- a/Makefile +++ b/Makefile @@ -1,9 +1,9 @@ TARGET?=tests -.PHONY: flake8 example test coverage +.PHONY: ruff example test coverage -flake8: - flake8 user_sessions example tests +ruff: + ruff user_sessions example tests example: DJANGO_SETTINGS_MODULE=example.settings PYTHONPATH=. \ diff --git a/setup.cfg b/setup.cfg deleted file mode 100644 index ec7b34b..0000000 --- a/setup.cfg +++ /dev/null @@ -1,13 +0,0 @@ -[flake8] -exclude = user_sessions/migrations/,docs/conf.py,.tox,.eggs -max-line-length = 119 - -[isort] -skip = user_sessions/migrations/ -combine_as_imports = true -default_section = THIRDPARTY -include_trailing_comma = true -known_first_party = two_factor -line_length = 79 -multi_line_output = 5 -sections=FUTURE,STDLIB,THIRDPARTY,FIRSTPARTY,LOCALFOLDER diff --git a/tox.ini b/tox.ini index d1a8b60..191e76f 100644 --- a/tox.ini +++ b/tox.ini @@ -7,7 +7,6 @@ envlist = py{38,39,310}-dj{32,40,41} py{311}-dj41 py{311,312}-dj{42,main} - flake8 [gh-actions] python = @@ -15,7 +14,7 @@ python = 3.8: py38 3.9: py39 3.10: py310 - 3.11: py311, flake8 + 3.11: py311 3.12: py312 [gh-actions:env] @@ -43,8 +42,3 @@ deps = ignore_outcome = djmain: True allowlist_externals = make - -[testenv:flake8] -basepython = python3.11 -deps = flake8 -commands = flake8