From dfc2c0ef9e1b5ed25d05f1222742fd9cf42e5062 Mon Sep 17 00:00:00 2001
From: Rodolfo Alonso Hernandez <ralonsoh@redhat.com>
Date: Wed, 22 Dec 2021 02:11:49 +0000
Subject: [PATCH] Move linters dependencies to tox.ini

That fixes some dependency clashes in py36 job when installing
"pylint" with "astroid" library.

Closes-Bug: #1955724
Change-Id: I7cc4b779c68fe21d6ca50b6c76cdd2b6edaa7ea2
---
 test-requirements.txt | 3 ---
 tox.ini               | 4 ++++
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/test-requirements.txt b/test-requirements.txt
index 17a2b4bd..749805c3 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -2,13 +2,10 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 
-hacking>=3.0.1,<3.1.0 # Apache-2.0
-
 coverage!=4.4,>=4.0 # Apache-2.0
 isort==4.3.21 # MIT
 python-subunit>=1.0.0 # Apache-2.0/BSD
 oslotest>=3.2.0 # Apache-2.0
-pylint==2.6.0 # GPLv2
 stestr>=2.0.0 # Apache-2.0
 testscenarios>=0.4 # Apache-2.0/BSD
 testtools>=2.2.0 # MIT
diff --git a/tox.ini b/tox.ini
index 08576d54..a79d55ab 100644
--- a/tox.ini
+++ b/tox.ini
@@ -20,11 +20,15 @@ deps =
   -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
   -r{toxinidir}/test-requirements.txt
   -r{toxinidir}/requirements.txt
+  hacking>=3.0.1,<3.1.0 # Apache-2.0
 commands = stestr run --slowest {posargs}
 
 [testenv:pep8]
 commands = flake8
            {toxinidir}/tools/coding-checks.sh --all '{posargs}'
+deps =
+  {[testenv]deps}
+  pylint==2.5.3 # GPLv2
 
 [testenv:venv]
 commands = {posargs}