Changeset 2165


Ignore:
Timestamp:
13/02/07 16:53:03 (12 years ago)
Author:
pjkersha
Message:

python/ndg.security.server/setup.py: fixed to correctly install but still problems
with dependencies to resolve e.g. correct install of M2Crypto

python/ndg.security.common/setup.py: initial working version - needs more testing to
iron out bugs.

python/ndg.security.common/ndg/security/common/CredWallet.py: make explicit import from
ndg.security.common.AttAuthority? otherwise seems to cause problems when importing
from egg installed package.

python/ndg.security.common/setup.cfg: remove refs to NDG for include and lib dir paths.

Location:
TI12-security/trunk/python
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • TI12-security/trunk/python/ndg.security.common/ndg/security/common/CredWallet.py

    r2087 r2165  
    2929    # AttAuthority client package resides with CredWallet module in  
    3030    # ndg.security.common 
    31     from AttAuthority import AttAuthorityClient, AttAuthorityClientError, \ 
    32         AttributeRequestDenied 
     31    from ndg.security.common.AttAuthority import AttAuthorityClient, \ 
     32        AttAuthorityClientError, AttributeRequestDenied 
    3333    aaImportError = False 
    3434     
     
    3636    pass 
    3737 
    38 # Likewise - may want to use WS and not use AttAuthority locally in which case 
     38# Likewise - may not want to use WS and use AttAuthority locally in which case 
    3939# no need to import it 
    4040try: 
  • TI12-security/trunk/python/ndg.security.common/setup.cfg

    r1701 r2165  
    1313 
    1414[build_ext] 
    15 include_dirs: /usr/local/NDG/include 
    16 library_dirs: /usr/local/NDG/lib 
     15include_dirs: /usr/local/include 
     16library_dirs: /usr/local/lib 
    1717 
    1818[install] 
  • TI12-security/trunk/python/ndg.security.common/setup.py

    r1779 r2165  
    2020import os 
    2121 
    22 reposID = "$Id$" 
     22reposID = "$Id:$" 
    2323 
    24 # Get latest SubVersion revision for use with release ID 
    25 _svnRev = "$Revision$" 
    26 if "Revision" in _svnRev: 
    27     _version = 'DevPostAlpha' 
    28 else: 
    29     _version = "DevPostAlpha-" + _svnRev 
    3024 
    3125# Packages needed for NDG Security 
     
    3731#    'm2crypto', # build fails - find way to make it link with /usr/local/NDG openssl installation 
    3832    'ZSI', 
    39 #    '4Suite', don't need to include it as ZSI egg will get this instead 
    4033#    'Twisted', 
    4134#    'TwistedWeb', 
    42 #    'ZopeInterface',  
    4335    'pycrypto', 
    4436    'SQLObject', 
    4537#    'MySQL-python', - gcc: unrecognized option `-restrict' 
    46 #    'PyXMLSec', 
    4738#    'PyXML' 
    4839] 
     
    5142# instead give the explicit URL.  This may cause problems later! 
    5243_pkgDependencyLinks = [ 
    53     "http://www.zope.org/Products/ZopeInterface/3.0.1final/ZopeInterface-3.0.1.tgz", 
     44    "ftp://ftp.4suite.org/pub/4Suite/4Suite-XML-1.0.tar.gz", 
    5445    "http://prdownloads.sourceforge.net/pyxml/PyXML-0.8.4.tar.gz?use_mirror=kent", 
    55     "http://tmrc.mit.edu/mirror/twisted/Web/0.5/TwistedWeb-0.5.0.tar.bz2", 
    56     "http://tmrc.mit.edu/mirror/twisted/Twisted/2.2/TwistedSumo-2006-02-12.tar.bz2", 
     46#    "http://tmrc.mit.edu/mirror/twisted/Web/0.5/TwistedWeb-0.5.0.tar.bz2", 
     47#    "http://tmrc.mit.edu/mirror/twisted/Twisted/2.2/TwistedSumo-2006-02-12.tar.bz2", 
    5748] 
    5849 
    59 _pkgs = ['ndg.security.common.%s' % \ 
    60          pkg for pkg in find_packages('ndg/security/common')] 
    61 _namespacePkgs = ['ndg', 'ndg.security'] 
    6250 
    6351setupKw = \ 
     
    7462    'install_requires':         _pkgDependencies, 
    7563    'dependency_links':         _pkgDependencyLinks, 
    76 #    'packages':                find_packages('ndg'), 
    77     'packages':                     _pkgs, 
    78     'namespace_packages':       _namespacePkgs, 
     64    'packages':                 find_packages(), 
     65    'namespace_packages':       ['ndg', 'ndg.security'], 
    7966    # This flag will include all files under SVN control or included in 
    8067    # MANIFEST.in. 
     
    8471    #'package_data':            {} 
    8572    #'exclude_package_data':    {} 
    86     'entry_points':        _entryPoints, 
    87     #'tSest_suite':                'ndg.utils.test.suite', 
     73    'entry_points':        None, 
     74    'test_suite':                  'ndg.security.test', 
     75    'zip_safe':            False 
    8876} 
    8977setup(**setupKw) 
  • TI12-security/trunk/python/ndg.security.server/setup.py

    r2163 r2165  
    2626# TODO: subdivide these into server and client specific and comon dependencies 
    2727_pkgDependencies = [ 
    28     'ElementTree', 
    29     'cElementTree', 
     28#    'ElementTree', 
     29#    'cElementTree', 
    3030#    'm2crypto', # build fails - find way to make it link with /usr/local/NDG openssl installation 
    31     'ZSI', 
     31#    'ZSI', 
    3232#    '4Suite',  
    3333#    'Twisted', 
     
    3535#    'ZopeInterface',  
    3636    'pycrypto', 
    37     'SQLObject', 
     37#    'SQLObject', 
    3838#    'MySQL-python', - gcc: unrecognized option `-restrict' 
    3939#    'PyXMLSec', 
     
    4444# instead give the explicit URL.  This may cause problems later! 
    4545_pkgDependencyLinks = [ 
    46     "ftp://ftp.4suite.org/pub/4Suite/4Suite-XML-1.0.tar.gz", 
    4746    "http://www.zope.org/Products/ZopeInterface/3.0.1final/ZopeInterface-3.0.1.tgz", 
    48     "http://prdownloads.sourceforge.net/pyxml/PyXML-0.8.4.tar.gz?use_mirror=kent", 
    4947#    "http://tmrc.mit.edu/mirror/twisted/Web/0.5/TwistedWeb-0.5.0.tar.bz2", 
    5048#    "http://tmrc.mit.edu/mirror/twisted/Twisted/2.2/TwistedSumo-2006-02-12.tar.bz2", 
    5149] 
    5250 
    53 _pkgs = ['ndg.security.server.%s' % \ 
    54          pkg for pkg in \ 
    55          find_packages(os.path.join('ndg', 'security', 'server'))] 
    5651import pdb;pdb.set_trace() 
    57 #_pkgs.append('conf') 
     52 
    5853_entryPoints = None 
    5954 
     
    7166    'install_requires':         _pkgDependencies, 
    7267    'dependency_links':         _pkgDependencyLinks, 
    73     'packages':                     _pkgs, 
     68    'packages':                     find_packages(), 
    7469    'namespace_packages':       ['ndg', 'ndg.security'], 
    7570    # This flag will include all files under SVN control or included in 
     
    8176    #'exclude_package_data':    {} 
    8277    'entry_points':        _entryPoints, 
    83     #'test_suite':                 'ndg.security.test', 
     78    'test_suite':                  'ndg.security.test', 
     79    'zip_safe':            False 
    8480} 
    8581setup(**setupKw) 
Note: See TracChangeset for help on using the changeset viewer.