From fad11d703cf5933701f3508e63d97b78e4e35787 Mon Sep 17 00:00:00 2001 From: James Falcon Date: Tue, 26 Jan 2021 13:48:50 -0600 Subject: [PATCH 1/2] Stop linting cloud_tests The tox pylint command was failing because of competing dependencies in the multiple requirements files. Given that we plan on no longer updating cloud_tests, we also no longer need to lint them. --- tox.ini | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tox.ini b/tox.ini index 9444e66c1f2..48085733235 100644 --- a/tox.ini +++ b/tox.ini @@ -26,9 +26,9 @@ deps = pylint==2.6.0 # test-requirements because unit tests are now present in cloudinit tree -r{toxinidir}/test-requirements.txt - -r{toxinidir}/cloud-tests-requirements.txt -r{toxinidir}/integration-requirements.txt -commands = {envpython} -m pylint {posargs:cloudinit tests tools} +commands = {envpython} -m pylint {posargs:cloudinit tests --ignore=cloud_tests tools} + [testenv:py3] basepython = python3 From a92264968511494cd60ecdf4eb611dd16e80e148 Mon Sep 17 00:00:00 2001 From: James Falcon Date: Tue, 26 Jan 2021 14:07:29 -0600 Subject: [PATCH 2/2] [squash] also adding tip-pylint --- tox.ini | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tox.ini b/tox.ini index 48085733235..5cb999bd58a 100644 --- a/tox.ini +++ b/tox.ini @@ -123,13 +123,12 @@ commands = {envpython} -m flake8 {posargs:cloudinit/ tests/ tools/} deps = flake8 [testenv:tip-pylint] -commands = {envpython} -m pylint {posargs:cloudinit tests tools} +commands = {envpython} -m pylint {posargs:cloudinit tests --ignore=cloud_tests tools} deps = # requirements pylint # test-requirements -r{toxinidir}/test-requirements.txt - -r{toxinidir}/cloud-tests-requirements.txt -r{toxinidir}/integration-requirements.txt [testenv:citest]