From b45b74f3ec4a674a1f9e394eaa8cfb228b49f0ba Mon Sep 17 00:00:00 2001 From: Guruprasad Anada Date: Tue, 3 Feb 2009 18:34:27 -0500 Subject: [PATCH] Fixes to get functional tests working. --- tools/hyphy/hyphy_branch_lengths_wrapper.xml | 2 +- tools/regVariation/getIndels.py | 6 ++++-- tools/regVariation/quality_filter.py | 5 ++++- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/tools/hyphy/hyphy_branch_lengths_wrapper.xml b/tools/hyphy/hyphy_branch_lengths_wrapper.xml index 66aa45c1fe1..e11271d4706 100644 --- a/tools/hyphy/hyphy_branch_lengths_wrapper.xml +++ b/tools/hyphy/hyphy_branch_lengths_wrapper.xml @@ -1,4 +1,4 @@ - + Estimation diff --git a/tools/regVariation/getIndels.py b/tools/regVariation/getIndels.py index d18b12e912c..19ae356d91f 100644 --- a/tools/regVariation/getIndels.py +++ b/tools/regVariation/getIndels.py @@ -10,8 +10,10 @@ from __future__ import division from galaxy import eggs import pkg_resources pkg_resources.require( "bx-python" ) -pkg_resources.require("numpy") - +try: + pkg_resources.require("numpy") +except: + pass import psyco_full import sys from bx.cookbook import doc_optparse diff --git a/tools/regVariation/quality_filter.py b/tools/regVariation/quality_filter.py index 9e0cb06a25f..033443f161f 100644 --- a/tools/regVariation/quality_filter.py +++ b/tools/regVariation/quality_filter.py @@ -12,7 +12,10 @@ from galaxy import eggs import pkg_resources pkg_resources.require( "bx-python" ) pkg_resources.require( "lrucache" ) -pkg_resources.require("numpy") +try: + pkg_resources.require("numpy") +except: + pass import psyco_full import sys