Author: bugman
Date: Wed Apr 16 11:33:52 2014
New Revision: 22785
URL: http://svn.gna.org/viewcvs/relax?rev=22785&view=rev
Log:
Clean up of many unused imports in the test suite directories.
The unused imports were found using the find_unused_imports.py development
script.
Modified:
trunk/test_suite/gui_tests/noe.py
trunk/test_suite/shared_data/dispersion/Hansen/r2eff_calc.py
trunk/test_suite/shared_data/dispersion/KTeilum_FMPoulsen_MAkke_2006/acbp_cpmg_disp_048MGuHCl_40C_041223/r2eff_calc.py
trunk/test_suite/shared_data/dispersion/KTeilum_FMPoulsen_MAkke_2006/acbp_cpmg_disp_048MGuHCl_40C_041223/r2eff_calc_trunc.py
trunk/test_suite/shared_data/dispersion/KTeilum_FMPoulsen_MAkke_2006/acbp_cpmg_disp_101MGuHCl_40C_041223/r2eff_calc.py
trunk/test_suite/shared_data/dispersion/KTeilum_FMPoulsen_MAkke_2006/acbp_cpmg_disp_101MGuHCl_40C_041223/r2eff_calc_trunc.py
trunk/test_suite/shared_data/dispersion/Kjaergaard_et_al_2013/r1rho_3_spectra_settings.py
trunk/test_suite/shared_data/dispersion/lm63_3site/r2eff_calc.py
trunk/test_suite/shared_data/dispersion/r1rho_off_res_tp02/R1rho_analysis.py
trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/frame_order_pseudo_ellipse.py
trunk/test_suite/system_tests/n_state_model.py
trunk/test_suite/system_tests/relax_disp.py
trunk/test_suite/system_tests/scripts/frame_order/cam/base_script.py
trunk/test_suite/system_tests/scripts/relax_disp/r2eff_calc.py
trunk/test_suite/unit_tests/_lib/_linear_algebra/test_matrix_exponential.py
trunk/test_suite/unit_tests/_pipe_control/test_align_tensor.py
trunk/test_suite/unit_tests/_pipe_control/test_diffusion_tensor.py
trunk/test_suite/unit_tests/_prompt/test_relax_disp.py
Modified: trunk/test_suite/gui_tests/noe.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/gui_tests/noe.py?rev=22785&r1=22784&r2=22785&view=diff
==============================================================================
--- trunk/test_suite/gui_tests/noe.py (original)
+++ trunk/test_suite/gui_tests/noe.py Wed Apr 16 11:33:52 2014
@@ -26,7 +26,7 @@
# relax module imports.
from data_store import Relax_data_store; ds = Relax_data_store()
from gui.interpreter import Interpreter; interpreter = Interpreter()
-from gui.string_conv import int_to_gui, str_to_gui
+from gui.string_conv import str_to_gui
from pipe_control.mol_res_spin import spin_loop
from pipe_control.pipes import cdp_name
from status import Status; status = Status()
Modified: trunk/test_suite/shared_data/dispersion/Hansen/r2eff_calc.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/dispersion/Hansen/r2eff_calc.py?rev=22785&r1=22784&r2=22785&view=diff
==============================================================================
--- trunk/test_suite/shared_data/dispersion/Hansen/r2eff_calc.py
(original)
+++ trunk/test_suite/shared_data/dispersion/Hansen/r2eff_calc.py Wed
Apr 16 11:33:52 2014
@@ -6,7 +6,6 @@
# relax module imports.
from auto_analyses.relax_disp import Relax_disp
from data_store import Relax_data_store; ds = Relax_data_store()
-from pipe_control.mol_res_spin import spin_loop
from status import Status; status = Status()
Modified:
trunk/test_suite/shared_data/dispersion/KTeilum_FMPoulsen_MAkke_2006/acbp_cpmg_disp_048MGuHCl_40C_041223/r2eff_calc.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/dispersion/KTeilum_FMPoulsen_MAkke_2006/acbp_cpmg_disp_048MGuHCl_40C_041223/r2eff_calc.py?rev=22785&r1=22784&r2=22785&view=diff
==============================================================================
---
trunk/test_suite/shared_data/dispersion/KTeilum_FMPoulsen_MAkke_2006/acbp_cpmg_disp_048MGuHCl_40C_041223/r2eff_calc.py
(original)
+++
trunk/test_suite/shared_data/dispersion/KTeilum_FMPoulsen_MAkke_2006/acbp_cpmg_disp_048MGuHCl_40C_041223/r2eff_calc.py
Wed Apr 16 11:33:52 2014
@@ -5,7 +5,6 @@
$ ../../../../../relax r2eff_cal.py --tee r2eff_calc.log
"""
-import os
import shutil
from auto_analyses.relax_disp import Relax_disp
Modified:
trunk/test_suite/shared_data/dispersion/KTeilum_FMPoulsen_MAkke_2006/acbp_cpmg_disp_048MGuHCl_40C_041223/r2eff_calc_trunc.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/dispersion/KTeilum_FMPoulsen_MAkke_2006/acbp_cpmg_disp_048MGuHCl_40C_041223/r2eff_calc_trunc.py?rev=22785&r1=22784&r2=22785&view=diff
==============================================================================
---
trunk/test_suite/shared_data/dispersion/KTeilum_FMPoulsen_MAkke_2006/acbp_cpmg_disp_048MGuHCl_40C_041223/r2eff_calc_trunc.py
(original)
+++
trunk/test_suite/shared_data/dispersion/KTeilum_FMPoulsen_MAkke_2006/acbp_cpmg_disp_048MGuHCl_40C_041223/r2eff_calc_trunc.py
Wed Apr 16 11:33:52 2014
@@ -5,7 +5,6 @@
$ ../../../../../relax r2eff_calc_trunc.py --tee r2eff_calc_trunc.log
"""
-import os
import shutil
from auto_analyses.relax_disp import Relax_disp
Modified:
trunk/test_suite/shared_data/dispersion/KTeilum_FMPoulsen_MAkke_2006/acbp_cpmg_disp_101MGuHCl_40C_041223/r2eff_calc.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/dispersion/KTeilum_FMPoulsen_MAkke_2006/acbp_cpmg_disp_101MGuHCl_40C_041223/r2eff_calc.py?rev=22785&r1=22784&r2=22785&view=diff
==============================================================================
---
trunk/test_suite/shared_data/dispersion/KTeilum_FMPoulsen_MAkke_2006/acbp_cpmg_disp_101MGuHCl_40C_041223/r2eff_calc.py
(original)
+++
trunk/test_suite/shared_data/dispersion/KTeilum_FMPoulsen_MAkke_2006/acbp_cpmg_disp_101MGuHCl_40C_041223/r2eff_calc.py
Wed Apr 16 11:33:52 2014
@@ -5,7 +5,6 @@
$ ../../../../../relax r2eff_cal.py --tee r2eff_calc.log
"""
-import os
import shutil
from auto_analyses.relax_disp import Relax_disp
Modified:
trunk/test_suite/shared_data/dispersion/KTeilum_FMPoulsen_MAkke_2006/acbp_cpmg_disp_101MGuHCl_40C_041223/r2eff_calc_trunc.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/dispersion/KTeilum_FMPoulsen_MAkke_2006/acbp_cpmg_disp_101MGuHCl_40C_041223/r2eff_calc_trunc.py?rev=22785&r1=22784&r2=22785&view=diff
==============================================================================
---
trunk/test_suite/shared_data/dispersion/KTeilum_FMPoulsen_MAkke_2006/acbp_cpmg_disp_101MGuHCl_40C_041223/r2eff_calc_trunc.py
(original)
+++
trunk/test_suite/shared_data/dispersion/KTeilum_FMPoulsen_MAkke_2006/acbp_cpmg_disp_101MGuHCl_40C_041223/r2eff_calc_trunc.py
Wed Apr 16 11:33:52 2014
@@ -5,7 +5,6 @@
$ ../../../../../relax r2eff_calc_trunc.py --tee r2eff_calc_trunc.log
"""
-import os
import shutil
from auto_analyses.relax_disp import Relax_disp
Modified:
trunk/test_suite/shared_data/dispersion/Kjaergaard_et_al_2013/r1rho_3_spectra_settings.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/dispersion/Kjaergaard_et_al_2013/r1rho_3_spectra_settings.py?rev=22785&r1=22784&r2=22785&view=diff
==============================================================================
---
trunk/test_suite/shared_data/dispersion/Kjaergaard_et_al_2013/r1rho_3_spectra_settings.py
(original)
+++
trunk/test_suite/shared_data/dispersion/Kjaergaard_et_al_2013/r1rho_3_spectra_settings.py
Wed Apr 16 11:33:52 2014
@@ -1,6 +1,6 @@
# Copyright (C) 2013 Troels E. Linnet
# Set settings for experiment
-import os, math
+import os
NR_exp = -1
Modified: trunk/test_suite/shared_data/dispersion/lm63_3site/r2eff_calc.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/dispersion/lm63_3site/r2eff_calc.py?rev=22785&r1=22784&r2=22785&view=diff
==============================================================================
--- trunk/test_suite/shared_data/dispersion/lm63_3site/r2eff_calc.py
(original)
+++ trunk/test_suite/shared_data/dispersion/lm63_3site/r2eff_calc.py Wed
Apr 16 11:33:52 2014
@@ -6,7 +6,6 @@
# relax module imports.
from auto_analyses.relax_disp import Relax_disp
from data_store import Relax_data_store; ds = Relax_data_store()
-from pipe_control.mol_res_spin import spin_loop
from status import Status; status = Status()
Modified:
trunk/test_suite/shared_data/dispersion/r1rho_off_res_tp02/R1rho_analysis.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/dispersion/r1rho_off_res_tp02/R1rho_analysis.py?rev=22785&r1=22784&r2=22785&view=diff
==============================================================================
---
trunk/test_suite/shared_data/dispersion/r1rho_off_res_tp02/R1rho_analysis.py
(original)
+++
trunk/test_suite/shared_data/dispersion/r1rho_off_res_tp02/R1rho_analysis.py
Wed Apr 16 11:33:52 2014
@@ -1,6 +1,6 @@
###############################################################################
#
#
-# Copyright (C) 2013 Edward d'Auvergne
#
+# Copyright (C) 2013-2014 Edward d'Auvergne
#
#
#
# This file is part of the program relax (http://www.nmr-relax.com).
#
#
#
@@ -24,9 +24,6 @@
This is here to test the ./sample_scripts/relax_disp/R1rho_analysis.py
sample script. The differences between the two files should be minimal.
"""
-
-# Python module imports.
-from os import sep
# relax module imports.
from auto_analyses.relax_disp import Relax_disp
Modified:
trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/frame_order_pseudo_ellipse.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/frame_order_pseudo_ellipse.py?rev=22785&r1=22784&r2=22785&view=diff
==============================================================================
---
trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/frame_order_pseudo_ellipse.py
(original)
+++
trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/frame_order_pseudo_ellipse.py
Wed Apr 16 11:33:52 2014
@@ -2,7 +2,6 @@
# Python module imports.
from numpy import array, float64, transpose, zeros
-from os import sep
# relax module imports.
from lib.geometry.rotations import euler_to_R_zyz
Modified: trunk/test_suite/system_tests/n_state_model.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/n_state_model.py?rev=22785&r1=22784&r2=22785&view=diff
==============================================================================
--- trunk/test_suite/system_tests/n_state_model.py (original)
+++ trunk/test_suite/system_tests/n_state_model.py Wed Apr 16 11:33:52
2014
@@ -1,6 +1,6 @@
###############################################################################
#
#
-# Copyright (C) 2008-2013 Edward d'Auvergne
#
+# Copyright (C) 2008-2014 Edward d'Auvergne
#
# Copyright (C) 2013 Troels E. Linnet
#
#
#
# This file is part of the program relax (http://www.nmr-relax.com).
#
@@ -28,7 +28,6 @@
from tempfile import mkdtemp
# relax module imports.
-from auto_analyses import stereochem_analysis
from data_store import Relax_data_store; ds = Relax_data_store()
import dep_check
from pipe_control.align_tensor import calc_chi_tensor
Modified: trunk/test_suite/system_tests/relax_disp.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/relax_disp.py?rev=22785&r1=22784&r2=22785&view=diff
==============================================================================
--- trunk/test_suite/system_tests/relax_disp.py (original)
+++ trunk/test_suite/system_tests/relax_disp.py Wed Apr 16 11:33:52 2014
@@ -31,9 +31,8 @@
import dep_check
from pipe_control.mol_res_spin import return_spin, spin_loop
from specific_analyses.relax_disp.data import generate_r20_key,
get_curve_type
-from specific_analyses.relax_disp.variables import EXP_TYPE_CPMG_DQ,
EXP_TYPE_CPMG_MQ, EXP_TYPE_CPMG_PROTON_MQ, EXP_TYPE_CPMG_PROTON_SQ,
EXP_TYPE_CPMG_SQ, EXP_TYPE_CPMG_ZQ, EXP_TYPE_R1RHO, MODEL_CR72,
MODEL_CR72_FULL, MODEL_IT99, MODEL_LIST_CPMG, MODEL_LM63, MODEL_M61B,
MODEL_NOREX, MODEL_NS_CPMG_2SITE_EXPANDED, MODEL_R2EFF
+from specific_analyses.relax_disp.variables import EXP_TYPE_CPMG_DQ,
EXP_TYPE_CPMG_MQ, EXP_TYPE_CPMG_PROTON_MQ, EXP_TYPE_CPMG_PROTON_SQ,
EXP_TYPE_CPMG_SQ, EXP_TYPE_CPMG_ZQ, EXP_TYPE_R1RHO, MODEL_CR72, MODEL_IT99,
MODEL_LM63, MODEL_M61B, MODEL_NOREX, MODEL_NS_CPMG_2SITE_EXPANDED, MODEL_R2EFF
from status import Status; status = Status()
-from test_suite.clean_up import deletion
from test_suite.system_tests.base_classes import SystemTestCase
Modified: trunk/test_suite/system_tests/scripts/frame_order/cam/base_script.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/frame_order/cam/base_script.py?rev=22785&r1=22784&r2=22785&view=diff
==============================================================================
--- trunk/test_suite/system_tests/scripts/frame_order/cam/base_script.py
(original)
+++ trunk/test_suite/system_tests/scripts/frame_order/cam/base_script.py
Wed Apr 16 11:33:52 2014
@@ -23,7 +23,7 @@
"""Base script for the optimisation of the rigid frame order test models."""
# Python module imports.
-from numpy import arctan2, array, cross, dot, float32, float64, transpose,
zeros
+from numpy import array, cross, float32, float64, transpose, zeros
from numpy.linalg import norm
from os import F_OK, access, sep
Modified: trunk/test_suite/system_tests/scripts/relax_disp/r2eff_calc.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/relax_disp/r2eff_calc.py?rev=22785&r1=22784&r2=22785&view=diff
==============================================================================
--- trunk/test_suite/system_tests/scripts/relax_disp/r2eff_calc.py
(original)
+++ trunk/test_suite/system_tests/scripts/relax_disp/r2eff_calc.py Wed
Apr 16 11:33:52 2014
@@ -6,7 +6,6 @@
# relax module imports.
from auto_analyses.relax_disp import Relax_disp
from data_store import Relax_data_store; ds = Relax_data_store()
-from pipe_control.mol_res_spin import spin_loop
from status import Status; status = Status()
Modified:
trunk/test_suite/unit_tests/_lib/_linear_algebra/test_matrix_exponential.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/unit_tests/_lib/_linear_algebra/test_matrix_exponential.py?rev=22785&r1=22784&r2=22785&view=diff
==============================================================================
---
trunk/test_suite/unit_tests/_lib/_linear_algebra/test_matrix_exponential.py
(original)
+++
trunk/test_suite/unit_tests/_lib/_linear_algebra/test_matrix_exponential.py
Wed Apr 16 11:33:52 2014
@@ -1,6 +1,6 @@
###############################################################################
#
#
-# Copyright (C) 2009-2013 Edward d'Auvergne
#
+# Copyright (C) 2009-2014 Edward d'Auvergne
#
#
#
# This file is part of the program relax (http://www.nmr-relax.com).
#
#
#
@@ -20,7 +20,7 @@
###############################################################################
# Python module imports.
-from numpy import array, complex64, float64, zeros
+from numpy import array, complex64, float64
from unittest import TestCase
# relax module imports.
Modified: trunk/test_suite/unit_tests/_pipe_control/test_align_tensor.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/unit_tests/_pipe_control/test_align_tensor.py?rev=22785&r1=22784&r2=22785&view=diff
==============================================================================
--- trunk/test_suite/unit_tests/_pipe_control/test_align_tensor.py
(original)
+++ trunk/test_suite/unit_tests/_pipe_control/test_align_tensor.py Wed
Apr 16 11:33:52 2014
@@ -21,7 +21,6 @@
# relax module imports.
from pipe_control import align_tensor
-from lib.errors import RelaxStrError, RelaxUnknownParamError
from test_suite.unit_tests.align_tensor_testing_base import
Align_tensor_base_class
Modified: trunk/test_suite/unit_tests/_pipe_control/test_diffusion_tensor.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/unit_tests/_pipe_control/test_diffusion_tensor.py?rev=22785&r1=22784&r2=22785&view=diff
==============================================================================
--- trunk/test_suite/unit_tests/_pipe_control/test_diffusion_tensor.py
(original)
+++ trunk/test_suite/unit_tests/_pipe_control/test_diffusion_tensor.py Wed
Apr 16 11:33:52 2014
@@ -24,7 +24,6 @@
# relax module imports.
from pipe_control import diffusion_tensor
-from lib.errors import RelaxStrError
from test_suite.unit_tests.diffusion_tensor_testing_base import
Diffusion_tensor_base_class
Modified: trunk/test_suite/unit_tests/_prompt/test_relax_disp.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/unit_tests/_prompt/test_relax_disp.py?rev=22785&r1=22784&r2=22785&view=diff
==============================================================================
--- trunk/test_suite/unit_tests/_prompt/test_relax_disp.py (original)
+++ trunk/test_suite/unit_tests/_prompt/test_relax_disp.py Wed Apr 16
11:33:52 2014
@@ -25,7 +25,7 @@
# relax module imports.
from prompt.interpreter import Interpreter
-from lib.errors import RelaxNoneNumError, RelaxNumError, RelaxStrError
+from lib.errors import RelaxNoneNumError, RelaxStrError
# Unit test imports.
from test_suite.unit_tests._prompt.data_types import DATA_TYPES
r22785 - in /trunk/test_suite: gui_tests/ shared_data/dispersion/Hansen/ shared_data/dispersion/KTeilum_FMPoulsen_MAkke_2006...