Merge branch 'tags' into search

[zzz-floof.git] / setup.py

diff --git a/setup.py b/setup.py
index b271114..30bf697 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -15,6 +15,7 @@ setup(
     install_requires=[
         "Pylons>=0.9.7",
         "SQLAlchemy>=0.5",
     install_requires=[
         "Pylons>=0.9.7",
         "SQLAlchemy>=0.5",

+        "elixir>=0.6",

         'python-openid',
     ],
     setup_requires=["PasteScript>=1.6.3"],
         'python-openid',
     ],
     setup_requires=["PasteScript>=1.6.3"],


@@ -27,7 +28,7 @@ setup(
     #        ('templates/**.mako', 'mako', {'input_encoding': 'utf-8'}),
     #        ('public/**', 'ignore', None)]},
     zip_safe=False,
     #        ('templates/**.mako', 'mako', {'input_encoding': 'utf-8'}),
     #        ('public/**', 'ignore', None)]},
     zip_safe=False,

-    paster_plugins=['PasteScript', 'Pylons'],
+    paster_plugins=['Elixir', 'PasteScript', 'Pylons', 'Shabti'],

     entry_points="""
     [paste.app_factory]
     main = floof.config.middleware:make_app
     entry_points="""
     [paste.app_factory]
     main = floof.config.middleware:make_app