diff options
| author | Michael Still <mikal@stillhq.com> | 2026-04-28 11:56:15 +1000 |
|---|---|---|
| committer | Michal Nasiadka <mnasiadka@gmail.com> | 2026-04-28 06:39:50 +0000 |
| commit | c61312fd9ce82f11e48890caaea1761c2b0a9191 (patch) | |
| tree | d45412de87ac5ee207dc1e1418b9677f7ae95032 | |
| parent | afc09fc357d936f7c5c7b9ee17255623924352a2 (diff) | |
| download | kolla-c61312fd9ce82f11e48890caaea1761c2b0a9191.tar.gz kolla-c61312fd9ce82f11e48890caaea1761c2b0a9191.zip | |
Remove upper-constraints from Kolla linters.
Linting on master for Kolla is failing right now. The root cause is
that master's upper-constraints.txt pins pathspec===1.1.0, but
ansible-lint 26.4.0 requires pathspec<1.1.0,>=1.0.3.
Sadly not using upper-constraints in Kolla linters is a little more
complex than in Kolla-Ansible because of the inheritance of tox
dependencies. This patch therefore moves ansible-lint from
test-requirements.txt to a new lint-requirements.txt file.
Change-Id: I751ab5eb7a798502e79228568bda53fdec4971d6
Signed-off-by: Michael Still <mikal@stillhq.com>
| -rw-r--r-- | lint-requirements.txt | 1 | ||||
| -rw-r--r-- | test-requirements.txt | 1 | ||||
| -rw-r--r-- | tox.ini | 4 | ||||
| -rw-r--r-- | zuul.d/base.yaml | 1 |
4 files changed, 5 insertions, 2 deletions
diff --git a/lint-requirements.txt b/lint-requirements.txt new file mode 100644 index 000000000..3a87b7a7b --- /dev/null +++ b/lint-requirements.txt @@ -0,0 +1 @@ +ansible-lint===26.4.0 # MIT diff --git a/test-requirements.txt b/test-requirements.txt index 19e65b2d6..2acfc73a4 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,5 +1,4 @@ ansible-core>=2.18,<2.20; python_version >= '3.11' # GPLv3 -ansible-lint===26.4.0 # MIT bandit!=1.6.0,>=1.1.0 # Apache-2.0 bashate>=0.5.1 # Apache-2.0 coverage!=4.4,>=4.0 # Apache-2.0 @@ -42,7 +42,9 @@ commands = [testenv:pep8] deps = - {[testenv]deps} + -r{toxinidir}/requirements.txt + -r{toxinidir}/test-requirements.txt + -r{toxinidir}/lint-requirements.txt codespell allowlist_externals = bash commands = diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml index e071fd589..5d491bc0b 100644 --- a/zuul.d/base.yaml +++ b/zuul.d/base.yaml @@ -14,6 +14,7 @@ - ^.*\.rst$ - ^doc/.* - ^etc/.* + - ^lint-requirements.txt$ - ^releasenotes/.*$ - ^specs/.*$ - ^test-requirements.txt$ |