From 16c3edfb175738e73397baf2ee9f121b8c8ec983 Mon Sep 17 00:00:00 2001
From: Chewing_Bever <roosensjef@gmail.com>
Date: Sun, 25 Apr 2021 09:48:35 +0200
Subject: [PATCH 1/2] Switched to setup.cfg for deps

---
 Makefile  |  2 +-
 setup.cfg | 20 ++++++++++++++++++++
 setup.py  | 16 ----------------
 3 files changed, 21 insertions(+), 17 deletions(-)
 create mode 100644 setup.cfg

diff --git a/Makefile b/Makefile
index 622f36c..1b3dcbc 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 .[ci] -e .[lint] -e .[dev]
+	.venv/bin/pip install -e .[develop]
 
 venv: .venv/bin/activate
 .PHONY: venv
diff --git a/setup.cfg b/setup.cfg
new file mode 100644
index 0000000..1596273
--- /dev/null
+++ b/setup.cfg
@@ -0,0 +1,20 @@
+[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
+
+# Required for the developer
+develop =
+    %(ci)s
+    %(lint)s
+    jedi==0.18.0
diff --git a/setup.py b/setup.py
index 644626a..0b00eae 100644
--- a/setup.py
+++ b/setup.py
@@ -7,20 +7,4 @@ 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",
-        ],
-    },
 )

From 79fb3c9a114b514e28fad6a21dca45315628af40 Mon Sep 17 00:00:00 2001
From: Chewing_Bever <roosensjef@gmail.com>
Date: Sun, 25 Apr 2021 09:59:18 +0200
Subject: [PATCH 2/2] Added flake8 stuff

---
 .flake8   | 4 ++++
 Makefile  | 1 +
 setup.cfg | 5 +++++
 3 files changed, 10 insertions(+)
 create mode 100644 .flake8

diff --git a/.flake8 b/.flake8
new file mode 100644
index 0000000..bb31e22
--- /dev/null
+++ b/.flake8
@@ -0,0 +1,4 @@
+# vim: ft=cfg
+[flake8]
+inline-quotes = double
+max-complexity = 7
diff --git a/Makefile b/Makefile
index 1b3dcbc..b96d269 100644
--- a/Makefile
+++ b/Makefile
@@ -18,6 +18,7 @@ format: venv
 
 clean:
 	rm -rf .venv
+	rm -rf .tox
 	rm backup_tool
 .PHONY: clean
 
diff --git a/setup.cfg b/setup.cfg
index 1596273..ca07553 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -12,6 +12,11 @@ test =
 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 =