From 6b7658d5a7660faac42412dea799173fe351d1af Mon Sep 17 00:00:00 2001 From: jo Date: Mon, 13 Sep 2021 14:22:48 +0200 Subject: [PATCH] Use shared makefile de requirements --- tools/Makefile | 2 +- tools/python.mk | 11 ++++++++++- tools/requirements-dev.txt | 4 ---- 3 files changed, 11 insertions(+), 6 deletions(-) delete mode 100644 tools/requirements-dev.txt diff --git a/tools/Makefile b/tools/Makefile index 578884c69..dd674fb08 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -2,7 +2,7 @@ all: lint test include python.mk -PIP_INSTALL = -r requirements-dev.txt +PIP_INSTALL = PYLINT_ARG = tools MYPY_ARG = . PYTEST_ARG = . diff --git a/tools/python.mk b/tools/python.mk index d5117d1fa..db8d5be5f 100644 --- a/tools/python.mk +++ b/tools/python.mk @@ -8,12 +8,21 @@ CPU_CORES = $(shell nproc) # MYPY_ARG = # PYTEST_ARG = +SHARED_DEV_REQUIREMENTS = \ + black \ + isort \ + mypy \ + pylint \ + pytest \ + pytest-cov \ + pytest-xdist + VENV = venv $(VENV): python3 -m venv $(VENV) source $(VENV)/bin/activate pip install --upgrade pip setuptools wheel - pip install $(PIP_INSTALL) + pip install $(SHARED_DEV_REQUIREMENTS) $(PIP_INSTALL) .PHONY: .format .format: $(VENV) diff --git a/tools/requirements-dev.txt b/tools/requirements-dev.txt deleted file mode 100644 index cda4c0a74..000000000 --- a/tools/requirements-dev.txt +++ /dev/null @@ -1,4 +0,0 @@ -mypy -pylint -pytest -pytest-xdist