diff --git a/.flake8 b/.flake8 deleted file mode 100644 index bb31e22..0000000 --- a/.flake8 +++ /dev/null @@ -1,4 +0,0 @@ -# vim: ft=cfg -[flake8] -inline-quotes = double -max-complexity = 7 diff --git a/Makefile b/Makefile index b96d269..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 .[develop] + .venv/bin/pip install -e .[ci] -e .[lint] -e .[dev] venv: .venv/bin/activate .PHONY: venv @@ -18,7 +18,6 @@ format: venv clean: rm -rf .venv - rm -rf .tox rm backup_tool .PHONY: clean diff --git a/setup.cfg b/setup.cfg deleted file mode 100644 index ca07553..0000000 --- a/setup.cfg +++ /dev/null @@ -1,25 +0,0 @@ -[options.extras_require] -# Used to run the tests inside the CICD pipeline -ci = - tox==3.21.1 - -# Used inside Tox for running tests -test = - pytest==6.2.3 - pytest-cov==2.11.1 - -# Used inside tox for linting -lint = - black==20.8b1 - flake8==3.8.4 - flake8-bugbear==20.1.4 - flake8-comprehensions==3.2.3 - flake8-docstrings==1.5.0 - flake8-print==3.1.4 - flake8-quotes==3.2.0 - -# Required for the developer -develop = - %(ci)s - %(lint)s - jedi==0.18.0 diff --git a/setup.py b/setup.py index 0b00eae..644626a 100644 --- a/setup.py +++ b/setup.py @@ -7,4 +7,20 @@ setup( description="A utility to simply backing up services.", # TODO add license packages=["app", "tests"], + extras_require={ + "ci": [ + "tox==3.21.1", + ], + "test": { + "pytest==6.2.3", + "pytest-cov==2.11.1", + }, + "lint": [ + "black==20.8b1", + "flake8==3.8.4", + ], + "dev": [ + "jedi==0.18.0", + ], + }, )