From 154934bc9139e6e085a0554fc64aa9044236b317 Mon Sep 17 00:00:00 2001
From: Mathias Stelzer <knoppo@rolln.de>
Date: Mon, 15 Nov 2021 19:40:51 +0100
Subject: [PATCH] move flake8 task to tox and ci-templates updates
---
.gitlab-ci.yml | 13 +++++++------
lint_requirements.txt | 23 -----------------------
tasks.py | 7 -------
tox.ini | 29 +++++++++++++++++++++++++++++
4 files changed, 36 insertions(+), 36 deletions(-)
delete mode 100644 lint_requirements.txt
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index efd673e..f3fe718 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,17 +10,18 @@ variables:
HODS_DEBUG_HTML: 1
test:
- extends: .python-test-matrix
+ extends:
+ - .python-test
+ - .python-tox
script:
- apt-get update
- apt-get install -y rsync
- - pip install tox
- tox
-lint:
- extends: .python-invoke
+flake8:
+ extends: .python-tox
script:
- - inv lint
+ - tox -e flake8
build docs image:
extends: .docker-build
@@ -37,7 +38,7 @@ docs:
- inv docs --screenshots
coverage:
- extends: .python-coverage
+ extends: .python-coverage-report
needs:
- test
diff --git a/lint_requirements.txt b/lint_requirements.txt
deleted file mode 100644
index f0b7c30..0000000
--- a/lint_requirements.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-flake8
-flake8-2020
-flake8-absolute-import
-flake8-broken-line
-flake8-builtins
-flake8-coding
-flake8-commas
-flake8-comprehensions
-flake8-copyright
-flake8-debugger
-flake8-docstrings
-flake8-eradicate
-flake8-executable
-flake8-fixme
-flake8-import-order
-flake8-logging-format
-flake8-mutable
-flake8-pep3101
-flake8-quotes
-flake8-rst-docstrings
-flake8-string-format
-pep8-naming
-pycodestyle
diff --git a/tasks.py b/tasks.py
index a43f66f..641d10d 100644
--- a/tasks.py
+++ b/tasks.py
@@ -8,13 +8,6 @@ from invoke import task
__dirname__ = os.path.abspath(os.path.dirname(__file__))
-@task
-def lint(c):
- """Run the linter (flake8)."""
- c.run('pip install -r lint_requirements.txt', echo=True)
- c.run('flake8 --count', echo=True)
-
-
@task
def docs_screenshots(c):
"""Run the tests and store screenshots in docs directory"""
diff --git a/tox.ini b/tox.ini
index 7d90b13..dfc9aa5 100644
--- a/tox.ini
+++ b/tox.ini
@@ -119,3 +119,32 @@ commands =
coverage combine
coverage html
coverage report
+
+
+[testenv:flake8]
+skip_install = true
+deps =
+ flake8
+ flake8-2020
+ flake8-absolute-import
+ flake8-broken-line
+ flake8-builtins
+ flake8-coding
+ flake8-commas
+ flake8-comprehensions
+ flake8-copyright
+ flake8-debugger
+ flake8-docstrings
+ flake8-eradicate
+ flake8-executable
+ flake8-fixme
+ flake8-import-order
+ flake8-logging-format
+ flake8-mutable
+ flake8-pep3101
+ flake8-quotes
+ flake8-rst-docstrings
+ flake8-string-format
+ pep8-naming
+ pycodestyle
+commands = flake8 --statistics --count
--
GitLab