From eb113d8d0b4a814bd0a275d5f0c05280027042e5 Mon Sep 17 00:00:00 2001
From: Ethan Paul <e@enp.one>
Date: Sat, 14 Mar 2020 12:22:09 -0400
Subject: [PATCH] Merge static and static-tests tox envs

---
 tox.ini | 22 ++++------------------
 1 file changed, 4 insertions(+), 18 deletions(-)

diff --git a/tox.ini b/tox.ini
index ded16db..6366863 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py36, py37, py38, format, static, static-tests, docs
+envlist = py36, py37, py38, format, static, docs
 skip_missing_interpreters = true
 isolated_build = true
 
@@ -27,27 +27,13 @@ commands =
 description = Static code analysis (mypy+pylint+bandit)
 ignore_errors = true
 deps =
-    pylint == 2.3.1
-    astroid == 2.2.5
+    pylint == 2.4.4
     mypy == 0.761
     bandit == 1.6.2
 commands =
-    mypy keyosk --ignore-missing-imports --no-strict-optional
-    pylint keyosk --rcfile .pylintrc
+    mypy keyosk tests --ignore-missing-imports --no-strict-optional
+    pylint keyosk tests --rcfile .pylintrc
     bandit --recursive keyosk
-
-[testenv:static-tests]
-description = Static code analysis for the tests (mypy+pylint+bandit)
-ignore_errors = true
-deps =
-    pytest == 5.3.5
-    pylint == 2.3.1
-    astroid == 2.2.5
-    mypy == 0.761
-    bandit == 1.6.2
-commands =
-    mypy tests --ignore-missing-imports --no-strict-optional
-    pylint tests --rcfile .pylintrc
     bandit --recursive tests --skip B101
 
 [testenv:docs]