Changeset 68

Show
Ignore:
Timestamp:
03/21/08 04:10:47 (8 months ago)
Author:
steve
Message:

removed property from setup.py, migrated into config.py

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • config.py

    r67 r68  
    3232title = 'mactorii' 
    3333 
     34version="$Rev$".split(' ')[1] 
     35 
    3436def main(): 
    3537        pass 

  • setup.py

    r66 r68  
    1111from setuptools import setup,find_packages 
    1212import sys 
    13 #import ez_setup 
    1413 
    15 #ez_setup.use_setuptools() 
     14 
     15import config 
    1616 
    1717APP = ['mactorii.py'] 
    18 DATA_FILES = [] #[("baseline/",["baseline/b3.jpg", "baseline/b4.jpg", "baseline/b6.jpg","baseline/b7.jpg"])] 
    1918OPTIONS = {'argv_emulation': True, 'iconfile': 'mactorii.icns'} 
    2019 
    …… 
    2423        SETUP_REQUIRES=[] 
    2524 
    26 #if sys.argv[1] == "py2app": 
    27 #       INSTALL_REQUIRES = [] 
    28 #else: 
    29 #       INSTALL_REQUIRES = ['PIL', 'pyglet'] 
    30          
    3125setup( 
    32    version="$Rev$".split(' ')[1], 
     26   version=config.version, 
    3327   description='Image browser with sort, cluster ability based on wavelet transforms', 
    3428   author='Shu Ning Bian', 
    …… 
    4236    py_modules = ['mactorii', 'config','wavelet'],# 'Imaging', 'pyglet'], 
    4337        setup_requires = SETUP_REQUIRES, 
    44 #       install_requires = INSTALL_REQUIRES, 
    4538        license = "Creative Commons Attribution-Noncommercial-Share Alike 2.5 Australia License", 
    4639    keywords = "image, browser, wavelet, sort",