From fb8c1b7822cd9acd1f90b441a0f48f77b068de0d Mon Sep 17 00:00:00 2001
From: Jonathan de Jong <jonathandejong02@gmail.com>
Date: Wed, 16 Sep 2020 19:46:01 +0000
Subject: [PATCH] get tox to use lint extras

---
 synapse/python_dependencies.py |  8 +++++++-
 tox.ini                        | 10 ++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py
index bed9db872872..4377ea9c21f2 100644
--- a/synapse/python_dependencies.py
+++ b/synapse/python_dependencies.py
@@ -104,7 +104,13 @@
     # hiredis is not a *strict* dependency, but it makes things much faster.
     # (if it is not installed, we fall back to slow code.)
     "redis": ["txredisapi>=1.4.7", "hiredis"],
-    "lint": ["isort==5.0.3", "black==19.10b0", "flake8-comprehensions", "flake8"],
+    # We pin black so that our tests don't start failing on new releases.
+    "lint": [
+        "isort<=5.0.3",
+        'black==19.10b0;python_version>"3.5"',
+        "flake8-comprehensions",
+        "flake8",
+    ],
 }
 
 ALL_OPTIONAL_REQUIREMENTS = set()  # type: Set[str]
diff --git a/tox.ini b/tox.ini
index df473bd234a6..ddcab0198fc2 100644
--- a/tox.ini
+++ b/tox.ini
@@ -118,20 +118,14 @@ commands =
     check-manifest
 
 [testenv:check_codestyle]
-skip_install = True
-deps =
-    flake8
-    flake8-comprehensions
-    # We pin so that our tests don't start failing on new releases of black.
-    black==19.10b0
+extras = lint
 commands =
     python -m black --check --diff .
     /bin/sh -c "flake8 synapse tests scripts scripts-dev contrib synctl {env:PEP8SUFFIX:}"
     {toxinidir}/scripts-dev/config-lint.sh
 
 [testenv:check_isort]
-skip_install = True
-deps = isort==5.0.3
+extras = lint
 commands = /bin/sh -c "isort -c --df --sp setup.cfg synapse tests scripts-dev scripts"
 
 [testenv:check-newsfragment]