Download Install Tutorial Docs FAQ Tools WikiLicense Team IRC Planet Involvement Shop Book

Changeset 1086

Show
Ignore:
Timestamp:
05/02/06 16:26:26
Author:
fumanchu
Message:

Fix for #513 and #515 (setup.py updates).

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/CHANGELOG.txt

    r1037 r1086  
     12006-04-19: 
     2    * Development begins on CherryPy 3, with many backward-incompatible changes. 
     3 
    142006-04-03: 
    25    * CherryPy-2.2.0 released 
  • trunk/setup.py

    r1039 r1086  
    1919############################################################################### 
    2020name = "CherryPy" 
    21 version = "2.2.0
     21version = "3.0.0alpha
    2222desc = "Object-Oriented web development framework" 
    2323long_desc = "CherryPy is a pythonic, object-oriented web development framework" 
    2424classifiers=[ 
    25     "Development Status :: 5 - Production/Stable", 
    26     #"Development Status :: 4 - Beta", 
     25    #"Development Status :: 5 - Production/Stable", 
     26    "Development Status :: 3 - Alpha", 
    2727    "Intended Audience :: Developers", 
    2828    "License :: Freely Distributable", 
     
    3636cp_license="BSD" 
    3737packages=[ 
    38     "cherrypy", "cherrypy.lib", "cherrypy.lib.filter", 
    39     "cherrypy.tutorial", "cherrypy.test", "cherrypy.filters", 
     38    "cherrypy", "cherrypy.lib", 
     39    "cherrypy.tutorial", "cherrypy.test", 
    4040] 
    4141download_url="http://sourceforge.net/project/showfiles.php?group_id=56099" 
     
    8585    ) 
    8686 
    87     # the code in the following "if" block handles situations where the 
    88     # user has installed over an older release of 2.1 with a conflicting 
    89     # version of the sessionfilter 
    90     if 'install_lib' in dist.command_obj: 
    91          
    92         # get the installation directory (is there a better way to do this?) 
    93         install_dir = dist.command_obj['install_lib'].install_dir 
    94  
    95         # make sure we have an absolute install path 
    96         install_dir = os.path.join(os.path.abspath('/'), install_dir) 
    97          
    98         old_session_filter_path = os.path.join( 
    99             install_dir, 'cherrypy', 'lib', 'filter', 'sessionfilter') 
    100          
    101         # check for existence of old sessionfilter package dir 
    102         # and prompt the user if it exists 
    103         if os.path.exists(old_session_filter_path): 
    104             handle_old_session_filter(old_session_filter_path) 
    105  
    106          
    107 def handle_old_session_filter(pth): 
    108     warn_old_session_filter(pth) 
    109     choice = raw_input('Delete old sessionfilter directory? (yes/no): ') 
    110     if choice.lower() in ('y', 'yes'): 
    111         shutil.rmtree(pth) 
    112         print "Old sessionfilter directory deleted." 
    113     else: 
    114         print "You will need to manually need to delete the old sessionfilter directory." 
    115  
    116  
    117 def warn_old_session_filter(pth): 
    118     msg = """ 
    119 ************************ WARNING ***************************** 
    120  Since you have installed over the top of an existing CherryPy 
    121  installation, you must remove the old sessionfilter package 
    122  directory at: 
    123  %s 
    124 ************************ WARNING ***************************** 
    125 """ % (pth,) 
    126     print msg 
    127      
    12887 
    12988if __name__ == "__main__": 

Hosted by WebFaction

Log in as guest/cpguest to create tickets