Make UCSC build update scripts find elementtree properly

cron/parse_builds.py

@@ -8,8 +8,12 @@ build   description
 
 import sys
 import urllib
-import pkg_resources; pkg_resources.require( "elementtree" )
-from elementtree import ElementTree
+if sys.version_info[:2] >= ( 2, 5 ):
+    import xml.etree.ElementTree as ElementTree
+else:
+    from galaxy import eggs
+    import pkg_resources; pkg_resources.require( "elementtree" )
+    from elementtree import ElementTree
 
 URL = "http://genome-test.cse.ucsc.edu/cgi-bin/das/dsn"
 

cron/parse_builds_3_sites.py

@@ -5,8 +5,12 @@ Connects to sites and determines which builds are available at each.
 
 import sys
 import urllib
-import pkg_resources; pkg_resources.require( "elementtree" )
-from elementtree import ElementTree
+if sys.version_info[:2] >= ( 2, 5 ):
+    import xml.etree.ElementTree as ElementTree
+else:
+    from galaxy import eggs
+    import pkg_resources; pkg_resources.require( "elementtree" )
+    from elementtree import ElementTree
 
 sites = ['http://genome.ucsc.edu/cgi-bin/',
         'http://archaea.ucsc.edu/cgi-bin/',

cron/updateucsc.sh.sample

@@ -6,7 +6,7 @@
 
 # Edit this line to refer to galaxy's path:
 GALAXY=/galaxy/path
-export PYTHONPATH=${GALAXY}/modules:${GALAXY}/eggs:${GALAXY}/lib
+export PYTHONPATH=${GALAXY}/lib
 
 # setup directories
 mkdir ${GALAXY}/tool-data/shared/ucsc/new
@@ -57,4 +57,4 @@ then
     echo "Manual addition was successful."
 else
     echo "Manual addition failed" >&2
-fi
+fi