details: http://www.bx.psu.edu/hg/galaxy/rev/2e8b8b0bc366 changeset: 3020:2e8b8b0bc366 user: Nate Coraor <nate@bx.psu.edu> date: Thu Nov 12 13:12:12 2009 -0500 description: Upgrade Paste/PasteDeploy/PasteScript. Paste can go no further without changing the way we stream templates and tarballs. diffstat: eggs.ini | 12 +++--- lib/galaxy/web/buildapp.py | 8 +++- scripts/check_python.py | 1 + scripts/functional_tests.py | 2 +- scripts/scramble/scripts/PasteScript.py | 53 ++++++++++++++++++++++++++ 5 files changed, 68 insertions(+), 8 deletions(-) diffs (134 lines): diff -r aa388ba7d692 -r 2e8b8b0bc366 eggs.ini --- a/eggs.ini Thu Nov 12 13:02:04 2009 -0500 +++ b/eggs.ini Thu Nov 12 13:12:12 2009 -0500 @@ -37,9 +37,9 @@ Mako = 0.2.5 nose = 0.11.1 NoseHTML = 0.3 -Paste = 1.5.1 -PasteDeploy = 1.3.1 -PasteScript = 1.3.6 +Paste = 1.6 +PasteDeploy = 1.3.3 +PasteScript = 1.7.3 Routes = 1.11 simplejson = 1.5 SQLAlchemy = 0.5.6 @@ -86,9 +86,9 @@ Mako = http://www.makotemplates.org/downloads/Mako-0.2.5.tar.gz nose = http://pypi.python.org/packages/source/n/nose/nose-0.11.1.tar.gz NoseHTML = http://bitbucket.org/james_taylor/nosehtml/get/c46a54d569ae.bz2 -Paste = http://cheeseshop.python.org/packages/source/P/Paste/Paste-1.5.1.tar.gz -PasteDeploy = http://cheeseshop.python.org/packages/source/P/PasteDeploy/PasteDeploy-1.3.1... -PasteScript = http://cheeseshop.python.org/packages/source/P/PasteScript/PasteScript-1.3.6... +Paste = http://cheeseshop.python.org/packages/source/P/Paste/Paste-1.6.tar.gz +PasteDeploy = http://cheeseshop.python.org/packages/source/P/PasteDeploy/PasteDeploy-1.3.3... +PasteScript = http://cheeseshop.python.org/packages/source/P/PasteScript/PasteScript-1.7.3... PSI = http://pypi.python.org/packages/source/P/PSI/PSI-0.3b1.1.tar.gz Routes = http://pypi.python.org/packages/source/R/Routes/Routes-1.11.tar.gz simplejson = http://cheeseshop.python.org/packages/source/s/simplejson/simplejson-1.5.tar... diff -r aa388ba7d692 -r 2e8b8b0bc366 lib/galaxy/web/buildapp.py --- a/lib/galaxy/web/buildapp.py Thu Nov 12 13:02:04 2009 -0500 +++ b/lib/galaxy/web/buildapp.py Thu Nov 12 13:12:12 2009 -0500 @@ -4,6 +4,7 @@ import logging, atexit import os, os.path +import sys, warnings from inspect import isclass @@ -151,7 +152,12 @@ log.debug( "Enabling 'eval exceptions' middleware" ) else: # Not in interactive debug mode, just use the regular error middleware - from paste.exceptions import errormiddleware + if sys.version_info[:2] >= ( 2, 6 ): + warnings.filterwarnings( 'ignore', '.*', DeprecationWarning, '.*serial_number_generator', 11, True ) + from paste.exceptions import errormiddleware + warnings.filters.pop() + else: + from paste.exceptions import errormiddleware app = errormiddleware.ErrorMiddleware( app, conf ) log.debug( "Enabling 'error' middleware" ) # Transaction logging (apache access.log style) diff -r aa388ba7d692 -r 2e8b8b0bc366 scripts/check_python.py --- a/scripts/check_python.py Thu Nov 12 13:02:04 2009 -0500 +++ b/scripts/check_python.py Thu Nov 12 13:12:12 2009 -0500 @@ -1,6 +1,7 @@ import os, sys def check_python(): + return try: assert sys.version_info[:2] >= ( 2, 4 ) and sys.version_info[:2] <= ( 2, 5 ) except AssertionError: diff -r aa388ba7d692 -r 2e8b8b0bc366 scripts/functional_tests.py --- a/scripts/functional_tests.py Thu Nov 12 13:02:04 2009 -0500 +++ b/scripts/functional_tests.py Thu Nov 12 13:12:12 2009 -0500 @@ -118,7 +118,7 @@ if start_server: - webapp = buildapp.app_factory( dict(), use_translogger = False, app=app ) + webapp = buildapp.app_factory( dict(), use_translogger = False, static_enabled = False, app=app ) if galaxy_test_port is not None: server = httpserver.serve( webapp, host=galaxy_test_host, port=galaxy_test_port, start_loop=False ) diff -r aa388ba7d692 -r 2e8b8b0bc366 scripts/scramble/scripts/PasteScript.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/scripts/scramble/scripts/PasteScript.py Thu Nov 12 13:12:12 2009 -0500 @@ -0,0 +1,53 @@ +import os, sys, shutil + +# change back to the build dir +if os.path.dirname( sys.argv[0] ) != "": + os.chdir( os.path.dirname( sys.argv[0] ) ) + +# find setuptools +scramble_lib = os.path.join( "..", "..", "..", "lib" ) +sys.path.append( scramble_lib ) +from ez_setup import use_setuptools +use_setuptools( download_delay=8, to_dir=scramble_lib ) +from setuptools import * + +# get the tag +if os.access( ".galaxy_tag", os.F_OK ): + tagfile = open( ".galaxy_tag", "r" ) + tag = tagfile.readline().strip() +else: + tag = None + +# in case you're running this by hand from a dirty module source dir +for dir in [ "build", "dist" ]: + if os.access( dir, os.F_OK ): + print "scramble.py: removing dir:", dir + shutil.rmtree( dir ) + +# patch +file = 'setup.py' +if not os.access( "%s.orig" %file, os.F_OK ): + print "scramble_it(): Patching", file + shutil.copyfile( file, "%s.orig" %file ) + i = open( "%s.orig" %file, "r" ) + o = open( file, "w" ) + for line in i.readlines(): + if line in ( " 'Paste>=1.3',\n", " 'PasteDeploy',\n" ): + continue + print >>o, line, + i.close() + o.close() + +# reset args for distutils +me = sys.argv[0] +sys.argv = [ me ] +sys.argv.append( "egg_info" ) +if tag is not None: + #sys.argv.append( "egg_info" ) + sys.argv.append( "--tag-build=%s" %tag ) +# svn revision (if any) is handled directly in tag-build +sys.argv.append( "--no-svn-revision" ) +sys.argv.append( "bdist_egg" ) + +# do it +execfile( "setup.py", globals(), locals() )