From fb6fa45799be507a876841c136c1b5e614b1fea0 Mon Sep 17 00:00:00 2001
From: Pierre Sassoulas <pierre.sassoulas@gmail.com>
Date: Mon, 14 Dec 2020 09:01:01 +0100
Subject: Fix appveyor bug with the version of astroid not matching the real
 version

See https://ci.appveyor.com/project/PCManticore/pylint/builds/36810764/job/yifu7v0ky6ea2so4
---
 tox.ini | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'tox.ini')

diff --git a/tox.ini b/tox.ini
index 70a0a327b..5767a3f36 100644
--- a/tox.ini
+++ b/tox.ini
@@ -54,7 +54,7 @@ commands =
 
 [testenv]
 deps =
-   https://github.com/PyCQA/astroid/tarball/master#egg=astroid-master-2.0
+   https://github.com/PyCQA/astroid/tarball/master#egg=astroid
    coverage<5.0
    mccabe
    # isort 5 is not compatible with Python 3.5
@@ -80,7 +80,7 @@ changedir = {toxworkdir}
 
 [testenv:spelling]
 deps =
-   https://github.com/PyCQA/astroid/tarball/master#egg=astroid-master-2.0
+   https://github.com/PyCQA/astroid/tarball/master#egg=astroid
    pytest
    pytest-xdist
    pyenchant
@@ -136,7 +136,7 @@ commands =
 
 [testenv:benchmark]
 deps =
-   https://github.com/PyCQA/astroid/tarball/master#egg=astroid-master-2.0
+   https://github.com/PyCQA/astroid/tarball/master#egg=astroid
    coverage<5.0
    mccabe
    pytest
@@ -159,7 +159,7 @@ commands =
 
 [testenv:profile_against_external]
 deps =
-   https://github.com/PyCQA/astroid/tarball/master#egg=astroid-master-2.0
+   https://github.com/PyCQA/astroid/tarball/master#egg=astroid
    gprof2dot
    mccabe
    pytest
-- 
cgit v1.2.1


From 3a065a16f0826f3d46025209b11d30a1fd5b3b49 Mon Sep 17 00:00:00 2001
From: Pierre Sassoulas <pierre.sassoulas@gmail.com>
Date: Mon, 14 Dec 2020 13:49:23 +0100
Subject: Use pre-commit directly in the formatting tox job

Will prevent change in one of the script to affect the other one
---
 tox.ini | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'tox.ini')

diff --git a/tox.ini b/tox.ini
index 5767a3f36..1f88a5335 100644
--- a/tox.ini
+++ b/tox.ini
@@ -36,11 +36,11 @@ commands =
 [testenv:formatting]
 basepython = python3
 deps =
-    black==20.8b1
-    isort==5.5.2
+    pre-commit
+    sphinx
+    pytest
 commands =
-    black --diff --check . --exclude="tests/functional/|tests/input|tests/extensions/data|tests/regrtest_data/|tests/data/|venv|astroid|.tox"
-    isort . --check-only
+    pre-commit run --all-files
 changedir = {toxinidir}
 
 [testenv:mypy]
-- 
cgit v1.2.1