# HG changeset patch -- Bitbucket.org # Project galaxy-dist # URL http://bitbucket.org/galaxy/galaxy-dist/overview # User Nate Coraor nate@bx.psu.edu # Date 1280336236 14400 # Node ID 453e4edfab90db13efd08af64eeb3e7c64c22880 # Parent 04dd5e51cf19b8c85e824457b045cc6af945dd4e Have check_galaxy.py script get twill from galaxy.eggs instead of directly from the (defunct) eggs/py-(version) directory

--- a/scripts/check_galaxy.py +++ b/scripts/check_galaxy.py @@ -90,9 +90,8 @@ except:

# find/import twill lib_dir = os.path.join( scripts_dir, "..", "lib" ) -eggs_dir = os.path.join( scripts_dir, "..", "eggs", "py%s-noplatform" %sys.version[:3] ) sys.path.append( lib_dir ) -sys.path.append( eggs_dir ) +from galaxy import eggs import pkg_resources pkg_resources.require( "twill" ) import twill