Updated auth methods messages/redirects

[astakos] / snf-astakos-app / setup.py

diff --git a/snf-astakos-app/setup.py b/snf-astakos-app/setup.py
index 86b13be..b952913 100644 (file)
--- a/snf-astakos-app/setup.py
+++ b/snf-astakos-app/setup.py
@@ -65,11 +65,11 @@ PACKAGES = find_packages(PACKAGES_ROOT)
 
 # Package meta
 CLASSIFIERS = [
-        'Development Status :: 3 - Alpha',
-        'Operating System :: OS Independent',
-        'Programming Language :: Python',
-        'Topic :: Utilities',
-        'License :: OSI Approved :: BSD License',
+    'Development Status :: 3 - Alpha',
+    'Operating System :: OS Independent',
+    'Programming Language :: Python',
+    'Topic :: Utilities',
+    'License :: OSI Approved :: BSD License',
 ]
 
 # Package requirements
@@ -78,11 +78,11 @@ INSTALL_REQUIRES = [
     'South>=0.7, <=0.7.3',
     'httplib2>=0.6.0',
     'snf-common>=0.9.0',
-    'django-recaptcha',
+    'recaptcha-client>=1.0.5',
     'django-ratelimit==0.1',
-    'commissioning',
     'celery',
     'requests',
+    'inflect'
 ]
 
 EXTRAS_REQUIRES = {
@@ -103,13 +103,15 @@ standard_exclude_directories = [
 # Note: you may want to copy this into your setup.py file verbatim, as
 # you can't import this from another package, when you don't know if
 # that package is installed yet.
+
+
 def find_package_data(
     where=".",
     package="",
     exclude=standard_exclude,
     exclude_directories=standard_exclude_directories,
     only_in_packages=True,
-    show_ignored=False):
+        show_ignored=False):
     """
     Return a dictionary suitable for use in ``package_data``
     in a distutils ``setup.py`` file.
@@ -146,7 +148,7 @@ def find_package_data(
                 bad_name = False
                 for pattern in exclude_directories:
                     if (fnmatchcase(name, pattern)
-                        or fn.lower() == pattern.lower()):
+                            or fn.lower() == pattern.lower()):
                         bad_name = True
                         if show_ignored:
                             print >> sys.stderr, (
@@ -156,20 +158,21 @@ def find_package_data(
                 if bad_name:
                     continue
                 if (os.path.isfile(os.path.join(fn, "__init__.py"))
-                    and not prefix):
+                        and not prefix):
                     if not package:
                         new_package = name
                     else:
                         new_package = package + "." + name
                     stack.append((fn, "", new_package, False))
                 else:
-                    stack.append((fn, prefix + name + "/", package, only_in_packages))
+                    stack.append(
+                        (fn, prefix + name + "/", package, only_in_packages))
             elif package or not only_in_packages:
                 # is a file
                 bad_name = False
                 for pattern in exclude:
                     if (fnmatchcase(name, pattern)
-                        or fn.lower() == pattern.lower()):
+                            or fn.lower() == pattern.lower()):
                         bad_name = True
                         if show_ignored:
                             print >> sys.stderr, (
@@ -178,7 +181,7 @@ def find_package_data(
                         break
                 if bad_name:
                     continue
-                out.setdefault(package, []).append(prefix+name)
+                out.setdefault(package, []).append(prefix + name)
     return out
 
 setup(
@@ -186,9 +189,9 @@ setup(
     version=VERSION,
     license='BSD',
     url='http://code.grnet.gr/projects/astakos',
-    description = SHORT_DESCRIPTION,
-    long_description=README + '\n\n' +  CHANGES,
-    classifiers = CLASSIFIERS,
+    description=SHORT_DESCRIPTION,
+    long_description=README + '\n\n' + CHANGES,
+    classifiers=CLASSIFIERS,
     author='GRNET',
     author_email='astakos@grnet.gr',
 
@@ -197,20 +200,19 @@ setup(
     package_data=find_package_data('.'),
     zip_safe=False,
 
-    install_requires = INSTALL_REQUIRES,
+    install_requires=INSTALL_REQUIRES,
 
-    dependency_links = ['http://docs.dev.grnet.gr/pypi'],
+    dependency_links=['http://docs.dev.grnet.gr/pypi'],
 
     entry_points={
         'synnefo': [
-             'default_settings = astakos.im.synnefo_settings',
-             'web_apps = astakos.im.synnefo_settings:installed_apps',
-             'web_middleware = astakos.im.synnefo_settings:middlware_classes',
-             'web_context_processors = astakos.im.synnefo_settings:context_processors',
-             'urls = astakos.urls:urlpatterns',
-             'web_static = astakos.im.synnefo_settings:static_files',
-             'loggers = astakos.im.synnefo_settings:loggers'
+            'default_settings = astakos.im.synnefo_settings',
+            'web_apps = astakos.im.synnefo_settings:installed_apps',
+            'web_middleware = astakos.im.synnefo_settings:middlware_classes',
+            'web_context_processors = astakos.im.synnefo_settings:context_processors',
+            'urls = astakos.urls:urlpatterns',
+            'web_static = astakos.im.synnefo_settings:static_files',
+            'loggers = astakos.im.synnefo_settings:loggers'
         ]
     }
 )
-