From a14189f603c9f014711fc73f11c4ad14404ef455 Mon Sep 17 00:00:00 2001 From: Dylan Staley <88163+dstaley@users.noreply.github.com> Date: Tue, 25 Feb 2020 14:27:10 -0800 Subject: [PATCH 1/2] run black on CI --- .travis.yml | 12 +++--------- Makefile | 3 +++ 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0f9a64d..9246b06 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,15 +26,9 @@ matrix: dist: xenial sudo: true env: TOX_ENV=py37 SERVER=development - - python: 3.6 - env: - - TOX_ENV=flake8 - before_install: - - python --version - python: 3.7 dist: xenial - sudo: true env: - - TOX_ENV=flake8 - before_install: - - python --version + - TOX_ENV=code-lint + script: + - make lint diff --git a/Makefile b/Makefile index 25a2c88..705c25c 100644 --- a/Makefile +++ b/Makefile @@ -48,6 +48,9 @@ flake8: install-dev black: install-dev $(VENV)/bin/black kinto_http +lint: install-dev + $(VENV)/bin/therapist run --use-tracked-files kinto_http + clean: find . -name '*.pyc' -delete find . -name '__pycache__' -type d | xargs rm -fr From a288c18a8fdca46a2608183437097b388f41c4d2 Mon Sep 17 00:00:00 2001 From: Dylan Staley <88163+dstaley@users.noreply.github.com> Date: Thu, 27 Feb 2020 13:49:52 -0800 Subject: [PATCH 2/2] remove flake8 env from tox --- tox.ini | 9 --------- 1 file changed, 9 deletions(-) diff --git a/tox.ini b/tox.ini index c20d323..87a5e7c 100644 --- a/tox.ini +++ b/tox.ini @@ -7,12 +7,3 @@ commands = py.test kinto_http/tests/functional.py kinto_http/tests --cov-report term-missing --cov-fail-under 100 --cov kinto_http {posargs} deps = -rdev-requirements.txt install_command = pip install {opts} {packages} - -[testenv:flake8] -basepython = python3 -commands = flake8 kinto_http -deps = - flake8 - -[flake8] -max-line-length = 99