Changeset 1540 for TI05-delivery


Ignore:
Timestamp:
28/09/06 15:26:13 (13 years ago)
Author:
spascoe
Message:

Split the distribution into 3 eggs: server, client and common.

These eggs aren't quite built correctly because they all share a build
directory. To fix this I will split setup.py into 3 in the next commit.

Location:
TI05-delivery/trunk
Files:
1 added
2 edited
1 copied
2 moved

Legend:

Unmodified
Added
Removed
  • TI05-delivery/trunk/lib/python/ndg/delivery/common/auth_plugin.py

    r1539 r1540  
    99""" 
    1010 
    11 from ndg.delivery import auth 
     11from ndg.delivery.common import auth 
    1212import logging, os, stat 
    1313 
  • TI05-delivery/trunk/setup.py

    r1448 r1540  
    151151      zip_safe = True, 
    152152      install_requires = ['setuptools'], 
     153      package_requires = ['ndg_delivery_common'], 
    153154 
    154155      packages = ['ndg', 'ndg.delivery', 'ndg.delivery.server'], 
     
    168169      zip_safe = True, 
    169170      install_requires = ['setuptools'], 
     171      package_requires = ['ndg_delivery_common'], 
    170172 
    171173      packages = ['ndg', 'ndg.delivery', 'ndg.delivery.client'], 
     
    176178      cmdclass = {'doc': Doc, 'bdist_egg': MyBuild} 
    177179      ) 
     180 
     181setup(name = 'ndg_delivery_common', 
     182      version = version, 
     183      description = 'Common components for NDG DeliveryService client and server', 
     184      author = 'Stephen pascoe', 
     185      author_email = 'S.Pascoe@rl.ac.uk', 
     186 
     187      zip_safe = True, 
     188      install_requires = ['setuptools'], 
     189 
     190      packages = ['ndg', 'ndg.delivery', 'ndg.delivery.common'], 
     191      namespace_packages = ['ndg', 'ndg.delivery'], 
     192      package_dir = {'': 'lib/python'}, 
     193      cmdclass = {'doc': Doc} 
     194      ) 
  • TI05-delivery/trunk/test/test_embedded.py

    r1539 r1540  
    1919 
    2020import ndg.delivery.server.pybbftp as DS 
    21 from ndg.delivery.auth_plugin import AuthHandler, AuthzHandler 
    22 import ndg.delivery.auth as auth 
     21from ndg.delivery.common.auth_plugin import AuthHandler, AuthzHandler 
     22import ndg.delivery.common.auth as auth 
    2323 
    2424def flushLogging(): 
Note: See TracChangeset for help on using the changeset viewer.