Author: bugman Date: Sun Jun 16 22:05:55 2013 New Revision: 20165 URL: http://svn.gna.org/viewcvs/relax?rev=20165&view=rev Log: Merged revisions 20150-20164 via svnmerge from svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk ........ r20150 | bugman | 2013-06-16 15:23:18 +0200 (Sun, 16 Jun 2013) | 3 lines More cleanups of unused imports throughout relax. ........ r20151 | bugman | 2013-06-16 16:49:03 +0200 (Sun, 16 Jun 2013) | 3 lines Fixes and expansion of the test_suite.unit_tests._lib package __all__ list. ........ r20152 | bugman | 2013-06-16 17:23:11 +0200 (Sun, 16 Jun 2013) | 6 lines Fixes and improvements to Gary Thompson's unit_test_runner.py script. The printouts have been improved and the script can now handle more than 3 levels of directories for a package. ........ r20153 | bugman | 2013-06-16 17:30:23 +0200 (Sun, 16 Jun 2013) | 3 lines The unit_test_runner.py script now defaults to verbose mode. ........ r20154 | bugman | 2013-06-16 18:19:06 +0200 (Sun, 16 Jun 2013) | 3 lines More cleanups of the unit_test_runner.py script. ........ r20155 | bugman | 2013-06-16 18:20:32 +0200 (Sun, 16 Jun 2013) | 6 lines Added a printout to the unit_test_runner.py if the TestCase class cannot be found. This normally continued the test loading silently without warning that the TestCase class name is missing or incorrect. ........ r20156 | bugman | 2013-06-16 18:23:56 +0200 (Sun, 16 Jun 2013) | 6 lines Fixes for the TestCase class names for a number of lib package modules. As the test class name was incorrect, previously the test suite was skipping these silently. This was dangerous! ........ r20157 | bugman | 2013-06-16 18:25:39 +0200 (Sun, 16 Jun 2013) | 3 lines Missing import in the unit test module for the lib.frame_order.matrix_ops module. ........ r20158 | bugman | 2013-06-16 18:49:14 +0200 (Sun, 16 Jun 2013) | 3 lines Import fixes for the test_suite.unit_tests._lib._frame_order.test_matrix_ops module. ........ r20159 | bugman | 2013-06-16 19:00:41 +0200 (Sun, 16 Jun 2013) | 6 lines Fixes for the unit tests of the lib.selection module. The contains_*() methods now should be used. And the test_Selection_ful_spin_id() unit test has been completely deleted as this way of checking the selection object is no longer valid. ........ r20160 | bugman | 2013-06-16 19:09:19 +0200 (Sun, 16 Jun 2013) | 6 lines Shifted the spin_id_to_data_list() function from pipe_control.selection to lib.selection. This is because the selection object requires this function, and the function has nothing to do with the relax data store. ........ r20161 | bugman | 2013-06-16 19:51:37 +0200 (Sun, 16 Jun 2013) | 3 lines Lots of import cleanups including removal of '*' imports, missing imports, and unused imports. ........ r20162 | bugman | 2013-06-16 20:10:11 +0200 (Sun, 16 Jun 2013) | 3 lines Small change to the find_unused_imports.py printouts. ........ r20163 | bugman | 2013-06-16 21:18:45 +0200 (Sun, 16 Jun 2013) | 3 lines Large removal of unused imports throughout relax found using the devel_scripts/find_unused_imports.py script. ........ r20164 | bugman | 2013-06-16 22:04:28 +0200 (Sun, 16 Jun 2013) | 6 lines Clean up of all the imports in the relax code base. This is mainly alphabetical reordering of the imports required due to the huge layout changes in the trunk. ........ Modified: branches/relax_disp/ (props changed) branches/relax_disp/devel_scripts/find_unused_imports.py branches/relax_disp/extern/sobol/sobol_lib.py branches/relax_disp/extern/sobol/sobol_test.py branches/relax_disp/graphics/wizards/dipole_pair/NH_dipole_pair.py branches/relax_disp/graphics/wizards/dipole_pair/VectorFieldPlot.py branches/relax_disp/gui/__init__.py branches/relax_disp/gui/about.py branches/relax_disp/gui/analyses/__init__.py branches/relax_disp/gui/analyses/auto_model_free.py branches/relax_disp/gui/analyses/auto_r1.py branches/relax_disp/gui/analyses/auto_r2.py branches/relax_disp/gui/analyses/auto_rx_base.py branches/relax_disp/gui/analyses/elements/model_list.py branches/relax_disp/gui/analyses/wizard.py branches/relax_disp/gui/components/base_list.py branches/relax_disp/gui/components/citations.py branches/relax_disp/gui/components/free_file_format.py branches/relax_disp/gui/components/grid.py branches/relax_disp/gui/components/molecule.py branches/relax_disp/gui/components/relax_data.py branches/relax_disp/gui/components/relax_data_meta.py branches/relax_disp/gui/components/scripts.py branches/relax_disp/gui/components/software.py branches/relax_disp/gui/components/spectrum.py branches/relax_disp/gui/controller.py branches/relax_disp/gui/export_bmrb.py branches/relax_disp/gui/filedialog.py branches/relax_disp/gui/input_elements/bool.py branches/relax_disp/gui/input_elements/combo_list.py branches/relax_disp/gui/input_elements/dir.py branches/relax_disp/gui/input_elements/file.py branches/relax_disp/gui/input_elements/sequence.py branches/relax_disp/gui/input_elements/sequence_2D.py branches/relax_disp/gui/input_elements/spin_id.py branches/relax_disp/gui/input_elements/value.py branches/relax_disp/gui/interpreter.py branches/relax_disp/gui/menu.py branches/relax_disp/gui/message.py branches/relax_disp/gui/misc.py branches/relax_disp/gui/pipe_editor.py branches/relax_disp/gui/relax_gui.py branches/relax_disp/gui/relax_prompt.py branches/relax_disp/gui/results_viewer.py branches/relax_disp/gui/spin_viewer/containers.py branches/relax_disp/gui/spin_viewer/frame.py branches/relax_disp/gui/spin_viewer/splitter.py branches/relax_disp/gui/spin_viewer/tree.py branches/relax_disp/gui/uf_objects.py branches/relax_disp/gui/wizards/peak_intensity.py branches/relax_disp/gui/wizards/wiz_objects.py branches/relax_disp/lib/io.py branches/relax_disp/lib/selection.py branches/relax_disp/lib/warnings.py branches/relax_disp/multi/mpi4py_processor.py branches/relax_disp/multi/multi_processor_base.py branches/relax_disp/multi/result_commands.py branches/relax_disp/multi/slave_commands.py branches/relax_disp/pipe_control/align_tensor.py branches/relax_disp/pipe_control/angles.py branches/relax_disp/pipe_control/bmrb.py branches/relax_disp/pipe_control/bruker.py branches/relax_disp/pipe_control/dasha.py branches/relax_disp/pipe_control/diffusion_tensor.py branches/relax_disp/pipe_control/eliminate.py branches/relax_disp/pipe_control/exp_info.py branches/relax_disp/pipe_control/fix.py branches/relax_disp/pipe_control/grace.py branches/relax_disp/pipe_control/interatomic.py branches/relax_disp/pipe_control/j_coupling.py branches/relax_disp/pipe_control/minimise.py branches/relax_disp/pipe_control/model_selection.py branches/relax_disp/pipe_control/mol_res_spin.py branches/relax_disp/pipe_control/molmol.py branches/relax_disp/pipe_control/monte_carlo.py branches/relax_disp/pipe_control/noesy.py branches/relax_disp/pipe_control/opendx.py branches/relax_disp/pipe_control/palmer.py branches/relax_disp/pipe_control/paramag.py branches/relax_disp/pipe_control/pcs.py branches/relax_disp/pipe_control/pymol_control.py branches/relax_disp/pipe_control/rdc.py branches/relax_disp/pipe_control/relax_data.py branches/relax_disp/pipe_control/results.py branches/relax_disp/pipe_control/selection.py branches/relax_disp/pipe_control/sequence.py branches/relax_disp/pipe_control/spectrum.py branches/relax_disp/pipe_control/state.py branches/relax_disp/pipe_control/structure/geometric.py branches/relax_disp/pipe_control/structure/main.py branches/relax_disp/pipe_control/structure/mass.py branches/relax_disp/pipe_control/value.py branches/relax_disp/relax.py branches/relax_disp/sample_scripts/model_free/final_data_extraction.py branches/relax_disp/sample_scripts/n_state_model/local_min_search.py branches/relax_disp/specific_analyses/api_common.py branches/relax_disp/specific_analyses/consistency_tests/__init__.py branches/relax_disp/specific_analyses/frame_order/__init__.py branches/relax_disp/specific_analyses/hybrid.py branches/relax_disp/specific_analyses/jw_mapping/__init__.py branches/relax_disp/specific_analyses/model_free/__init__.py branches/relax_disp/specific_analyses/model_free/bmrb.py branches/relax_disp/specific_analyses/model_free/macro_base.py branches/relax_disp/specific_analyses/model_free/main.py branches/relax_disp/specific_analyses/model_free/mf_minimise.py branches/relax_disp/specific_analyses/model_free/multi_processor_commands.py branches/relax_disp/specific_analyses/model_free/results.py branches/relax_disp/specific_analyses/n_state_model/parameters.py branches/relax_disp/specific_analyses/noe/main.py branches/relax_disp/specific_analyses/setup.py branches/relax_disp/target_functions/frame_order.py branches/relax_disp/target_functions/mf.py branches/relax_disp/target_functions/n_state_model.py branches/relax_disp/test_suite/gui_tests/base_classes.py branches/relax_disp/test_suite/gui_tests/bmrb.py branches/relax_disp/test_suite/gui_tests/bruker.py branches/relax_disp/test_suite/gui_tests/consistency_tests.py branches/relax_disp/test_suite/gui_tests/frame_order.py branches/relax_disp/test_suite/gui_tests/jw_mapping.py branches/relax_disp/test_suite/gui_tests/model_free.py branches/relax_disp/test_suite/gui_tests/noe.py branches/relax_disp/test_suite/gui_tests/pipes.py branches/relax_disp/test_suite/gui_tests/rx.py branches/relax_disp/test_suite/gui_tests/state.py branches/relax_disp/test_suite/shared_data/align_data/CaM/generate_data.py branches/relax_disp/test_suite/shared_data/align_data/CaM/pre_bleach.py branches/relax_disp/test_suite/shared_data/align_data/monte_carlo_testing/generate_data.py branches/relax_disp/test_suite/shared_data/diffusion_tensor/generate_data.py branches/relax_disp/test_suite/shared_data/frame_order/cam/free_rotor/frame_order.py branches/relax_disp/test_suite/shared_data/frame_order/cam/free_rotor2/frame_order.py branches/relax_disp/test_suite/shared_data/frame_order/cam/free_rotor_missing_data/frame_order.py branches/relax_disp/test_suite/shared_data/frame_order/cam/generate_base.py branches/relax_disp/test_suite/shared_data/frame_order/cam/iso_cone/frame_order.py branches/relax_disp/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/frame_order.py branches/relax_disp/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/frame_order.py branches/relax_disp/test_suite/shared_data/frame_order/cam/iso_cone_torsionless/frame_order.py branches/relax_disp/test_suite/shared_data/frame_order/cam/iso_cone_torsionless/frame_order_matrix.py branches/relax_disp/test_suite/shared_data/frame_order/cam/pseudo_ellipse/frame_order.py branches/relax_disp/test_suite/shared_data/frame_order/cam/pseudo_ellipse/multi_processor_test.py branches/relax_disp/test_suite/shared_data/frame_order/cam/pseudo_ellipse2/frame_order.py branches/relax_disp/test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/frame_order.py branches/relax_disp/test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/generate_distribution.py branches/relax_disp/test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/frame_order.py branches/relax_disp/test_suite/shared_data/frame_order/cam/rigid/frame_order.py branches/relax_disp/test_suite/shared_data/frame_order/cam/rotate.py branches/relax_disp/test_suite/shared_data/frame_order/cam/rotor/frame_order.py branches/relax_disp/test_suite/shared_data/frame_order/cam/rotor2/frame_order.py branches/relax_disp/test_suite/shared_data/frame_order/cam/rotor2/pcs_only/frame_order.py branches/relax_disp/test_suite/shared_data/frame_order/cam/rotor_2_state/frame_order.py branches/relax_disp/test_suite/shared_data/model_free/back_calc.py branches/relax_disp/test_suite/shared_data/saved_states/create_peak_heights_T2_ncyc1.py branches/relax_disp/test_suite/system_tests/base_classes.py branches/relax_disp/test_suite/system_tests/consistency_tests.py branches/relax_disp/test_suite/system_tests/dasha.py branches/relax_disp/test_suite/system_tests/diffusion_tensor.py branches/relax_disp/test_suite/system_tests/frame_order.py branches/relax_disp/test_suite/system_tests/generic.py branches/relax_disp/test_suite/system_tests/jw_mapping.py branches/relax_disp/test_suite/system_tests/load_spins.py branches/relax_disp/test_suite/system_tests/model_free.py branches/relax_disp/test_suite/system_tests/n_state_model.py branches/relax_disp/test_suite/system_tests/scripts/1UBQ_relax_fit.py branches/relax_disp/test_suite/system_tests/scripts/angles.py branches/relax_disp/test_suite/system_tests/scripts/bug_20674_ct_analysis_failure.py branches/relax_disp/test_suite/system_tests/scripts/bug_20674_jw_mapping.py branches/relax_disp/test_suite/system_tests/scripts/consistency_tests.py branches/relax_disp/test_suite/system_tests/scripts/curve_fitting/bug_18789_no_grace_errors.py branches/relax_disp/test_suite/system_tests/scripts/dasha.py branches/relax_disp/test_suite/system_tests/scripts/diff_tensor/ri_back_calc.py branches/relax_disp/test_suite/system_tests/scripts/diff_tensor/tensor_opt.py branches/relax_disp/test_suite/system_tests/scripts/frame_order/model_calcs/iso_cone_free_rotor.py branches/relax_disp/test_suite/system_tests/scripts/frame_order/model_calcs/iso_cone_free_rotor_eigenframe.py branches/relax_disp/test_suite/system_tests/scripts/frame_order/model_calcs/pseudo_ellipse_free_rotor.py branches/relax_disp/test_suite/system_tests/scripts/frame_order/opt_rigid_rand_rot.py branches/relax_disp/test_suite/system_tests/scripts/jw_mapping.py branches/relax_disp/test_suite/system_tests/scripts/jw_mapping_calc_test.py branches/relax_disp/test_suite/system_tests/scripts/load_spins_from_small_molecule.py branches/relax_disp/test_suite/system_tests/scripts/local_tm_model_elimination.py branches/relax_disp/test_suite/system_tests/scripts/model_free/bug_14872_unicode_selection.py branches/relax_disp/test_suite/system_tests/scripts/model_free/bug_14941_local_tm_global_selection.py branches/relax_disp/test_suite/system_tests/scripts/model_free/bug_15050.py branches/relax_disp/test_suite/system_tests/scripts/model_free/bug_18790_negative_error.py branches/relax_disp/test_suite/system_tests/scripts/model_free/bugs_12582_12591_12607.py branches/relax_disp/test_suite/system_tests/scripts/model_free/create_m4.py branches/relax_disp/test_suite/system_tests/scripts/model_free/full_analysis_trunc.py branches/relax_disp/test_suite/system_tests/scripts/model_free/generate_ri.py branches/relax_disp/test_suite/system_tests/scripts/model_free/omp_model_free.py branches/relax_disp/test_suite/system_tests/scripts/model_free/opendx_s2_te_rex.py branches/relax_disp/test_suite/system_tests/scripts/model_free/opt_setup_S2_0_970_te_2048_Rex_0_149.py branches/relax_disp/test_suite/system_tests/scripts/model_free/opt_setup_local_tm_10_S2_0_8_te_40.py branches/relax_disp/test_suite/system_tests/scripts/model_free/tylers_peptide.py branches/relax_disp/test_suite/system_tests/scripts/n_state_model/align_fit.py branches/relax_disp/test_suite/system_tests/scripts/n_state_model/data_copying.py branches/relax_disp/test_suite/system_tests/scripts/n_state_model/lactose_n_state.py branches/relax_disp/test_suite/system_tests/scripts/n_state_model/metal_pos_opt.py branches/relax_disp/test_suite/system_tests/scripts/n_state_model/monte_carlo_testing.py branches/relax_disp/test_suite/system_tests/scripts/n_state_model/paramag_align_fit.py branches/relax_disp/test_suite/system_tests/scripts/n_state_model/paramag_centre_fit.py branches/relax_disp/test_suite/system_tests/scripts/n_state_model/phthalic_acid_noes.py branches/relax_disp/test_suite/system_tests/scripts/n_state_model/populations.py branches/relax_disp/test_suite/system_tests/scripts/n_state_model/stereochem_analysis.py branches/relax_disp/test_suite/system_tests/scripts/noe.py branches/relax_disp/test_suite/system_tests/scripts/palmer.py branches/relax_disp/test_suite/system_tests/scripts/palmer_omp.py branches/relax_disp/test_suite/system_tests/scripts/peak_lists/ccpn_analysis.py branches/relax_disp/test_suite/system_tests/scripts/relax_fit.py branches/relax_disp/test_suite/system_tests/scripts/xh_vector_dist.py branches/relax_disp/test_suite/system_tests/state.py branches/relax_disp/test_suite/system_tests/unit_vectors.py branches/relax_disp/test_suite/unit_tests/_lib/__init__.py branches/relax_disp/test_suite/unit_tests/_lib/_frame_order/test_matrix_ops.py branches/relax_disp/test_suite/unit_tests/_lib/_geometry/test_lines.py branches/relax_disp/test_suite/unit_tests/_lib/_geometry/test_pec.py branches/relax_disp/test_suite/unit_tests/_lib/_geometry/test_rotations.py branches/relax_disp/test_suite/unit_tests/_lib/_linear_algebra/test_kronecker_product.py branches/relax_disp/test_suite/unit_tests/_lib/_software/test_sparky.py branches/relax_disp/test_suite/unit_tests/_lib/test_float.py branches/relax_disp/test_suite/unit_tests/_lib/test_io.py branches/relax_disp/test_suite/unit_tests/_lib/test_selection.py branches/relax_disp/test_suite/unit_tests/_pipe_control/_structure/test_internal.py branches/relax_disp/test_suite/unit_tests/_prompt/test_minimisation.py branches/relax_disp/test_suite/unit_tests/_prompt/test_molmol.py branches/relax_disp/test_suite/unit_tests/_prompt/test_n_state_model.py branches/relax_disp/test_suite/unit_tests/_prompt/test_pymol.py branches/relax_disp/test_suite/unit_tests/_prompt/test_relax_data.py branches/relax_disp/test_suite/unit_tests/_prompt/test_spectrum.py branches/relax_disp/test_suite/unit_tests/_prompt/test_spin.py branches/relax_disp/test_suite/unit_tests/_prompt/test_structure.py branches/relax_disp/test_suite/unit_tests/_prompt/test_value.py branches/relax_disp/test_suite/unit_tests/_specific_analyses/_model_free/test_main.py branches/relax_disp/test_suite/unit_tests/_target_functions/test_chi2.py branches/relax_disp/test_suite/unit_tests/relax_data_testing_base.py branches/relax_disp/test_suite/unit_tests/sequence_testing_base.py branches/relax_disp/test_suite/unit_tests/unit_test_runner.py branches/relax_disp/user_functions/bruker.py branches/relax_disp/user_functions/consistency_tests.py branches/relax_disp/user_functions/deselect.py branches/relax_disp/user_functions/diffusion_tensor.py branches/relax_disp/user_functions/dx.py branches/relax_disp/user_functions/eliminate.py branches/relax_disp/user_functions/fix.py branches/relax_disp/user_functions/frame_order.py branches/relax_disp/user_functions/grace.py branches/relax_disp/user_functions/interatom.py branches/relax_disp/user_functions/j_coupling.py branches/relax_disp/user_functions/minimisation.py branches/relax_disp/user_functions/model_selection.py branches/relax_disp/user_functions/molecule.py branches/relax_disp/user_functions/molmol.py branches/relax_disp/user_functions/monte_carlo.py branches/relax_disp/user_functions/n_state_model.py branches/relax_disp/user_functions/noe.py branches/relax_disp/user_functions/palmer.py branches/relax_disp/user_functions/paramag.py [... 814 lines stripped ...]