diff --git a/Makefile b/Makefile index bd7b550..622f36c 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,7 @@ PYTHON=python3.6 # =====RECIPES===== .venv/bin/activate: setup.py '$(PYTHON)' -m venv .venv - .venv/bin/pip install -e .[dev] -e .[ci] + .venv/bin/pip install -e .[ci] -e .[lint] -e .[dev] venv: .venv/bin/activate .PHONY: venv @@ -36,8 +36,10 @@ install: app cp backup_tool /usr/local/bin .PHONY: install +# We can't force the develop to have all the versions locally, so +# the local tests only include python3.6 test: venv tox.ini - @ .venv/bin/tox + @ .venv/bin/tox -e py36 .PHONY: test lint: venv diff --git a/setup.py b/setup.py index 75c9c5d..fb61212 100644 --- a/setup.py +++ b/setup.py @@ -8,14 +8,15 @@ setup( # TODO add license packages=["app", "tests"], extras_require={ - # A developer needs both "ci": [ "tox==3.21.1", ], - "dev": [ - "jedi==0.18.0", + "lint": [ "black==20.8b1", "flake8==3.8.4", ], + "dev": [ + "jedi==0.18.0", + ], }, ) diff --git a/tox.ini b/tox.ini index 3dd1159..d96d690 100644 --- a/tox.ini +++ b/tox.ini @@ -8,7 +8,7 @@ commands = [testenv:lint] basepython = python3.6 -deps = black==20.8b1 - flake8==3.8.4 +deps = .[lint] + commands = black --check setup.py app flake8 setup.py app