cleanup tox

Author: michaelkuty

leonardo/module/search/__init__.py

@@ -17,19 +17,19 @@ def apps(self):
         INSTALLED_APPS = []
         try:
             import whoosh
-        except ImportError:
-            pass
+        except Exception as e:
+            try:
+                import haystack
+            except ImportError as e:
+                warnings.warn(
+                    'Haystack search engine is disabled because: {}'.format(e))
+            except ImproperlyConfigured as e:
+                warnings.warn(
+                    'Haystack search engine is disabled because: {}'.format(e))
+            else:
+                INSTALLED_APPS += ['haystack']
         else:
-            INSTALLED_APPS += ['whoosh']
-
-        try:
-            import haystack
-        except ImportError as e:
-            warnings.warn('Haystack search engine is disabled because: {}'.format(e))
-        except ImproperlyConfigured as e:
-            warnings.warn('Haystack search engine is disabled because: {}'.format(e))
-        else:
-            INSTALLED_APPS += ['haystack']
+            INSTALLED_APPS += ['whoosh', 'haystack']
 
         return INSTALLED_APPS + ['leonardo.module.search']
 

tox.ini

@@ -1,18 +1,15 @@
 [tox]
-setupdir = ..
+setupdir = .
 distribute = False
 envlist =
     {py27,py33,py34,py35}-django17,
     {py27,py35}-django18,
 
 [testenv]
 usedevelop = True
-install_command = pip install --allow-external --download={toxworkdir}/.cache pbr git+https://github.com/openstack/horizon@stable/juno#egg=horizon --allow-insecure netaddr -U {opts} {packages}
 commands =
     {envpython} tests/manage.py test {posargs:testapp} --settings=leonardo.settings
 setenv =
     PYTHONPATH = .:{toxworkdir}
 deps =
-    django17: Django>=1.7,<1.8
-    django18: Django>=1.8,<1.9
     -rrequirements/tests.txt