From b02482156d4a6eff54afa168cab08274a1bbcd19 Mon Sep 17 00:00:00 2001
From: Jan Pokorny <jpokorny@redhat.com>
Date: Dec 03 2010 22:37:30 +0000
Subject: setup.py: refined install_requires (dependecies)


---

diff --git a/luci.spec b/luci.spec
index 654998b..d91a639 100644
--- a/luci.spec
+++ b/luci.spec
@@ -81,7 +81,7 @@ Requires:       openssl
 # Authentication service against which luci users are authenticated;
 # this version is required as it initially searches config files in /etc/sasl2
 # (see http://www.postfix.org/SASL_README.html#server_cyrus_location)
-Requires:       cyrus-sasl >= 2.1.22-1
+Requires:       cyrus-sasl >= 2.1.22
 # Following package is required to ensure PAM authentication via saslauthd
 # works out-of-the-box (saslauthd from cyrus-sasl uses "pam" mechanism
 # by default, but does not require it; also needed for /etc/pam.d directory)
diff --git a/setup.py b/setup.py
index 7af2353..e1825f0 100644
--- a/setup.py
+++ b/setup.py
@@ -381,24 +381,36 @@ setup(
     # ADDITIONAL SETUPTOOLS ARGUMENTS
 
     setup_requires=[
-         # Used (only passively, via its ``egg_info.writers'' entry point
-         # sought by setuptools) to create paster_plugins.txt in egg-info dir
-         # with the content defined in ``paster_plugins'' value
+        # Only for dealing with i18n (extracting strings etc.)
+        # TODO: uncomment this when ready for localization
+        # "Babel >=0.9.4",
+        # Used (only passively, via its ``egg_info.writers'' entry point
+        # sought by setuptools) to create paster_plugins.txt in egg-info dir
+        # with the content defined in ``paster_plugins'' value
         "PasteScript >= 1.7",
     ],
     install_requires=[
-        "Babel >=0.9.4",
+        "repoze.who-friendlyform",
         "TurboGears2 >= 2.0b7",
-        "repoze.tm2 >= 1.0a4",
-        "toscawidgets >= 0.9.7.1",
-        "zope.sqlalchemy >= 0.4",
+        "tw.forms",
+        # Used but already required by previously stated (i.e. transitively):
+        # "PasteDeploy",
+        # "repoze.what",
+        # "repoze.what-pylons",
+        # "repoze.who",
+        # "SQLAlchemy",
+        # "toscawidgets >= 0.9.7.1",
+        # "transaction",
+        # "zope.interface",
+        # "zope.sqlalchemy >= 0.4",
     ],
     # Use pure ``package_data'' value (i.e. do no use MANIFEST.ini or CVS tree);
     # see also comment by ``package data''
     include_package_data=False,
 
-    test_suite='nose.collector',
-    tests_require=['BeautifulSoup', 'WebTest'],
+    # TODO: uncomment this when ready for tests
+    #test_suite='nose.collector',
+    #tests_require=['BeautifulSoup', 'WebTest'],
 
     # Entry points (``dynamic discovery of services and plugins'' mechanism
     # introduced by setuptools); mainly following groups of entry points are