From 6d7c8b3136e24ff3e752efecb14f57574cd53174 Mon Sep 17 00:00:00 2001 From: John Chilton Date: Fri, 1 Sep 2017 08:49:42 -0400 Subject: [PATCH] Cleanup sys.path hacking in test/base/tool_shed_util.py. --- test/base/tool_shed_util.py | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/test/base/tool_shed_util.py b/test/base/tool_shed_util.py index 5782003b21f..e9a25d296c8 100644 --- a/test/base/tool_shed_util.py +++ b/test/base/tool_shed_util.py @@ -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