From 39e9e097d1329ac733532fdaa582645673c1868e Mon Sep 17 00:00:00 2001
From: Jesse Pretorius <jesse.pretorius@rackspace.co.uk>
Date: Tue, 15 Dec 2015 09:17:29 +0000
Subject: [PATCH] Merge bashate/pep8 lint jobs in common job

Instead of launching two separate build jobs in our CI infrastructure,
one for bashate and one for pep8, launch a single one. While the jobs
are short, the setup of the images takes a long time, so this is
friendlier to our CI infrastructure.

Use the pep8 environment as common lint target and merge the bashate job
into it.

This patch also renamed dev-requirements to test-requirements to bring it
into line with all other OpenStack projects.

Change-Id: Ie1181799082b36d59dfaf4bf9446c06bd70696b7
---
 dev-requirements.txt => test-requirements.txt |  0
 tox.ini                                       | 29 +++++++++----------
 2 files changed, 14 insertions(+), 15 deletions(-)
 rename dev-requirements.txt => test-requirements.txt (100%)

diff --git a/dev-requirements.txt b/test-requirements.txt
similarity index 100%
rename from dev-requirements.txt
rename to test-requirements.txt
diff --git a/tox.ini b/tox.ini
index a6c6b3bd..21a609d2 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,13 +1,13 @@
 [tox]
 minversion = 1.6
 skipsdist = True
-envlist = docs,pep8,bashate,ansible-syntax,ansible-lint,functional
+envlist = docs,pep8,ansible-syntax,ansible-lint,functional
 
 [testenv]
 usedevelop = True
 install_command = pip install -U {opts} {packages}
 setenv = VIRTUAL_ENV={envdir}
-deps = -r{toxinidir}/dev-requirements.txt
+deps = -r{toxinidir}/test-requirements.txt
 commands =
     /usr/bin/find . -type f -name "*.pyc" -delete
     ansible-galaxy install \
@@ -20,13 +20,16 @@ commands = python setup.py build_sphinx
 
 # environment used by the -infra templated docs job
 [testenv:venv]
-deps = -r{toxinidir}/dev-requirements.txt
+deps = -r{toxinidir}/test-requirements.txt
 commands = {posargs}
 
-# Run hacking/flake8 check for all python files
+# Run various lint checks
 [testenv:pep8]
-deps = flake8
+deps =
+    bashate
+    flake8
 whitelist_externals = bash
+# Run hacking/flake8 check for all python files
 commands =
     bash -c "grep -Irl \
         -e '!/usr/bin/env python' \
@@ -40,19 +43,9 @@ commands =
         --exclude '*.sh' \
         {toxinidir} | xargs flake8 --verbose"
 
-[flake8]
-# Ignores the following rules due to how ansible modules work in general
-#     F403 'from ansible.module_utils.basic import *' used; unable to detect undefined names
-#     H303  No wildcard (*) import.
-ignore=F403,H303
-
 # Run bashate check for all bash scripts
 # Ignores the following rules:
 #     E003: Indent not multiple of 4 (we prefer to use multiples of 2)
-[testenv:bashate]
-deps = bashate
-whitelist_externals = bash
-commands =
     bash -c "grep -Irl \
         -e '!/usr/bin/env bash' \
         -e '!/bin/bash' \
@@ -63,6 +56,12 @@ commands =
         --exclude 'tox.ini' \
         {toxinidir} | xargs bashate --verbose --ignore=E003"
 
+[flake8]
+# Ignores the following rules due to how ansible modules work in general
+#     F403 'from ansible.module_utils.basic import *' used; unable to detect undefined names
+#     H303  No wildcard (*) import.
+ignore=F403,H303
+
 [testenv:ansible-syntax]
 changedir = tests
 commands =