From 822eeef6d7b459d881ffd239aa4119b175b7ce4b Mon Sep 17 00:00:00 2001
From: Andrew Hutchings <andrew@linuxjedi.co.uk>
Date: Mon, 11 Jun 2012 11:07:14 +0100
Subject: [PATCH] Add tox.ini

Pyflakes builder was switched to using tox but this repo doesn't have a
tox.ini so all builds failed.  Also fixes setup.py for when we don't
need Sphinx

Change-Id: I49d425d001cde159c354be53b7d57eebdb4446df
---
 setup.py | 20 ++++++++++++--------
 tox.ini  |  6 ++++++
 2 files changed, 18 insertions(+), 8 deletions(-)
 create mode 100644 tox.ini

diff --git a/setup.py b/setup.py
index d8682dce56..71c411f089 100644
--- a/setup.py
+++ b/setup.py
@@ -1,16 +1,20 @@
 import datetime
 from setuptools import setup
-from sphinx.setup_command import BuildDoc
 
 ci_cmdclass={}
 
-class local_BuildDoc(BuildDoc):
-    def run(self):
-        for builder in ['html', 'man']:
-            self.builder = builder
-            self.finalize_options()
-            BuildDoc.run(self)
-ci_cmdclass['build_sphinx'] = local_BuildDoc
+try:
+    from sphinx.setup_command import BuildDoc
+
+    class local_BuildDoc(BuildDoc):
+        def run(self):
+            for builder in ['html', 'man']:
+                self.builder = builder
+                self.finalize_options()
+                BuildDoc.run(self)
+    ci_cmdclass['build_sphinx'] = local_BuildDoc
+except Exception:
+    pass
 
 setup(name='nova',
       version="%d.%02d" % (datetime.datetime.now().year, datetime.datetime.now().month), 
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 0000000000..0ab7e9fd4c
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,6 @@
+[tox]
+envlist = pyflakes
+
+[testenv:pyflakes]
+deps = pyflakes
+commands = pyflakes modules setup.py