Changeset 2283


Ignore:
Timestamp:
15/03/07 13:49:07 (12 years ago)
Author:
pjkersha
Message:

ndg.security.server/setup.py:

  • added correct zope.interface dependency
  • changed egg name ndg.security.server to ndg_security_server otherwise it causes problems for easy_install to

find it when set as a dependency.

ndg.security.common/setup.py:

  • likewise to the above, changed name to ndg_security_common

setup.py:

  • simplified setup setting only the ndg security eggs as dependencies.

ndg.security.client/setup.py:

  • as above - simplified to set only the ndg security eggs as dependencies.

ndg.security.client/setup.cfg:

  • set tag to _dews
Location:
TI12-security/trunk/python
Files:
6 edited

Legend:

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

    r1701 r2283  
    1010# This software may be distributed under the terms of the Q Public License, 
    1111# version 1.0 or later. 
    12 [EasyInstall] 
    13  
    1412[build_ext] 
    1513include_dirs: /usr/local/NDG/include 
     
    1917 
    2018[egg_info] 
    21 tag_build = -DevPostAlpha 
     19tag_build = _dews 
    2220tag_svn_revision = true 
    2321 
  • TI12-security/trunk/python/ndg.security.client/setup.py

    r2270 r2283  
    2222__revision__ = "$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 
    30  
    31 # Packages needed for NDG Security 
    32 # Note commented out ones fail with PyPI - use explicit link instead 
    33 # TODO: subdivide these into server and client specific and comon dependencies 
    34 _pkgDependencies = [ 
    35     'ElementTree', 
    36     'cElementTree', 
    37 #    'm2crypto', # build fails - find way to make it link with /usr/local/NDG openssl installation 
    38     'ZSI', 
    39 #    '4Suite', don't need to include it as ZSI egg will get this instead 
    40 #    'Twisted', 
    41 #    'TwistedWeb', 
    42 #    'ZopeInterface',  
    43     'pycrypto', 
    44     'SQLObject', 
    45 #    'MySQL-python', - gcc: unrecognized option `-restrict' 
    46 #    'PyXMLSec', 
    47 #    'PyXML' 
    48 ] 
    49  
    50 # Sledge hammer approach needed with some packages as they won't install from their PyPI name - 
    51 # instead give the explicit URL.  This may cause problems later! 
    52 _pkgDependencyLinks = [ 
    53     "http://www.zope.org/Products/ZopeInterface/3.0.1final/ZopeInterface-3.0.1.tgz", 
    54     "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", 
    57 ] 
    58  
    59 #_pkgs = ['ndg',  
    60 #         'ndg.security',  
    61 #         'ndg.security.server',  
    62 #         'ndg.security.client'] 
    63 # 
    64 #_namespacePkgs = ['ndg',  
    65 #                 'ndg.security',  
    66 #                 'ndg.security.server',  
    67 #                 'ndg.security.client'] 
    6824 
    6925_entryPoints = \ 
     
    7329 
    7430setup( 
    75     'name':                     'ndg-security', 
    76     'version':                  '0.7.2', 
    77     'description':              'NERC DataGrid Security Utilities', 
    78     'long_description':         'Software for securing NDG resources', 
    79     'author':                   'Philip Kershaw', 
    80     'author_email':             'P.J.Kershaw@rl.ac.uk', 
    81     'maintainer':               'Philip Kershaw', 
    82     'maintainer_email':         'P.J.Kershaw@rl.ac.uk', 
    83     'url':                      'http://proj.badc.rl.ac.uk/ndg', 
     31    name =                      'ndg_security_client', 
     32    version =                   '0.7.2', 
     33    description =               'NERC DataGrid Security Utilities', 
     34    long_description =          'Software for securing NDG resources', 
     35    author =                    'Philip Kershaw', 
     36    author_email =              'P.J.Kershaw@rl.ac.uk', 
     37    maintainer =            'Philip Kershaw', 
     38    maintainer_email =      'P.J.Kershaw@rl.ac.uk', 
     39    url =                       'http://proj.badc.rl.ac.uk/ndg', 
    8440    license =               'Q Public License, version 1.0 or later', 
    85     'install_requires':         _pkgDependencies, 
    86     'dependency_links':         _pkgDependencyLinks, 
    87     'packages':                 find_packages('ndg'), 
    88     'namespace_packages':       _namespacePkgs, 
     41    install_requires =          ['ndg_security_common'], 
     42    dependency_links =          ["http://ndg.nerc.ac.uk/dist"], 
     43    packages =                  find_packages(), 
     44    namespace_packages =        ['ndg', 'ndg.security'], 
    8945    # This flag will include all files under SVN control or included in 
    9046    # MANIFEST.in. 
    91     #'include_package_data':    True, 
     47    #'include_package_data =    True, 
    9248    # Finer grained control of data file inclusion can be achieved with 
    9349    # these parameters.  See the setuptools docs. 
    94     #'package_data':            {} 
    95     #'exclude_package_data':    {} 
    96     'entry_points':        _entryPoints, 
    97     #'tSest_suite':                'ndg.utils.test.suite', 
     50    #'package_data =            {} 
     51    #'exclude_package_data =    {} 
     52    entry_points =           _entryPoints, 
     53    #'tSest_suite =                'ndg.utils.test.suite', 
     54    zip_safe =               False 
    9855) 
    9956 
  • TI12-security/trunk/python/ndg.security.common/setup.py

    r2270 r2283  
    6767 
    6868setup( 
    69     name =                      'ndg.security.common', 
     69    name =                      'ndg_security_common', 
    7070    version =                   '0.7.2', 
    7171    description =                
  • TI12-security/trunk/python/ndg.security.server/setup.py

    r2270 r2283  
    2626# TODO: subdivide these into server and client specific and comon dependencies 
    2727_pkgDependencies = [ 
    28     'ndg.security.common', 
    29     'pycrypto', 
    30 #    MySQL-python', - gcc: unrecognized option `-restrict' 
     28    'ndg_security_common', 
     29     
     30    # Zope interface 
     31    'zope.interface' 
    3132] 
    3233 
    33  
    34 _entryPoints = None 
    35  
     34# Installation location for configuration and share files 
     35#ndgDir = os.environ.get('NDG_DIR') or os.environ.get('NDG_HOME') or \ 
     36#        os.path.join('/', 'etc', 'ndg') 
     37# 
     38#dataSubDirs = ('conf', 'share') 
     39#dataDirs = {}.fromkeys(dataSubDirs) 
     40#for dir in dataSubDirs: 
     41#    dataDirs[dir] = os.path.join(ndgDir, dir) 
     42#     
     43#    # Ensure path is set up OK 
     44#    try: 
     45#        os.makedirs(dataDirs[dir], 0755) 
     46#    except OSError, e: 
     47#        if e.errno != 17: 
     48#            raise SystemExit, "Error creating data directory: " + str(e) 
     49#        else: 
     50#            pass 
     51     
    3652setup( 
    37     name =                      'ndg.security.server', 
     53    name =                      'ndg_security_server', 
    3854    version =                   '0.7.2', 
    3955    description =               'NERC DataGrid Security Services', 
     
    5268    dependency_links = [ 
    5369        "http://ndg.nerc.ac.uk/dist", 
    54 #        "http://www.zope.org/Products/ZopeInterface/3.0.1final/ZopeInterface-3.0.1.tgz" 
     70         
     71        # Zope Interface 
     72        "http://www.zope.org/Products/ZopeInterface/"  
    5573        ], 
    5674 
     
    6179    packages =                      find_packages(), 
    6280    namespace_packages =        ['ndg', 'ndg.security'], 
    63     # This flag will include all files under SVN control or included in 
    64     # MANIFEST.in. 
    65     #'include_package_data =    True, 
    66     # Finer grained control of data file inclusion can be achieved with 
    67     # these parameters.  See the setuptools docs. 
    68     package_data =         {'ndg.security.server.conf': ['*.xml']}, 
    69     #'exclude_package_data =    {} 
    70     entry_points =         _entryPoints, 
    71     test_suite =                   'ndg.security.test', 
    72     zip_safe =             False 
     81    package_data =          {'ndg.security.server.conf': ['*.xml']}, 
     82#    data_files =            [('share',  
     83#                              [os.path.join('share', 'ndg-aa'),  
     84#                               os.path.join('share', 'ndg-ca'), 
     85#                               os.path.join('share', 'ndg-gk'),  
     86#                               os.path.join('share', 'ndg-log'),  
     87#                               os.path.join('share', 'ndg-sm')]) 
     88#                              ], 
     89    test_suite =                    'ndg.security.test', 
     90    zip_safe =              False 
    7391) 
  • TI12-security/trunk/python/setup.cfg

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

    r2270 r2283  
    2020import os 
    2121 
    22 __revision__ = "$Id$" 
     22__revision__ = "$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 
    31 # Packages needed for NDG Security 
    32 # Note commented out ones fail with PyPI - use explicit link instead 
    33 # TODO: subdivide these into server and client specific and comon dependencies 
    34 _pkgDependencies = [ 
    35     'ElementTree', 
    36     'cElementTree', 
    37 #    'm2crypto', # build fails - find way to make it link with /usr/local/NDG openssl installation 
    38     'ZSI', 
    39 #    '4Suite', don't need to include it as ZSI egg will get this instead 
    40 #    'Twisted', 
    41 #    'TwistedWeb', 
    42 #    'ZopeInterface',  
    43     'pycrypto', 
    44     'SQLObject', 
    45 #    'MySQL-python', - gcc: unrecognized option `-restrict' 
    46 #    'PyXMLSec', 
    47 #    'PyXML' 
    48 ] 
    49  
    50 # Sledge hammer approach needed with some packages as they won't install from their PyPI name - 
    51 # instead give the explicit URL.  This may cause problems later! 
    52 _pkgDependencyLinks = [ 
    53     "http://www.zope.org/Products/ZopeInterface/3.0.1final/ZopeInterface-3.0.1.tgz", 
    54     "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", 
    57 ] 
    58  
    59 #_pkgs = ['ndg',  
    60 #         'ndg.security',  
    61 #         'ndg.security.server',  
    62 #         'ndg.security.client'] 
    63 # 
    64 #_namespacePkgs = ['ndg',  
    65 #                 'ndg.security',  
    66 #                 'ndg.security.server',  
    67 #                 'ndg.security.client'] 
    68 import pdb;pdb.set_trace() 
    69 _serverPkgs = ['ndg.security.server.%s' % \ 
    70          pkg for pkg in find_packages('ndg/security/server')] 
    71 _clientPkgs = ['ndg.security.client.%s' % \ 
    72          pkg for pkg in find_packages('ndg/security/client')] 
    73 _pkg = ['ndg.security.server'] 
    74 _namespacePkgs = _pkgs 
    75  
    76 _entryPoints = \ 
    77 { 
    78     'console_scripts': ['ndgSessionClient = ndg.security.client.ndgSessionClient:main'] 
    79 } 
    80  
    81 setupKw = \ 
    82 { 
    83     'name':                     'ndg-security', 
    84     'version':                  '0.7.2', 
    85     'description':              'NERC DataGrid Security Utilities', 
    86     'long_description':         'Software for securing NDG resources', 
    87     'author':                   'Philip Kershaw', 
    88     'author_email':             'P.J.Kershaw@rl.ac.uk', 
    89     'maintainer':               'Philip Kershaw', 
    90     'maintainer_email':         'P.J.Kershaw@rl.ac.uk', 
    91     'url':                      'http://proj.badc.rl.ac.uk/ndg', 
    92     'install_requires':         _pkgDependencies, 
    93     'dependency_links':         _pkgDependencyLinks, 
    94 #    'packages':                find_packages('ndg'), 
    95     'packages':                     _pkgs, 
    96     'namespace_packages':       _namespacePkgs, 
    97     # This flag will include all files under SVN control or included in 
    98     # MANIFEST.in. 
    99     #'include_package_data':    True, 
    100     # Finer grained control of data file inclusion can be achieved with 
    101     # these parameters.  See the setuptools docs. 
    102     #'package_data':            {} 
    103     #'exclude_package_data':    {} 
    104     'entry_points':        _entryPoints, 
    105     #'tSest_suite':                'ndg.utils.test.suite', 
    106 } 
    107 setup(**setupKw) 
     25setup( 
     26    name =                      'ndg_security', 
     27    version =                   '0.7.2', 
     28    description =               'NERC DataGrid Security Utilities', 
     29    long_description =          'Software for securing NDG resources', 
     30    author =                    'Philip Kershaw', 
     31    author_email =              'P.J.Kershaw@rl.ac.uk', 
     32    maintainer =                'Philip Kershaw', 
     33    maintainer_email =          'P.J.Kershaw@rl.ac.uk', 
     34    url =                   'http://proj.badc.rl.ac.uk/ndg', 
     35    install_requires =      ['ndg_security_client', 'ndg_security_server'], 
     36    dependency_links =      ["http://ndg.nerc.ac.uk/dist"], 
     37    packages =              find_packages(), 
     38    namespace_packages =    ['ndg', 'ndg.security'], 
     39) 
Note: See TracChangeset for help on using the changeset viewer.