Author: bugman
Date: Fri Jul 25 11:43:49 2014
New Revision: 24738
URL: http://svn.gna.org/viewcvs/relax?rev=24738&view=rev
Log:
Merged revisions 24736-24737 via svnmerge from
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk
........
r24736 | bugman | 2014-07-25 11:20:21 +0200 (Fri, 25 Jul 2014) | 5 lines
Clean up of the dep_check module - all imported and unused modules are now
deleted as well.
This cleans up the module namespace of the unused imports.
........
r24737 | bugman | 2014-07-25 11:39:25 +0200 (Fri, 25 Jul 2014) | 5 lines
Removal of all unused imports.
These were identified using the devel_scripts/find_unused_imports.py script.
........
Modified:
branches/frame_order_cleanup/ (props changed)
branches/frame_order_cleanup/dep_check.py
branches/frame_order_cleanup/graphics/misc/Rosenbrock_function/generate.py
branches/frame_order_cleanup/specific_analyses/api_common.py
branches/frame_order_cleanup/specific_analyses/frame_order/parameters.py
branches/frame_order_cleanup/specific_analyses/model_free/optimisation.py
branches/frame_order_cleanup/specific_analyses/model_free/parameters.py
branches/frame_order_cleanup/specific_analyses/n_state_model/api.py
branches/frame_order_cleanup/specific_analyses/n_state_model/parameters.py
branches/frame_order_cleanup/specific_analyses/relax_disp/optimisation.py
branches/frame_order_cleanup/specific_analyses/relax_disp/parameters.py
branches/frame_order_cleanup/specific_analyses/relax_fit/api.py
branches/frame_order_cleanup/specific_analyses/relax_fit/optimisation.py
branches/frame_order_cleanup/specific_analyses/relax_fit/parameters.py
Propchange: branches/frame_order_cleanup/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Jul 25 11:43:49 2014
@@ -1 +1 @@
-/trunk:1-24729
+/trunk:1-24737
Modified: branches/frame_order_cleanup/dep_check.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/dep_check.py?rev=24738&r1=24737&r2=24738&view=diff
==============================================================================
--- branches/frame_order_cleanup/dep_check.py (original)
+++ branches/frame_order_cleanup/dep_check.py Fri Jul 25 11:43:49 2014
@@ -40,6 +40,7 @@
if float(numpy.version.version[:3]) < 1.6:
sys.stderr.write("Version %s of the 'numpy' dependency is not
supported, numpy >= 1.6 is required.\n" % numpy.version.version)
sys.exit()
+ del numpy
except ImportError:
sys.stderr.write("The dependency 'numpy' has not been installed.\n")
sys.exit()
@@ -47,6 +48,7 @@
# Command line option parser.
try:
import optparse
+ del optparse
except ImportError:
sys.stderr.write("The dependency 'Optik' has not been installed.\n")
sys.exit()
@@ -54,6 +56,7 @@
# Minfx python package check.
try:
import minfx
+ del minfx
except ImportError:
sys.stderr.write("The dependency 'minfx' has not been installed (see
https://gna.org/projects/minfx/).\n")
sys.exit()
@@ -63,6 +66,7 @@
# Bmrblib python package check.
try:
import bmrblib
+ del bmrblib
bmrblib_module = True
except ImportError:
bmrblib_module = False
@@ -70,6 +74,7 @@
# wx module.
try:
import wx
+ del wx
wx_module = True
except ImportError:
wx_module = False
@@ -79,6 +84,7 @@
# epydoc module.
try:
import epydoc
+ del epydoc
epydoc_module = True
except ImportError:
epydoc_module = False
@@ -89,6 +95,8 @@
if 'TERM' in os.environ and os.environ['TERM'] == 'xterm':
os.environ['TERM'] = 'linux'
import readline
+ del os
+ del readline
readline_module = True
except ImportError:
readline_module = False
@@ -96,6 +104,7 @@
# matplotlib module.
try:
import matplotlib
+ del matplotlib
matplotlib_module = True
except ImportError:
matplotlib_module = False
@@ -103,6 +112,7 @@
# runpy module.
try:
import runpy
+ del runpy
runpy_module = True
except ImportError:
runpy_module = False
@@ -110,6 +120,7 @@
# profile module (python development packages required).
try:
import profile
+ del profile
profile_module = True
except ImportError:
profile_module = False
@@ -117,6 +128,7 @@
# profile C module (python development packages required).
try:
import cProfile
+ del cProfile
cprofile_module = True
except ImportError:
cprofile_module = False
@@ -124,6 +136,7 @@
# BZ2 compression module.
try:
import bz2
+ del bz2
bz2_module = True
except ImportError:
message = sys.exc_info()[1]
@@ -133,6 +146,7 @@
# Gzip compression module.
try:
import gzip
+ del gzip
gzip_module = True
except ImportError:
message = sys.exc_info()[1]
@@ -142,6 +156,7 @@
# IO module.
try:
import io
+ del io
io_module = True
except ImportError:
message = sys.exc_info()[1]
@@ -151,6 +166,7 @@
# Scipy import.
try:
import scipy
+ del scipy
scipy_module = True
except:
scipy_module = False
@@ -166,6 +182,7 @@
# mpi4py.
try:
import mpi4py
+ del mpi4py
mpi4py_module = True
except ImportError:
message = sys.exc_info()[1]
@@ -184,6 +201,7 @@
# PyMOL.
try:
import pymol
+ del pymol
pymol_module = True
except ImportError:
message = sys.exc_info()[1]
@@ -207,10 +225,12 @@
else:
xml_version = ''
xml_type = ''
+ del xml
# subprocess module.
try:
import subprocess
+ del subprocess
subprocess_module = True
except ImportError:
message = sys.exc_info()[1]
@@ -220,6 +240,7 @@
# ctypes module.
try:
import ctypes
+ del ctypes
ctypes_module = True
except ImportError:
message = sys.exc_info()[1]
@@ -227,6 +248,7 @@
ctypes_module_message = message.args[0]
try:
from ctypes import Structure
+ del Structure
ctypes_structure_module = True
except ImportError:
message = sys.exc_info()[1]
@@ -243,6 +265,7 @@
try:
from target_functions import relax_fit
from target_functions.relax_fit import setup
+ del relax_fit
del setup
C_module_exp_fn = True
except ImportError:
Modified:
branches/frame_order_cleanup/graphics/misc/Rosenbrock_function/generate.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/graphics/misc/Rosenbrock_function/generate.py?rev=24738&r1=24737&r2=24738&view=diff
==============================================================================
---
branches/frame_order_cleanup/graphics/misc/Rosenbrock_function/generate.py
(original)
+++
branches/frame_order_cleanup/graphics/misc/Rosenbrock_function/generate.py
Fri Jul 25 11:43:49 2014
@@ -1,7 +1,6 @@
# This script generates an SVG file showing the Rosenbrock function.
# The code originates from the public domain code at
http://commons.wikimedia.org/wiki/File:Rosenbrock_function.svg.
-from mpl_toolkits.mplot3d import Axes3D
from matplotlib import cm
from matplotlib.colors import LogNorm
import matplotlib.pyplot as plt
Modified: branches/frame_order_cleanup/specific_analyses/api_common.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/specific_analyses/api_common.py?rev=24738&r1=24737&r2=24738&view=diff
==============================================================================
--- branches/frame_order_cleanup/specific_analyses/api_common.py
(original)
+++ branches/frame_order_cleanup/specific_analyses/api_common.py Fri
Jul 25 11:43:49 2014
@@ -28,7 +28,6 @@
import sys
# relax module imports.
-from data_store.mol_res_spin import SpinContainer
import lib.arg_check
from lib.errors import RelaxError, RelaxNoSequenceError
from lib.text.sectioning import subsection
Modified:
branches/frame_order_cleanup/specific_analyses/frame_order/parameters.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/specific_analyses/frame_order/parameters.py?rev=24738&r1=24737&r2=24738&view=diff
==============================================================================
--- branches/frame_order_cleanup/specific_analyses/frame_order/parameters.py
(original)
+++ branches/frame_order_cleanup/specific_analyses/frame_order/parameters.py
Fri Jul 25 11:43:49 2014
@@ -24,7 +24,7 @@
# Python module imports.
from math import pi
-from numpy import array, float64, identity, zeros
+from numpy import array, float64, zeros
# relax module imports.
from specific_analyses.frame_order.data import pivot_fixed
Modified:
branches/frame_order_cleanup/specific_analyses/model_free/optimisation.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/specific_analyses/model_free/optimisation.py?rev=24738&r1=24737&r2=24738&view=diff
==============================================================================
--- branches/frame_order_cleanup/specific_analyses/model_free/optimisation.py
(original)
+++ branches/frame_order_cleanup/specific_analyses/model_free/optimisation.py
Fri Jul 25 11:43:49 2014
@@ -24,11 +24,9 @@
"""The model-free analysis optimisation functions."""
# Python module imports.
-from math import pi
from minfx.generic import generic_minimise
from minfx.grid import grid, grid_point_array
from numpy import array, dot, float64
-from re import match
# relax module imports.
import lib.arg_check
@@ -39,7 +37,6 @@
from pipe_control import pipes
from pipe_control.interatomic import return_interatom_list
from pipe_control.mol_res_spin import return_spin, return_spin_from_index,
spin_loop
-from specific_analyses.model_free.model import determine_model_type
from specific_analyses.model_free.parameters import assemble_param_vector,
disassemble_param_vector
from target_functions.mf import Mf
Modified:
branches/frame_order_cleanup/specific_analyses/model_free/parameters.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/specific_analyses/model_free/parameters.py?rev=24738&r1=24737&r2=24738&view=diff
==============================================================================
--- branches/frame_order_cleanup/specific_analyses/model_free/parameters.py
(original)
+++ branches/frame_order_cleanup/specific_analyses/model_free/parameters.py
Fri Jul 25 11:43:49 2014
@@ -24,8 +24,8 @@
# Python module imports.
from math import pi
-from numpy import array, float64, identity, int8, zeros
-from re import match, search
+from numpy import array, float64, int8, zeros
+from re import match
# relax module imports.
from lib.errors import RelaxError
Modified: branches/frame_order_cleanup/specific_analyses/n_state_model/api.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/specific_analyses/n_state_model/api.py?rev=24738&r1=24737&r2=24738&view=diff
==============================================================================
--- branches/frame_order_cleanup/specific_analyses/n_state_model/api.py
(original)
+++ branches/frame_order_cleanup/specific_analyses/n_state_model/api.py Fri
Jul 25 11:43:49 2014
@@ -24,7 +24,6 @@
# Python module imports.
from copy import deepcopy
-from math import pi
from minfx.generic import generic_minimise
from minfx.grid import grid
from numpy import dot, float64, zeros
Modified:
branches/frame_order_cleanup/specific_analyses/n_state_model/parameters.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/specific_analyses/n_state_model/parameters.py?rev=24738&r1=24737&r2=24738&view=diff
==============================================================================
---
branches/frame_order_cleanup/specific_analyses/n_state_model/parameters.py
(original)
+++
branches/frame_order_cleanup/specific_analyses/n_state_model/parameters.py
Fri Jul 25 11:43:49 2014
@@ -23,7 +23,7 @@
"""The N-state model or structural ensemble analysis parameter handling."""
# Python module imports.
-from numpy import array, float64, identity, zeros
+from numpy import array, float64, zeros
from re import search
from warnings import warn
Modified:
branches/frame_order_cleanup/specific_analyses/relax_disp/optimisation.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/specific_analyses/relax_disp/optimisation.py?rev=24738&r1=24737&r2=24738&view=diff
==============================================================================
--- branches/frame_order_cleanup/specific_analyses/relax_disp/optimisation.py
(original)
+++ branches/frame_order_cleanup/specific_analyses/relax_disp/optimisation.py
Fri Jul 25 11:43:49 2014
@@ -25,7 +25,7 @@
# Python module imports.
from minfx.generic import generic_minimise
from minfx.grid import grid
-from numpy import dot, eye, float64, int32, ones, zeros
+from numpy import dot, float64, int32, ones, zeros
from numpy.linalg import inv
from operator import mul
from re import match, search
@@ -33,7 +33,6 @@
# relax module imports.
from dep_check import C_module_exp_fn
-from lib.check_types import is_float
from lib.dispersion.two_point import calc_two_point_r2eff,
calc_two_point_r2eff_err
from lib.errors import RelaxError
from lib.text.sectioning import subsection
@@ -41,8 +40,8 @@
from pipe_control.mol_res_spin import spin_loop
from specific_analyses.relax_disp.checks import check_disp_points,
check_exp_type, check_exp_type_fixed_time
from specific_analyses.relax_disp.data import average_intensity,
count_spins, find_intensity_keys, has_exponential_exp_type,
has_proton_mmq_cpmg, loop_exp, loop_exp_frq_offset_point,
loop_exp_frq_offset_point_time, loop_frq, loop_offset, loop_time,
pack_back_calc_r2eff, return_cpmg_frqs, return_offset_data,
return_param_key_from_data, return_r1_data, return_r2eff_arrays,
return_spin_lock_nu1
-from specific_analyses.relax_disp.parameters import assemble_param_vector,
disassemble_param_vector, linear_constraints, loop_parameters,
param_conversion, param_num
-from specific_analyses.relax_disp.variables import EXP_TYPE_LIST_CPMG,
MODEL_CR72, MODEL_CR72_FULL, MODEL_LIST_MMQ, MODEL_LM63, MODEL_M61,
MODEL_M61B, MODEL_MP05, MODEL_TAP03, MODEL_TP02
+from specific_analyses.relax_disp.parameters import assemble_param_vector,
disassemble_param_vector, linear_constraints, param_conversion, param_num
+from specific_analyses.relax_disp.variables import EXP_TYPE_LIST_CPMG,
MODEL_CR72, MODEL_CR72_FULL, MODEL_LIST_MMQ, MODEL_LM63, MODEL_M61,
MODEL_MP05, MODEL_TAP03, MODEL_TP02
from target_functions.relax_disp import Dispersion
# C modules.
Modified:
branches/frame_order_cleanup/specific_analyses/relax_disp/parameters.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/specific_analyses/relax_disp/parameters.py?rev=24738&r1=24737&r2=24738&view=diff
==============================================================================
--- branches/frame_order_cleanup/specific_analyses/relax_disp/parameters.py
(original)
+++ branches/frame_order_cleanup/specific_analyses/relax_disp/parameters.py
Fri Jul 25 11:43:49 2014
@@ -25,7 +25,7 @@
# Python module imports.
from copy import deepcopy
-from numpy import array, float64, identity, median, zeros
+from numpy import array, float64, median, zeros
import sys
# relax module imports.
Modified: branches/frame_order_cleanup/specific_analyses/relax_fit/api.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/specific_analyses/relax_fit/api.py?rev=24738&r1=24737&r2=24738&view=diff
==============================================================================
--- branches/frame_order_cleanup/specific_analyses/relax_fit/api.py
(original)
+++ branches/frame_order_cleanup/specific_analyses/relax_fit/api.py Fri
Jul 25 11:43:49 2014
@@ -34,7 +34,7 @@
from dep_check import C_module_exp_fn
from lib.errors import RelaxError, RelaxNoModelError, RelaxNoSequenceError
from lib.warnings import RelaxDeselectWarning
-from pipe_control.mol_res_spin import exists_mol_res_spin_data,
generate_spin_id_unique, return_spin, spin_loop
+from pipe_control.mol_res_spin import exists_mol_res_spin_data, return_spin,
spin_loop
from specific_analyses.api_base import API_base
from specific_analyses.api_common import API_common
from specific_analyses.relax_fit.optimisation import back_calc,
d2func_wrapper, dfunc_wrapper, func_wrapper
Modified:
branches/frame_order_cleanup/specific_analyses/relax_fit/optimisation.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/specific_analyses/relax_fit/optimisation.py?rev=24738&r1=24737&r2=24738&view=diff
==============================================================================
--- branches/frame_order_cleanup/specific_analyses/relax_fit/optimisation.py
(original)
+++ branches/frame_order_cleanup/specific_analyses/relax_fit/optimisation.py
Fri Jul 25 11:43:49 2014
@@ -22,13 +22,8 @@
# Module docstring.
"""The R1 and R2 exponential relaxation curve fitting optimisation
functions."""
-# Python module imports.
-from numpy import average
-from re import search
-
# relax module imports.
from dep_check import C_module_exp_fn
-from lib.errors import RelaxError, RelaxLenError
from specific_analyses.relax_fit.parameters import assemble_param_vector
# C modules.
Modified:
branches/frame_order_cleanup/specific_analyses/relax_fit/parameters.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/specific_analyses/relax_fit/parameters.py?rev=24738&r1=24737&r2=24738&view=diff
==============================================================================
--- branches/frame_order_cleanup/specific_analyses/relax_fit/parameters.py
(original)
+++ branches/frame_order_cleanup/specific_analyses/relax_fit/parameters.py
Fri Jul 25 11:43:49 2014
@@ -23,11 +23,8 @@
"""The R1 and R2 exponential relaxation curve fitting parameter functions."""
# Python module imports.
-from numpy import array, float64, identity, zeros
+from numpy import array, float64, zeros
from re import search
-
-# relax module imports.
-from lib.mathematics import round_to_next_order
def assemble_param_vector(spin=None, sim_index=None):
r24738 - in /branches/frame_order_cleanup: ./ graphics/misc/Rosenbrock_function/ specific_analyses/ specific_analyses/frame_...