From 3ccf378b6718da89a4bd4c02d05323e2676c1d2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Kl=C3=B6ckner?= Date: Thu, 30 Jul 2020 19:23:18 +0200 Subject: [PATCH] Revert "Merge branch 'master' into 'master'" This reverts merge request !27 --- prepare-and-run-pylint.sh | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/prepare-and-run-pylint.sh b/prepare-and-run-pylint.sh index 1876e90..933e074 100644 --- a/prepare-and-run-pylint.sh +++ b/prepare-and-run-pylint.sh @@ -13,13 +13,11 @@ if ! test -f .pylintrc.yml; then curl -o .pylintrc.yml "${ci_support}/.pylintrc-default.yml" fi -# - pylint<2.6 version bound put in place out of an abundance of cautiousness, no -# particular reason. -- 2020-07-15 AK -# - pytest is being installed since test_*.py modules may import pytest, which -# pylint may inspect. -# - pytest<6 because https://github.com/pytest-dev/pytest/pull/7565 did not make -# pytest-6.0.0. -$PY_EXE -m pip install "pylint<2.6" PyYAML "pytest<6" +# <2.6 version bound put in place out of an abundance of cautiousness, no particular reason +# 2020-07-15 AK +# pytest is being installed since test_*.py modules may import pytest, which +# pylint may inspect. +$PY_EXE -m pip install "pylint<2.6" PyYAML pytest PYLINT_RUNNER_ARGS="--yaml-rcfile=.pylintrc.yml" -- GitLab