From 8b4f8d91ad4aac047a11838a4fa11c51fd693fdc Mon Sep 17 00:00:00 2001
From: Lars Kellogg-Stedman <lars@redhat.com>
Date: Tue, 14 Oct 2014 12:41:29 -0400
Subject: [PATCH] modify tox config to use new validation code

this patch modifies tox.ini to perform both the JSON and YAML validation
checks.

Change-Id: Ie8db699f19dc7698407bab1e3d51dcb6184cfad2
---
 test-requirements.txt | 2 +-
 tox.ini               | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/test-requirements.txt b/test-requirements.txt
index df7e22df38..5500f007d0 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1 +1 @@
-demjson
+PyYAML
diff --git a/tox.ini b/tox.ini
index 53c0c830e4..286a71767a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -8,4 +8,5 @@ deps = -r{toxinidir}/test-requirements.txt
 
 [testenv:pep8]
 commands = 
-    {toxinidir}/tools/validate-json.sh
+    {toxinidir}/tools/validate-all-json.sh
+    {toxinidir}/tools/validate-all-yaml.sh