aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDr. Jens Harbott <harbott@osism.tech>2022-04-07 11:02:22 +0200
committerDr. Jens Harbott <harbott@osism.tech>2022-04-12 08:45:16 +0200
commit4cfaadec59021c8e3f6a12d790204cfb0c744286 (patch)
treefc7eea02673d2314839ca4bb5078d8b8c768387a
parentbf30ed621be18a2a9de538167c255c23f2921df7 (diff)
downloadkolla-ansible-4cfaadec59021c8e3f6a12d790204cfb0c744286.tar.gz
kolla-ansible-4cfaadec59021c8e3f6a12d790204cfb0c744286.zip
Move lint requirements to dedicated file
These are not needed for unit tests and we want to avoid conflicts when running with older python versions that we still test against. We intentionally duplicate ansible and reno as requirements in order to avoid having to install more items than necessary. Signed-off-by: Dr. Jens Harbott <harbott@osism.tech> Change-Id: I0ec83c3e4ae38f911b922a3bade65429d91169eb
-rw-r--r--lint-requirements.txt8
-rw-r--r--test-requirements.txt8
-rw-r--r--tox.ini3
3 files changed, 9 insertions, 10 deletions
diff --git a/lint-requirements.txt b/lint-requirements.txt
new file mode 100644
index 000000000..3d0d656b8
--- /dev/null
+++ b/lint-requirements.txt
@@ -0,0 +1,8 @@
+ansible>=4,<6 # GPLv3
+ansible-lint>=4.2.0,!=4.3.0,<6.0.0 # MIT
+bandit>=1.1.0 # Apache-2.0
+bashate>=0.5.1 # Apache-2.0
+doc8>=0.6.0 # Apache-2.0
+hacking>=3.0.1,<3.1.0 # Apache-2.0
+reno>=3.1.0 # Apache-2.0
+yamllint>=1.22.0 #GPL3
diff --git a/test-requirements.txt b/test-requirements.txt
index 4176d0160..76b4eba12 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,11 +1,3 @@
-# linting
-ansible-lint>=4.2.0,!=4.3.0,<6.0.0 # MIT
-bandit>=1.1.0 # Apache-2.0
-bashate>=0.5.1 # Apache-2.0
-doc8>=0.6.0 # Apache-2.0
-hacking>=3.0.1,<3.1.0 # Apache-2.0
-yamllint>=1.22.0 #GPL3
-
# coverage testing
coverage!=4.4,>=4.0 # Apache-2.0
diff --git a/tox.ini b/tox.ini
index 9bf07e99c..1f85daf10 100644
--- a/tox.ini
+++ b/tox.ini
@@ -93,8 +93,7 @@ setenv =
ANSIBLE_FILTER_PLUGINS = {toxinidir}/ansible/filter_plugins
deps =
-c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
- -r{toxinidir}/test-requirements.txt
- -r{toxinidir}/doc/requirements.txt
+ -r{toxinidir}/lint-requirements.txt
allowlist_externals = bash
find
commands =