mirror of
https://github.com/galaxyproject/galaxy.git
synced 2026-09-24 16:30:27 +08:00
A more trustworthy way of generating Galaxy's base path in util/__init__.py.
This is used to open builds.txt, ucsc_build_sites.txt, and gbrowse_build_sites.txt. Some tools are importing galaxy.tools.validation which eventually imports util/__init__.py, which was opening files with paths based upon the working directory.
This commit is contained in:
@@ -3,7 +3,7 @@ Utility functions used systemwide.
|
||||
|
||||
"""
|
||||
import logging
|
||||
import threading, sets, random, string, md5, re, binascii, pickle, time, datetime, math, re
|
||||
import threading, sets, random, string, md5, re, binascii, pickle, time, datetime, math, re, os
|
||||
|
||||
import pkg_resources
|
||||
|
||||
@@ -305,9 +305,10 @@ def read_build_sites(filename):
|
||||
print "ERROR: Unable to read builds for site file %s" %filename
|
||||
return build_sites
|
||||
|
||||
dbnames = read_dbnames("static/ucsc/builds.txt") #this list is used in edit attributes and the upload tool
|
||||
ucsc_build_sites = read_build_sites("static/ucsc/ucsc_build_sites.txt") #this list is used in history.tmpl
|
||||
gbrowse_build_sites = read_build_sites("static/gbrowse/gbrowse_build_sites.txt") #this list is used in history.tmpl
|
||||
galaxy_root_path = os.path.join(__path__[0], "..","..","..")
|
||||
dbnames = read_dbnames(os.path.join(galaxy_root_path,"static","ucsc","builds.txt")) #this list is used in edit attributes and the upload tool
|
||||
ucsc_build_sites = read_build_sites(os.path.join(galaxy_root_path,"static","ucsc","ucsc_build_sites.txt")) #this list is used in history.tmpl
|
||||
gbrowse_build_sites = read_build_sites(os.path.join(galaxy_root_path,"static","gbrowse","gbrowse_build_sites.txt")) #this list is used in history.tmpl
|
||||
|
||||
if __name__ == '__main__':
|
||||
import doctest, sys
|
||||
|
||||
Reference in New Issue
Block a user