Robert Brewer avatar Robert Brewer committed 164fee2

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

Comments (0)

Files changed (2)

+2006-04-19:
+    * Development begins on CherryPy 3, with many backward-incompatible changes.
+
 2006-04-03:
     * CherryPy-2.2.0 released
 
 # arguments for the setup command
 ###############################################################################
 name = "CherryPy"
-version = "2.2.0"
+version = "3.0.0alpha"
 desc = "Object-Oriented web development framework"
 long_desc = "CherryPy is a pythonic, object-oriented web development framework"
 classifiers=[
-    "Development Status :: 5 - Production/Stable",
-    #"Development Status :: 4 - Beta",
+    #"Development Status :: 5 - Production/Stable",
+    "Development Status :: 3 - Alpha",
     "Intended Audience :: Developers",
     "License :: Freely Distributable",
     "Programming Language :: Python",
 url="http://www.cherrypy.org"
 cp_license="BSD"
 packages=[
-    "cherrypy", "cherrypy.lib", "cherrypy.lib.filter",
-    "cherrypy.tutorial", "cherrypy.test", "cherrypy.filters",
+    "cherrypy", "cherrypy.lib",
+    "cherrypy.tutorial", "cherrypy.test",
 ]
 download_url="http://sourceforge.net/project/showfiles.php?group_id=56099"
 data_files=[
         data_files=data_files,
     )
 
-    # the code in the following "if" block handles situations where the
-    # user has installed over an older release of 2.1 with a conflicting
-    # version of the sessionfilter
-    if 'install_lib' in dist.command_obj:
-        
-        # get the installation directory (is there a better way to do this?)
-        install_dir = dist.command_obj['install_lib'].install_dir
-
-        # make sure we have an absolute install path
-        install_dir = os.path.join(os.path.abspath('/'), install_dir)
-        
-        old_session_filter_path = os.path.join(
-            install_dir, 'cherrypy', 'lib', 'filter', 'sessionfilter')
-        
-        # check for existence of old sessionfilter package dir
-        # and prompt the user if it exists
-        if os.path.exists(old_session_filter_path):
-            handle_old_session_filter(old_session_filter_path)
-
-        
-def handle_old_session_filter(pth):
-    warn_old_session_filter(pth)
-    choice = raw_input('Delete old sessionfilter directory? (yes/no): ')
-    if choice.lower() in ('y', 'yes'):
-        shutil.rmtree(pth)
-        print "Old sessionfilter directory deleted."
-    else:
-        print "You will need to manually need to delete the old sessionfilter directory."
-
-
-def warn_old_session_filter(pth):
-    msg = """
-************************ WARNING *****************************
- Since you have installed over the top of an existing CherryPy
- installation, you must remove the old sessionfilter package
- directory at:
- %s
-************************ WARNING *****************************
-""" % (pth,)
-    print msg
-    
 
 if __name__ == "__main__":
     main()
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.