opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-10-25 00:12:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup sys.path hacking in test/base/tool_shed_util.py.

Browse Source
This commit is contained in:
John Chilton
2017-09-01 12:30:14 -04:00
parent 6e17ff57ea
commit 6d7c8b3136
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/base/tool_shed_util.py
+3 -7
View File
@@ -1,11 +1,7 @@
import logging
import os
import sys
galaxy_root = os.path.abspath(os.path.join(os.path.dirname(__file__), os.path.pardir, os.path.pardir))
sys.path.insert(1, os.path.join(galaxy_root, 'lib'))
from galaxy.util import parse_xml
from galaxy.util import parse_xml, galaxy_root_path
log = logging.getLogger(__name__)
@@ -64,7 +60,7 @@ def parse_tool_panel_config(config, shed_tools_dict):
has_test_data = True
if galaxy_test_file_dir != last_galaxy_test_file_dir:
if not os.path.isabs(galaxy_test_file_dir):
galaxy_test_file_dir = os.path.join(galaxy_root, galaxy_test_file_dir)
galaxy_test_file_dir = os.path.join(galaxy_root_path, galaxy_test_file_dir)
guid = elem.get('guid')
shed_tools_dict[guid] = galaxy_test_file_dir
last_galaxy_test_file_dir = galaxy_test_file_dir
@@ -83,7 +79,7 @@ def parse_tool_panel_config(config, shed_tools_dict):
has_test_data = True
if galaxy_test_file_dir != last_galaxy_test_file_dir:
if not os.path.isabs(galaxy_test_file_dir):
galaxy_test_file_dir = os.path.join(galaxy_root, galaxy_test_file_dir)
galaxy_test_file_dir = os.path.join(galaxy_root_path, galaxy_test_file_dir)
guid = section_elem.get('guid')
shed_tools_dict[guid] = galaxy_test_file_dir
last_galaxy_test_file_dir = galaxy_test_file_dir