Index: /main/waeup.sirp/trunk/setup.py
===================================================================
--- /main/waeup.sirp/trunk/setup.py	(revision 5056)
+++ /main/waeup.sirp/trunk/setup.py	(revision 5057)
@@ -3,4 +3,26 @@
 
 version = '0.2dev'
+
+install_requires =[
+    'setuptools',
+    'grok',
+    'grokui.admin',
+    'hurry.query',
+    'hurry.workflow',
+    # Add extra requirements here
+    'zope.xmlpickle',
+    'hurry.yui',
+    'hurry.zoperesource',
+    'zc.sourcefactory',
+    'megrok.layout',
+    'zope.app.authentication', # BBB: During switch to grok 1.1
+    ],
+
+tests_require = [
+    'z3c.testsetup',
+    'zope.app.testing',
+    'zope.testbrowser',
+    'zope.testing',
+    ]
 
 def read(*rnames):
@@ -18,12 +40,12 @@
     )
 
-setup(name='waeup.sirp',
-      version=version,
-      description="A student online information and  registration portal",
-      long_description=long_description,
+setup(name = 'waeup.sirp',
+      version = version,
+      description = "A student online information and  registration portal",
+      long_description = long_description,
 
-      keywords="portal waeup sirp student university registration grok zope",
+      keywords = "portal waeup sirp student university registration grok zope",
       # Get strings from http://pypi.python.org/pypi?%3Aaction=list_classifiers
-      classifiers=[
+      classifiers = [
         'Development Status :: 3 - Alpha',
         'Environment :: Web Environment',
@@ -37,29 +59,20 @@
         'Topic :: Internet :: WWW/HTTP',
         ],
-      author="The WAeUP team.",
-      author_email="",
-      url="http://www.waeup.org/",
-      license="GPL",
-      package_dir={'': 'src'},
-      packages=find_packages('src'),
+      author = "The WAeUP team.",
+      author_email = "",
+      url = "http://www.waeup.org/",
+      license = "GPL",
+      package_dir = {'': 'src'},
+      packages= find_packages('src'),
       namespace_packages = ['waeup',],
-      include_package_data=True,
-      zip_safe=False,
-      install_requires=['setuptools',
-                        'grok',
-                        'grokui.admin',
-                        'hurry.query',
-                        'hurry.workflow',
-                        # Add extra requirements here
-                        'zope.xmlpickle',
-                        'hurry.yui',
-                        'hurry.zoperesource',
-                        'zc.sourcefactory',
-                        'megrok.layout',
-                        ],
-      extras_require=dict(
-        docs=['Sphinx',
-              'z3c.recipe.sphinxdoc',
-             ],
+      include_package_data = True,
+      zip_safe = False,
+      install_requires = install_requires,
+      tests_require = tests_require,
+      extras_require = dict(
+        test = tests_require,
+        docs = ['Sphinx',
+                'z3c.recipe.sphinxdoc',
+                ],
         ),
       entry_points="""
