[galaxy-dev] [hg] galaxy 1721: Apparently I only committed these fixes to sec...
details: http://www.bx.psu.edu/hg/galaxy/rev/9abb83ad372d
changeset: 1721:9abb83ad372d
user: Nate Coraor <nate(a)bx.psu.edu>
date: Sat Jan 24 12:13:47 2009 -0500
description:
Apparently I only committed these fixes to security. Recommit of changeset
2015:7a447128f2cd from security, Make UCSC build update scripts find elementtree properly
3 file(s) affected in this change:
cron/parse_builds.py
cron/parse_builds_3_sites.py
cron/updateucsc.sh.sample
diffs (55 lines):
diff -r f27a815ae734 -r 9abb83ad372d cron/parse_builds.py
--- a/cron/parse_builds.py Fri Jan 23 14:12:52 2009 -0500
+++ b/cron/parse_builds.py Sat Jan 24 12:13:47 2009 -0500
@@ -8,8 +8,12 @@
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"
diff -r f27a815ae734 -r 9abb83ad372d cron/parse_builds_3_sites.py
--- a/cron/parse_builds_3_sites.py Fri Jan 23 14:12:52 2009 -0500
+++ b/cron/parse_builds_3_sites.py Sat Jan 24 12:13:47 2009 -0500
@@ -5,8 +5,12 @@
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/',
diff -r f27a815ae734 -r 9abb83ad372d cron/updateucsc.sh.sample
--- a/cron/updateucsc.sh.sample Fri Jan 23 14:12:52 2009 -0500
+++ b/cron/updateucsc.sh.sample Sat Jan 24 12:13:47 2009 -0500
@@ -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 @@
echo "Manual addition was successful."
else
echo "Manual addition failed" >&2
-fi
\ No newline at end of file
+fi