Changeset 2238


Ignore:
Timestamp:
06/03/07 16:41:30 (12 years ago)
Author:
pjkersha
Message:

Updated setup.py to include M2Crypto dependency_link but this is not working

Location:
TI12-security/trunk/python/ndg.security.common
Files:
3 edited

Legend:

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

    • Property svn:ignore set to
      build
  • TI12-security/trunk/python/ndg.security.common/setup.py

    r2234 r2238  
    3434 
    3535# Python 2.5 includes ElementTree by default 
    36 if sys.version_info[0] == 2 and sys.version_info[1] < 5: 
    37     _pkgDependencies.extend(['ElementTree', 'cElementTree']) 
     36if sys.version_info[0:2] < (2, 4): 
     37    _pkgDependencies += ['ElementTree', 'cElementTree'] 
    3838 
    3939# Sledge hammer approach needed with some packages as they won't install from their PyPI name - 
     
    4141_pkgDependencyLinks = [ 
    4242    # Custom M2Crypto for use with Python MyProxy client 
    43     "http://proj.badc.rl.ac.uk/ndg/browser/TI12-security/branches/Dependencies/m2crypto", 
     43    "http://proj.badc.rl.ac.uk/ndg/browser/TI12-security/branches/Dependencies/m2crypto/dist/M2Crypto-0.16-py2.4-linux-i686.egg?format=raw", 
    4444    "ftp://ftp.4suite.org/pub/4Suite/4Suite-XML-1.0.tar.gz", 
    45     "http://prdownloads.sourceforge.net/pyxml/PyXML-0.8.4.tar.gz?use_mirror=kent", 
     45    "http://prdownloads.sourceforge.net/pyxml/PyXML-0.8.4.tar.gz?use_mirror=kent" 
    4646    # Twisted won't install as an egg 
    4747#    "http://tmrc.mit.edu/mirror/twisted/Web/0.5/TwistedWeb-0.5.0.tar.bz2", 
     
    5050 
    5151 
    52 setupKw = \ 
    53 { 
    54     'name':                     'ndg.security.common', 
    55     'version':                  '0.7.2', 
    56     'description':              'NERC DataGrid Security common Utilities', 
    57     'long_description':         'Software for securing NDG resources', 
    58     'author':                   'Philip Kershaw', 
    59     'author_email':             'P.J.Kershaw@rl.ac.uk', 
    60     'maintainer':               'Philip Kershaw', 
    61     'maintainer_email':         'P.J.Kershaw@rl.ac.uk', 
    62     'url':                      'http://proj.badc.rl.ac.uk/ndg', 
    63     'install_requires':         _pkgDependencies, 
    64     'dependency_links':         _pkgDependencyLinks, 
    65     'packages':                 find_packages(), 
    66     'namespace_packages':       ['ndg', 'ndg.security'], 
     52setup( 
     53    name =                      'ndg.security.common', 
     54    version =                   '0.7.2', 
     55    description =                
     56'''NERC DataGrid Security virtual package containing common utilities used 
     57noth by server and client packages''', 
     58    long_description =          'Software for securing NDG resources', 
     59    author =                    'Philip Kershaw', 
     60    author_email =              'P.J.Kershaw@rl.ac.uk', 
     61    maintainer =                'Philip Kershaw', 
     62    maintainer_email =          'P.J.Kershaw@rl.ac.uk', 
     63    url =                       'http://proj.badc.rl.ac.uk/ndg', 
     64    install_requires =          _pkgDependencies, 
     65    dependency_links =          _pkgDependencyLinks, 
     66    packages =                  find_packages(), 
     67    namespace_packages =        ['ndg', 'ndg.security'], 
    6768    # This flag will include all files under SVN control or included in 
    6869    # MANIFEST.in. 
    69     #'include_package_data':    True, 
     70    #'include_package_data =    True, 
    7071    # Finer grained control of data file inclusion can be achieved with 
    7172    # these parameters.  See the setuptools docs. 
    72     #'package_data':            {} 
    73     #'exclude_package_data':    {} 
    74     'entry_points':        None, 
    75     'test_suite':                  'ndg.security.test', 
    76     'zip_safe':            False 
    77 } 
    78 setup(**setupKw) 
     73    #'package_data =            {} 
     74    #'exclude_package_data =    {} 
     75    entry_points =         None, 
     76    test_suite =                   'ndg.security.test', 
     77    zip_safe =             False 
     78) 
Note: See TracChangeset for help on using the changeset viewer.