X-Git-Url: http://www.project-moonshot.org/gitweb/?p=freeradius-pysaml2.git;a=blobdiff_plain;f=setup.py;h=29e93e76e50c3441e84ca2d6e2b2037e045b07d4;hp=c75840b55607cff4f6cc1337db574a044dde3281;hb=9419ac5045f6e069fe27e2fac834462e38c1e350;hpb=83af048d1542232e2914e73e159cc8e5e37fb2a9

diff --git a/setup.py b/setup.py
index c75840b..29e93e7 100644
--- a/setup.py
+++ b/setup.py
@@ -2,8 +2,10 @@
 
 import os
 
-"""Setup script for the pyparsing module distribution."""
-from distutils.core import setup
+try:
+    from setuptools import setup
+except ImportError:
+    from distutils.core import setup
 
 __author__ = 'rolandh'
 
@@ -12,12 +14,12 @@ def read(fname):
 
 setup(# Distribution meta-data
     name = "freeradius_pysaml2",
-    version = "0.0.4",
-    description = "FreeRadius python module to be used in Moonshot",
+    version = "0.0.5",
+    description = "FreeRadius python modules to be used in Moonshot",
     author = "Roland Hedberg",
     author_email = "roland.hedberg@adm.umu.se",
     license = "MIT License",
-    py_modules = ['freeradius_pysaml2','radiusd', "freeradius_ecp"],
+    py_modules = ['freeradius_aa','radiusd', "freeradius_ecp"],
     classifiers=[
         'Development Status :: 4 - Beta',
         'Intended Audience :: Developers',
@@ -35,12 +37,9 @@ setup(# Distribution meta-data
                              'attributemaps/saml_uri.py',
                              'attributemaps/shibboleth_uri.py']),
                 ('/usr/local/etc/moonshot/pki',
-                            ['pki/ssl.cert', 'pki/ssl.key']),
-                ('/usr/local/etc/moonshot/template',
-                            ['template/modules_python',
-                             'template/sites-available_default',
-                             'template/sites-available_inner-tunnel'])],
-    install_requires=[
-        'pysaml2'
-    ]
+                            ['pki/ssl.cert', 'pki/ssl.key'])],
+    zip_safe=False,
+#    install_requires=[
+#        'pysaml2'
+#    ]
     )