Changeset 2715


Ignore:
Timestamp:
10/07/07 14:17:59 (12 years ago)
Author:
pjkersha
Message:

Preparing NDG-Beta eggs for glue deployment:

ndg.security.server/setup.py,
ndg.security.client/setup.py,
ndg.security.test/setup.py,
ndg.security.common/setup.py:

  • release -> 0.8.1

setup.cfg,
ndg.security.server/setup.cfg,
ndg.security.client/setup.cfg,
ndg.security.test/setup.cfg,
ndg.security.common/setup.cfg:

  • change tag from _dews -> _beta to signify NDG-Beta release

ndg.security.server/ndg/security/server/AttAuthority/init.py,
ndg.security.server/ndg/security/server/ca/init.py,
ndg.security.server/ndg/security/server/SessionMgr/init.py,
ndg.security.server/ndg/security/server/MyProxy.py,
ndg.security.common/ndg/security/common/AttCert.py,
ndg.security.common/ndg/security/common/Gatekeeper/Gatekeeper.py,
ndg.security.common/ndg/security/common/SQLObject.py:

  • conditional import for ElementTree to allow for its inclusion in

Python 2.5.

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

Legend:

Unmodified
Added
Removed
  • TI12-security/trunk/python/ndg.security.client/setup.cfg

    r2283 r2715  
    1717 
    1818[egg_info] 
    19 tag_build = _dews 
     19tag_build = _beta 
    2020tag_svn_revision = true 
    2121 
  • TI12-security/trunk/python/ndg.security.client/setup.py

    r2685 r2715  
    3030setup( 
    3131    name =                      'ndg_security_client', 
    32     version =                   '0.8.0', 
     32    version =                   '0.8.1', 
    3333    description =               'NERC DataGrid Security Utilities', 
    3434    long_description =          'Software for securing NDG resources', 
  • TI12-security/trunk/python/ndg.security.common/ndg/security/common/AttCert.py

    r2515 r2715  
    1818 
    1919# XML Parsing 
    20 import cElementTree as ElementTree 
     20 
     21# For parsing of properties file 
     22try: # python 2.5 
     23    from xml.etree import cElementTree as ElementTree 
     24except ImportError: 
     25    # if you've installed it yourself it comes this way 
     26    import cElementTree as ElementTree 
    2127 
    2228# Time module for use with validity times 
  • TI12-security/trunk/python/ndg.security.common/ndg/security/common/Gatekeeper/Gatekeeper.py

    r2270 r2715  
    1414 
    1515# For parsing of properties file 
    16 import cElementTree as ElementTree 
     16try: # python 2.5 
     17    from xml.etree import cElementTree as ElementTree 
     18except ImportError: 
     19    # if you've installed it yourself it comes this way 
     20    import cElementTree as ElementTree 
    1721 
    1822# Alter system path for dynamic import of resource interface class 
  • TI12-security/trunk/python/ndg.security.common/ndg/security/common/SQLObject.py

    r2270 r2715  
    1818 
    1919# For parsing of properties files 
    20 import cElementTree as ElementTree 
     20 
     21# For parsing of properties file 
     22try: # python 2.5 
     23    from xml.etree import cElementTree as ElementTree 
     24except ImportError: 
     25    # if you've installed it yourself it comes this way 
     26    import cElementTree as ElementTree 
    2127 
    2228from CredWallet import CredRepos as CredReposBase 
  • TI12-security/trunk/python/ndg.security.common/setup.cfg

    r2251 r2715  
    1717 
    1818[egg_info] 
    19 tag_build = _dews 
     19tag_build = _beta 
    2020tag_svn_revision = true 
    2121 
  • TI12-security/trunk/python/ndg.security.common/setup.py

    r2685 r2715  
    2727# TODO: subdivide these into server and client specific and comon dependencies 
    2828_pkgDependencies = [ 
    29     'ZSI >= 2.0_rc3', 
    30     '4Suite-XML >= 1.0rc3', 
     29    'ZSI', 
     30    '4Suite-XML', 
    3131    'pycrypto', 
    3232    'M2Crypto' 
     
    6868setup( 
    6969    name =                      'ndg_security_common', 
    70     version =                   '0.8.0', 
     70    version =                   '0.8.1', 
    7171    description = \ 
    7272'''NERC DataGrid Security virtual package containing common utilities used 
     
    8585    # This flag will include all files under SVN control or included in 
    8686    # MANIFEST.in. 
    87     #'include_package_data =    True, 
     87    #include_package_data =     True, 
    8888    # Finer grained control of data file inclusion can be achieved with 
    8989    # these parameters.  See the setuptools docs. 
    90     #'package_data =            {} 
    91     #'exclude_package_data =    {} 
     90    #package_data =             {} 
     91    #exclude_package_data =     {} 
    9292    entry_points =         None, 
    9393    test_suite =                   'ndg.security.test', 
  • TI12-security/trunk/python/ndg.security.server/ndg/security/server/AttAuthority/__init__.py

    r2515 r2715  
    2424 
    2525# For parsing of properties file 
    26 import cElementTree as ElementTree 
     26try: # python 2.5 
     27    from xml.etree import cElementTree as ElementTree 
     28except ImportError: 
     29    # if you've installed it yourself it comes this way 
     30    import cElementTree as ElementTree 
    2731 
    2832# X509 Certificate handling 
  • TI12-security/trunk/python/ndg.security.server/ndg/security/server/MyProxy.py

    r2573 r2715  
    3434import base64 
    3535 
    36  
    3736# For parsing of properties file 
    38 import cElementTree as ElementTree 
     37try: # python 2.5 
     38    from xml.etree import cElementTree as ElementTree 
     39except ImportError: 
     40    # if you've installed it yourself it comes this way 
     41    import cElementTree as ElementTree 
    3942 
    4043from ndg.security.common.openssl import OpenSSLConfig, OpenSSLConfigError 
  • TI12-security/trunk/python/ndg.security.server/ndg/security/server/SessionMgr/__init__.py

    r2620 r2715  
    2121from datetime import datetime 
    2222 
    23 # For parsing of properties files 
    24 import cElementTree as ElementTree 
     23# For parsing of properties file 
     24try: # python 2.5 
     25    from xml.etree import cElementTree as ElementTree 
     26except ImportError: 
     27    # if you've installed it yourself it comes this way 
     28    import cElementTree as ElementTree 
    2529 
    2630# Base 64 encode session IDs if returned in strings - urandom's output may 
  • TI12-security/trunk/python/ndg.security.server/ndg/security/server/ca/__init__.py

    r2686 r2715  
    3434 
    3535# For parsing of properties file 
    36 import cElementTree as ElementTree 
     36try: # python 2.5 
     37    from xml.etree import cElementTree as ElementTree 
     38except ImportError: 
     39    # if you've installed it yourself it comes this way 
     40    import cElementTree as ElementTree 
    3741 
    3842from ndg.security.common.openssl import OpenSSLConfig 
  • TI12-security/trunk/python/ndg.security.server/setup.cfg

    r2251 r2715  
    1515 
    1616[egg_info] 
    17 tag_build = -dews 
     17tag_build = _beta 
    1818tag_svn_revision = true 
    1919 
  • TI12-security/trunk/python/ndg.security.server/setup.py

    r2685 r2715  
    3535setup( 
    3636    name =                      'ndg_security_server', 
    37     version =                   '0.8.0', 
     37    version =                   '0.8.1', 
    3838    description =               'NERC DataGrid Security Services', 
    3939    long_description =          'Server side component for securing NDG resources', 
  • TI12-security/trunk/python/ndg.security.test/setup.cfg

    r2279 r2715  
    1010# version 1.0 or later. 
    1111[egg_info] 
    12 tag_build = -dews 
     12tag_build = _beta 
    1313tag_svn_revision = true 
    1414 
  • TI12-security/trunk/python/ndg.security.test/setup.py

    r2685 r2715  
    3333setup( 
    3434    name =                      'ndg_security_test', 
    35     version =                   '0.8.0', 
     35    version =                   '0.8.1', 
    3636    description =               'NERC DataGrid Security Unit tests', 
    3737    long_description =          'Unit tests client - server side', 
  • TI12-security/trunk/python/setup.cfg

    r2283 r2715  
    1919 
    2020[egg_info] 
    21 tag_build = _dews 
     21tag_build = _beta 
    2222tag_svn_revision = true 
    2323 
  • TI12-security/trunk/python/setup.py

    r2685 r2715  
    2525setup( 
    2626    name =                      'ndg_security', 
    27     version =                   '0.8.0', 
     27    version =                   '0.8.1', 
    2828    description =               'NERC DataGrid Security Utilities', 
    2929    long_description =          'Software for securing NDG resources', 
Note: See TracChangeset for help on using the changeset viewer.