From ecd352db35307d5e0e329aa6c4358e71f2bf4138 Mon Sep 17 00:00:00 2001 From: razgitbot Date: Tue, 26 Nov 2019 11:00:18 +0200 Subject: [PATCH 1/5] Add correct tox envs to circle config #88 --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 38e02a3..beb286f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -52,8 +52,8 @@ jobs: - .tox - run: tox -e py2-django1_11 - run: tox -e py3-django1_11 - - run: tox -e py3-django2_0 - run: tox -e py3-django2_1 + - run: tox -e py3-django2_2 - run: tox -e coverage workflows: From a11ca3f07efb9ec2df1b8ff959c7e2af4f3d53c5 Mon Sep 17 00:00:00 2001 From: razgitbot Date: Tue, 26 Nov 2019 11:48:33 +0200 Subject: [PATCH 2/5] Issue #88 ignore F401, because we will not use the django contrib package --- tox.ini | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tox.ini b/tox.ini index 5a25d00..97b12f1 100644 --- a/tox.ini +++ b/tox.ini @@ -26,6 +26,7 @@ deps = basepython = python3 deps = flake8 commands = flake8 +ignore = F401 [testenv:isort] basepython = python3 @@ -35,7 +36,7 @@ commands = isort -c -rc nopassword tests [testenv:coverage] basepython = python3 deps = coverage -commands = +commands = coverage combine - coverage report + coverage report coverage xml From ba34b874eb7bb29dde1cccad784c72a887f085eb Mon Sep 17 00:00:00 2001 From: razgitbot Date: Tue, 26 Nov 2019 11:57:07 +0200 Subject: [PATCH 3/5] try per file ignore --- tox.ini | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 97b12f1..bf42cb9 100644 --- a/tox.ini +++ b/tox.ini @@ -26,7 +26,8 @@ deps = basepython = python3 deps = flake8 commands = flake8 -ignore = F401 +per-file-ignores = + tests/models.py:4:5: F401 [testenv:isort] basepython = python3 From e11868faf6f9b01005d77280d61003fd470a9ce4 Mon Sep 17 00:00:00 2001 From: razgitbot Date: Tue, 26 Nov 2019 11:57:07 +0200 Subject: [PATCH 4/5] try per file ignore --- tox.ini | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 97b12f1..2b13775 100644 --- a/tox.ini +++ b/tox.ini @@ -26,7 +26,10 @@ deps = basepython = python3 deps = flake8 commands = flake8 -ignore = F401 + +[flake8] +per-file-ignores = + tests/models.pyF401 [testenv:isort] basepython = python3 From 1ed686c24931a512aa21cbb2feb442402be0ac95 Mon Sep 17 00:00:00 2001 From: razgitbot Date: Tue, 26 Nov 2019 12:28:26 +0200 Subject: [PATCH 5/5] try to put the parameter when tox calls flake8 to ignore file --- .circleci/config.yml | 2 +- tox.ini | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index beb286f..df54a07 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -16,7 +16,7 @@ jobs: key: v1-tox-{{ checksum "tox.ini" }}-{{ checksum "requirements.txt" }} paths: - .tox - - run: tox -e flake8 + - run: tox -e flake8 --per-file-ignores ='tests/models.py:F401' isort: docker: diff --git a/tox.ini b/tox.ini index 2b13775..5047cc6 100644 --- a/tox.ini +++ b/tox.ini @@ -27,10 +27,6 @@ basepython = python3 deps = flake8 commands = flake8 -[flake8] -per-file-ignores = - tests/models.pyF401 - [testenv:isort] basepython = python3 deps = isort