Changeset 4611 for TI12-security/trunk/python

Timestamp:

12/12/08 11:27:29 (11 years ago)

Author:

pjkersha

Message:

• Updates to egg dependencies - remove packages that are no longer needed
• incremented to overall version 1.0.0 ready for new release.

Location:

TI12-security/trunk/python

Files:

• Tests/openid-provider/authkitTmpl/setup.py (modified) (1 diff)
• ndg.security.client/setup.py (modified) (3 diffs)
• ndg.security.common/setup.py (modified) (3 diffs)
• ndg.security.server/setup.py (modified) (4 diffs)
• ndg.security.test/ndg/security/test/sslclientauthnmiddleware/ndgsecurity.wsgi (modified) (1 diff)
• ndg.security.test/setup.py (modified) (3 diffs)
• ndgSetup.sh (deleted)
• setup.py (modified) (2 diffs)

TI12-security/trunk/python/Tests/openid-provider/authkitTmpl/setup.py

@@ -13 +13 @@
       author='P J Kershaw',
       author_email='Philip.Kershaw@stfc.ac.uk',
-      url='http://proj.badc.rl.ac.uk/ndg/wiki/T12_Security',
+      url='http://proj.badc.rl.ac.uk/ndg/wiki/Security',
       license='Q License',
       packages=find_packages(exclude=['ez_setup', 'examples', 'tests']),

TI12-security/trunk/python/ndg.security.client/setup.py

@@ -22 +22 @@
 import os
 
-__revision__ = "$Id$"
-
-
-_entryPoints = \
-{
-    'console_scripts': [\
-        'ndgSessionClient = ndg.security.client.ndgSessionClient:main']
-}
-
 setup(
     name =                      'ndg_security_client',
-    version =                   '0.9.3',
+    version =                   '1.0.0',
     description =               'NERC DataGrid Security Utilities',
     long_description =          'Software for securing NDG resources',
@@ -40 +31 @@
     maintainer =            'Philip Kershaw',
     maintainer_email =      'Philip.Kershaw@stfc.ac.uk',
-    url =                       'http://proj.badc.rl.ac.uk/ndg/wiki/T12_Security',
+    url =                       'http://proj.badc.rl.ac.uk/ndg/wiki/Security',
     license =               'Q Public License, version 1.0 or later',
     install_requires =          ['ndg_security_common'],
@@ -60 +51 @@
     #'package_data =            {}
     #'exclude_package_data =    {}
-    entry_points =           _entryPoints,
     #'test_suite =                 'ndg.utils.test.suite',
     zip_safe =               False

TI12-security/trunk/python/ndg.security.common/setup.py

@@ -21 +21 @@
 
 import os, sys
-
-__revision__ = "$Id$"
-
 
 # Packages needed for NDG Security
@@ -61 +58 @@
 setup(
     name =                      'ndg_security_common',
-    version =                   '0.9.3',
+    version =                   '1.0.0',
     description = \
 '''NERC DataGrid Security virtual package containing common utilities used
@@ -70 +67 @@
     maintainer =                'Philip Kershaw',
     maintainer_email =          'Philip.Kershaw@stfc.ac.uk',
-    url =                       'http://proj.badc.rl.ac.uk/ndg/wiki/T12_Security',
+    url =                       'http://proj.badc.rl.ac.uk/ndg/wiki/Security',
     license =               'Q Public License, version 1.0 or later',
     install_requires =          _pkgDependencies,

TI12-security/trunk/python/ndg.security.server/setup.py

@@ -21 +21 @@
 import os
 
-__revision__ = "$Id$"
-
 # Packages needed for NDG Security
 # Note commented out ones fail with PyPI - use explicit link instead
@@ -28 +26 @@
 _pkgDependencies = [
     'ndg_security_common',
-    
-    # Zope interface
-    'zope.interface',
-    
     'AuthKit'
 ]
@@ -58 +52 @@
 setup(
     name =                      'ndg_security_server',
-    version =                   '0.9.3',
+    version =                   '1.0.0',
     description =               'NERC DataGrid Security Services',
     long_description =          'Server side component for securing NDG resources',
@@ -65 +59 @@
     maintainer =                'Philip Kershaw',
     maintainer_email =          'Philip.Kershaw@stfc.ac.uk',
-    url =                       'http://proj.badc.rl.ac.uk/ndg/wiki/T12_Security',
+    url =                       'http://proj.badc.rl.ac.uk/ndg/wiki/Security',
     license =               'Q Public License, version 1.0 or later',
     install_requires =          _pkgDependencies,

TI12-security/trunk/python/ndg.security.test/ndg/security/test/sslclientauthnmiddleware/ndgsecurity.wsgi

@@ -18 +18 @@
         WSGIScriptAlias /ndgsecurity /var/www/wsgi/ndgSecurity.wsgi
         
-        <Directory /usr/local/www/wsgi-scripts>
+        <Directory /usr/local/www/wsgi>
             Order allow,deny
             Allow from all

TI12-security/trunk/python/ndg.security.test/setup.py

@@ -16 +16 @@
 from ez_setup import use_setuptools
 use_setuptools()
-
 from setuptools import setup, find_packages
-
 import os
-
-__revision__ = "$Id$"
 
 _pkgData = {
@@ -96 +92 @@
 setup(
     name =                      'ndg_security_test',
-    version =                   '0.9.3',
+    version =                   '1.0.0',
     description =               'NERC DataGrid Security Unit tests',
     long_description =          'Unit tests client - server side',
@@ -103 +99 @@
     maintainer =                'Philip Kershaw',
     maintainer_email =          'Philip.Kershaw@stfc.ac.uk',
-    url =                       'http://proj.badc.rl.ac.uk/ndg/wiki/T12_Security',
+    url =                       'http://proj.badc.rl.ac.uk/ndg/wiki/Security',
     license =               'Q Public License, version 1.0 or later',
     packages =                      find_packages(),

TI12-security/trunk/python/setup.py

@@ -21 +21 @@
 import os
 
-__revision__ = "$Id$"
-
 setup(
     name =                      'ndg_security',
-    version =                   '0.9.3',
+    version =                   '1.0.0',
     description =               'NERC DataGrid Security Utilities',
     long_description =          'Software for securing NDG resources',
@@ -32 +30 @@
     maintainer =                'Philip Kershaw',
     maintainer_email =          'Philip.Kershaw@stfc.ac.uk',
-    url =                   'http://proj.badc.rl.ac.uk/ndg/wiki/T12_Security',
+    url =                   'http://proj.badc.rl.ac.uk/ndg/wiki/Security',
     install_requires =      ['ndg_security_client', 'ndg_security_server'],
     dependency_links =      ["http://ndg.nerc.ac.uk/dist"],