Changeset 2170


Ignore:
Timestamp:
14/02/07 17:08:47 (12 years ago)
Author:
pjkersha
Message:

python/ndg.security.server/setup.py: tidied up package dependencies list

python/ndg.security.server/ndg/security/server/MyProxy.py: replaced old ref to
self.env with os.environ

python/ndg.security.common/setup.py:

  • made ElementTree install dependent on Python version - 2.5 doesn't need it
  • tidied up package dependencies list

python/ndg.security.test/ndg/security/test/AttAuthority/siteAAttAuthorityProperties.xml,
python/ndg.security.test/ndg/security/test/AttAuthority/siteBAttAuthorityProperties.xml:
set useSSL to False.

python/ndg.security.test/ndg/security/test/AttAuthority/attAuthorityClientTest.cfg:
connect to local service.

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

Legend:

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

    r2165 r2170  
    1818from setuptools import setup, find_packages 
    1919 
    20 import os 
     20import os, sys 
    2121 
    2222reposID = "$Id:$" 
     
    2727# TODO: subdivide these into server and client specific and comon dependencies 
    2828_pkgDependencies = [ 
    29     'ElementTree', 
    30     'cElementTree', 
    31 #    'm2crypto', # build fails - find way to make it link with /usr/local/NDG openssl installation 
    3229    'ZSI', 
    33 #    'Twisted', 
    34 #    'TwistedWeb', 
    3530    'pycrypto', 
    3631    'SQLObject', 
    3732#    'MySQL-python', - gcc: unrecognized option `-restrict' 
    38 #    'PyXML' 
    3933] 
    4034 
     35# Python 2.5 includes ElementTree by default 
     36if sys.version_info[0] == 2 and sys.version_info[1] < 5: 
     37    _pkgDependencies.extend(['ElementTree', 'cElementTree']) 
     38 
     39import pdb;pdb.set_trace() 
    4140# Sledge hammer approach needed with some packages as they won't install from their PyPI name - 
    4241# instead give the explicit URL.  This may cause problems later! 
    4342_pkgDependencyLinks = [ 
     43    # Custom M2Crypto for use with Python MyProxy client 
     44    "http://proj.badc.rl.ac.uk/ndg/browser/TI12-security/branches/Dependencies/m2crypto.tar.gz", 
    4445    "ftp://ftp.4suite.org/pub/4Suite/4Suite-XML-1.0.tar.gz", 
    4546    "http://prdownloads.sourceforge.net/pyxml/PyXML-0.8.4.tar.gz?use_mirror=kent", 
     47    # Twisted won't install as an egg 
    4648#    "http://tmrc.mit.edu/mirror/twisted/Web/0.5/TwistedWeb-0.5.0.tar.bz2", 
    4749#    "http://tmrc.mit.edu/mirror/twisted/Twisted/2.2/TwistedSumo-2006-02-12.tar.bz2", 
  • TI12-security/trunk/python/ndg.security.server/ndg/security/server/MyProxy.py

    r2158 r2170  
    211211        # Grid security directory - environment variable setting overrides 
    212212        if 'GRID_SECURITY_DIR' in os.environ: 
    213             self.__prop['gridSecurityDir'] = self.__env['GRID_SECURITY_DIR']             
     213            self.__prop['gridSecurityDir'] = os.environ['GRID_SECURITY_DIR']             
    214214 
    215215            self.__openSSLConf.filePath = \ 
  • TI12-security/trunk/python/ndg.security.server/setup.py

    r2165 r2170  
    2626# TODO: subdivide these into server and client specific and comon dependencies 
    2727_pkgDependencies = [ 
    28 #    'ElementTree', 
    29 #    'cElementTree', 
    30 #    'm2crypto', # build fails - find way to make it link with /usr/local/NDG openssl installation 
    31 #    'ZSI', 
    32 #    '4Suite',  
    33 #    'Twisted', 
    34 #    'TwistedWeb', 
    35 #    'ZopeInterface',  
    3628    'pycrypto', 
    37 #    'SQLObject', 
    3829#    'MySQL-python', - gcc: unrecognized option `-restrict' 
    39 #    'PyXMLSec', 
    40 #    'PyXML' 
    4130] 
    4231 
  • TI12-security/trunk/python/ndg.security.test/ndg/security/test/AttAuthority/attAuthorityClientTest.cfg

    r2136 r2170  
    1010# ! SiteBMapConfig.xml trusted site A aaURI setting must agree with this  
    1111# setting for test6GetMappedAttCert 
    12 #uri = http://localhost:5000/AttributeAuthority 
    13 uri = http://glue.badc.rl.ac.uk:42000/AttributeAuthority 
     12uri = http://localhost:5000/AttributeAuthority 
     13#uri = http://glue.badc.rl.ac.uk:42000/AttributeAuthority 
    1414 
    1515# X.509 certificate for Attribute Authority - to verify the signature of 
  • TI12-security/trunk/python/ndg.security.test/ndg/security/test/AttAuthority/siteAAttAuthorityProperties.xml

    r2136 r2170  
    33    <name>Site A</name> 
    44    <portNum>5000</portNum> 
    5     <useSSL>Yes</useSSL> <!-- leave blank to use http --> 
     5    <useSSL></useSSL> <!-- leave blank to use http --> 
    66    <sslCertFile></sslCertFile> 
    77    <sslKeyFile></sslKeyFile> 
  • TI12-security/trunk/python/ndg.security.test/ndg/security/test/AttAuthority/siteBAttAuthorityProperties.xml

    r2136 r2170  
    33    <name>Site B</name> 
    44    <portNum>5100</portNum> 
    5     <useSSL>Yes</useSSL> <!-- leave blank to use http --> 
     5    <useSSL></useSSL> <!-- leave blank to use http --> 
    66    <sslCertFile></sslCertFile> 
    77    <sslKeyFile></sslKeyFile> 
Note: See TracChangeset for help on using the changeset viewer.