summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClaudiu Popa <pcmanticore@gmail.com>2018-03-01 09:58:20 +0100
committerClaudiu Popa <pcmanticore@gmail.com>2018-03-01 09:58:20 +0100
commitd159b7b0d4a0cdf6edccfe8a85adf348cf882b8f (patch)
tree50148f75d674d3027859150de8023373d1a2028f
parent1b011db5d9986469bb69142510ad59a282241091 (diff)
downloadpylint-git-d159b7b0d4a0cdf6edccfe8a85adf348cf882b8f.tar.gz
Astroid needs to be pinned to less than 1.6 in pylint 1.7
-rw-r--r--pylint/__pkginfo__.py2
-rw-r--r--tox.ini4
2 files changed, 3 insertions, 3 deletions
diff --git a/pylint/__pkginfo__.py b/pylint/__pkginfo__.py
index 5bae2a662..1fe17d0cc 100644
--- a/pylint/__pkginfo__.py
+++ b/pylint/__pkginfo__.py
@@ -22,7 +22,7 @@ numversion = (1, 7, 6)
version = '.'.join([str(num) for num in numversion])
install_requires = [
- 'astroid>=1.5.1',
+ 'astroid<1.6,>=1.5.1',
'six',
'isort >= 4.2.5',
'mccabe',
diff --git a/tox.ini b/tox.ini
index da9316876..f33c60754 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,14 +4,14 @@ skip_missing_interpreters = true
[testenv:pylint]
deps =
- astroid>=1.5.1
+ astroid>=1.5.1,<1.6
isort
commands = pylint -rn --rcfile={toxinidir}/pylintrc --load-plugins=pylint.extensions.docparams, pylint.extensions.mccabe {envsitepackagesdir}/pylint
[testenv]
deps =
- astroid>=1.5.1
+ astroid>=1.5.1,<1.6
coverage
isort
mccabe