Author: bugman
Date: Sun Jun 16 14:56:07 2013
New Revision: 20149
URL: http://svn.gna.org/viewcvs/relax?rev=20149&view=rev
Log:
Merged revisions 20146-20148 via svnmerge from
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk
........
r20146 | bugman | 2013-06-16 14:31:51 +0200 (Sun, 16 Jun 2013) | 3 lines
Improvements to the devel_scripts/find_unused_imports.py script.
........
r20147 | bugman | 2013-06-16 14:35:38 +0200 (Sun, 16 Jun 2013) | 3 lines
More cleanups of unused imports throughout relax.
........
r20148 | bugman | 2013-06-16 14:50:12 +0200 (Sun, 16 Jun 2013) | 3 lines
Fixes for how the devel_scripts/find_unused_imports.py script runs pylint.
........
Modified:
branches/relax_disp/ (props changed)
branches/relax_disp/devel_scripts/find_unused_imports.py
branches/relax_disp/gui/spin_viewer/containers.py
branches/relax_disp/gui/wizards/peak_intensity.py
branches/relax_disp/info.py
branches/relax_disp/setup.py
branches/relax_disp/target_functions/mf.py
branches/relax_disp/target_functions/n_state_model.py
Propchange: branches/relax_disp/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Sun Jun 16 14:56:07 2013
@@ -1,1 +1,1 @@
-/trunk:1-20144
+/trunk:1-20148
Modified: branches/relax_disp/devel_scripts/find_unused_imports.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/devel_scripts/find_unused_imports.py?rev=20149&r1=20148&r2=20149&view=diff
==============================================================================
--- branches/relax_disp/devel_scripts/find_unused_imports.py (original)
+++ branches/relax_disp/devel_scripts/find_unused_imports.py Sun Jun 16
14:56:07 2013
@@ -3,13 +3,18 @@
"""Find all unused imports within all relax *.py files using the pylint
program."""
# Python module imports.
-from os import getcwd, path, waitpid, sep, walk
+from os import getcwd, path, sep, walk
from re import search
from subprocess import PIPE, Popen
+import sys
# Walk through the current dir.
for root, dirs, files in walk(getcwd()):
+ # Skip SVN directories.
+ if search("svn", root):
+ continue
+
# Loop over the files.
for file in files:
# Only check Python files.
@@ -18,18 +23,18 @@
# Full path to the file.
path = root + sep + file
+ sys.stdout.write("File %s:\n" % path)
# The command.
cmd = 'pylint %s' % path
# Execute.
- pipe = Popen(cmd, shell=True, stdout=PIPE, close_fds=False)
- waitpid(pipe.pid, 0)
+ pipe = Popen(cmd, shell=True, stdin=PIPE, stdout=PIPE, stderr=PIPE,
close_fds=False)
- # The STDOUT data.
- data = pipe.stdout.readlines()
+ # Close the pipe.
+ pipe.stdin.close()
# Only display the import information.
- for line in data:
+ for line in pipe.stdout.readlines():
if search("Unused import", line):
- print("File: %s; %s" % (path, line[:-1]))
+ sys.stdout.write(" %s\n" % line[:-1])
Modified: branches/relax_disp/gui/spin_viewer/containers.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/gui/spin_viewer/containers.py?rev=20149&r1=20148&r2=20149&view=diff
==============================================================================
--- branches/relax_disp/gui/spin_viewer/containers.py (original)
+++ branches/relax_disp/gui/spin_viewer/containers.py Sun Jun 16 14:56:07 2013
@@ -32,7 +32,6 @@
from pipe_control.mol_res_spin import return_spin
# GUI module imports.
-from gui import paths
from gui.misc import bitmap_setup
from gui.string_conv import str_to_gui
Modified: branches/relax_disp/gui/wizards/peak_intensity.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/gui/wizards/peak_intensity.py?rev=20149&r1=20148&r2=20149&view=diff
==============================================================================
--- branches/relax_disp/gui/wizards/peak_intensity.py (original)
+++ branches/relax_disp/gui/wizards/peak_intensity.py Sun Jun 16 14:56:07 2013
@@ -37,7 +37,6 @@
from gui.fonts import font
from gui.message import Question
from gui.misc import format_table
-from gui import paths
from gui.string_conv import gui_to_str
from gui.uf_objects import Uf_storage; uf_store = Uf_storage()
from gui.wizards.wiz_objects import Wiz_page, Wiz_window
Modified: branches/relax_disp/info.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/info.py?rev=20149&r1=20148&r2=20149&view=diff
==============================================================================
--- branches/relax_disp/info.py (original)
+++ branches/relax_disp/info.py Sun Jun 16 14:56:07 2013
@@ -36,7 +36,6 @@
from ctypes import Structure
else:
Structure = object
-import numpy
from os import environ, waitpid
import platform
PIPE, Popen = None, None
Modified: branches/relax_disp/setup.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/setup.py?rev=20149&r1=20148&r2=20149&view=diff
==============================================================================
--- branches/relax_disp/setup.py (original)
+++ branches/relax_disp/setup.py Sun Jun 16 14:56:07 2013
@@ -35,7 +35,7 @@
"""
# Python module import.
-from os import getcwd, listdir, sep, walk
+from os import getcwd, sep, walk
from os.path import relpath, sep
from re import search
try:
Modified: branches/relax_disp/target_functions/mf.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/target_functions/mf.py?rev=20149&r1=20148&r2=20149&view=diff
==============================================================================
--- branches/relax_disp/target_functions/mf.py (original)
+++ branches/relax_disp/target_functions/mf.py Sun Jun 16 14:56:07 2013
@@ -34,8 +34,7 @@
from lib.diffusion.weights import calc_sphere_ci, calc_spheroid_ci,
calc_spheroid_dci, calc_spheroid_d2ci, calc_ellipsoid_ci, calc_ellipsoid_dci,
calc_ellipsoid_d2ci
from lib.spectral_densities.model_free import calc_jw, calc_S2_jw,
calc_S2_te_jw, calc_S2f_S2_ts_jw, calc_S2f_tf_S2_ts_jw, calc_S2f_S2s_ts_jw,
calc_S2f_tf_S2s_ts_jw, calc_diff_djw_dGj, calc_ellipsoid_djw_dGj,
calc_diff_S2_djw_dGj, calc_ellipsoid_S2_djw_dGj, calc_diff_S2_te_djw_dGj,
calc_ellipsoid_S2_te_djw_dGj, calc_diff_djw_dOj, calc_diff_S2_djw_dOj,
calc_diff_S2_te_djw_dOj, calc_S2_djw_dS2, calc_S2_te_djw_dS2,
calc_S2_te_djw_dte, calc_diff_S2f_S2_ts_djw_dGj,
calc_ellipsoid_S2f_S2_ts_djw_dGj, calc_diff_S2f_tf_S2_ts_djw_dGj,
calc_ellipsoid_S2f_tf_S2_ts_djw_dGj, calc_diff_S2f_S2_ts_djw_dOj,
calc_diff_S2f_tf_S2_ts_djw_dOj, calc_S2f_S2_ts_djw_dS2,
calc_S2f_S2_ts_djw_dS2f, calc_S2f_tf_S2_ts_djw_dS2f,
calc_S2f_tf_S2_ts_djw_dtf, calc_S2f_S2_ts_djw_dts,
calc_diff_S2f_S2s_ts_djw_dGj, calc_ellipsoid_S2f_S2s_ts_djw_dGj,
calc_diff_S2f_tf_S2s_ts_djw_dGj, calc_ellipsoid_S2f_tf_S2s_ts_djw_dGj,
calc_diff_S2f_S2s_ts_djw_dOj, calc_diff_S2f_tf_S2s_ts_djw_dOj,
calc_S2f_S2s_ts_djw_dS2f, calc_S2f_tf_S2s_ts_djw_dS2f,
calc_S2f_tf_S2s_ts_djw_dS2s, calc_S2f_tf_S2s_ts_djw_dtf,
calc_S2f_S2s_ts_djw_dts, calc_diff_d2jw_dGjdGk, calc_ellipsoid_d2jw_dGjdGk,
calc_diff_S2_d2jw_dGjdGk, calc_ellipsoid_S2_d2jw_dGjdGk,
calc_diff_S2_te_d2jw_dGjdGk, calc_ellipsoid_S2_te_d2jw_dGjdGk,
calc_diff_d2jw_dGjdOj, calc_ellipsoid_d2jw_dGjdOj, calc_diff_S2_d2jw_dGjdOj,
calc_ellipsoid_S2_d2jw_dGjdOj, calc_diff_S2_te_d2jw_dGjdOj,
calc_ellipsoid_S2_te_d2jw_dGjdOj, calc_diff_S2_d2jw_dGjdS2,
calc_ellipsoid_S2_d2jw_dGjdS2, calc_diff_S2_te_d2jw_dGjdS2,
calc_ellipsoid_S2_te_d2jw_dGjdS2, calc_diff_S2_te_d2jw_dGjdte,
calc_ellipsoid_S2_te_d2jw_dGjdte, calc_diff_d2jw_dOjdOk,
calc_diff_S2_d2jw_dOjdOk, calc_diff_S2_te_d2jw_dOjdOk,
calc_diff_S2_d2jw_dOjdS2, calc_diff_S2_te_d2jw_dOjdS2,
calc_diff_S2_te_d2jw_dOjdte, calc_S2_te_d2jw_dS2dte, calc_S2_te_d2jw_dte2,
calc_diff_S2f_S2_ts_d2jw_dGjdGk, calc_ellipsoid_S2f_S2_ts_d2jw_dGjdGk,
calc_diff_S2f_tf_S2_ts_d2jw_dGjdGk, calc_ellipsoid_S2f_tf_S2_ts_d2jw_dGjdGk,
calc_diff_S2f_S2_ts_d2jw_dGjdOj, calc_ellipsoid_S2f_S2_ts_d2jw_dGjdOj,
calc_diff_S2f_tf_S2_ts_d2jw_dGjdOj, calc_ellipsoid_S2f_tf_S2_ts_d2jw_dGjdOj,
calc_diff_S2f_S2_ts_d2jw_dGjdS2, calc_ellipsoid_S2f_S2_ts_d2jw_dGjdS2,
calc_diff_S2f_S2_ts_d2jw_dGjdS2f, calc_ellipsoid_S2f_S2_ts_d2jw_dGjdS2f,
calc_diff_S2f_tf_S2_ts_d2jw_dGjdS2f,
calc_ellipsoid_S2f_tf_S2_ts_d2jw_dGjdS2f, calc_diff_S2f_tf_S2_ts_d2jw_dGjdtf,
calc_ellipsoid_S2f_tf_S2_ts_d2jw_dGjdtf, calc_diff_S2f_S2_ts_d2jw_dGjdts,
calc_ellipsoid_S2f_S2_ts_d2jw_dGjdts, calc_diff_S2f_S2_ts_d2jw_dOjdOk,
calc_diff_S2f_tf_S2_ts_d2jw_dOjdOk, calc_diff_S2f_S2_ts_d2jw_dOjdS2,
calc_diff_S2f_S2_ts_d2jw_dOjdS2f, calc_diff_S2f_tf_S2_ts_d2jw_dOjdS2f,
calc_diff_S2f_tf_S2_ts_d2jw_dOjdtf, calc_diff_S2f_S2_ts_d2jw_dOjdts,
calc_S2f_S2_ts_d2jw_dS2dts, calc_S2f_tf_S2_ts_d2jw_dS2fdtf,
calc_S2f_S2_ts_d2jw_dS2fdts, calc_S2f_tf_S2_ts_d2jw_dtf2,
calc_S2f_S2_ts_d2jw_dts2, calc_diff_S2f_S2s_ts_d2jw_dGjdGk,
calc_ellipsoid_S2f_S2s_ts_d2jw_dGjdGk, calc_diff_S2f_tf_S2s_ts_d2jw_dGjdGk,
calc_ellipsoid_S2f_tf_S2s_ts_d2jw_dGjdGk, calc_diff_S2f_S2s_ts_d2jw_dGjdOj,
calc_ellipsoid_S2f_S2s_ts_d2jw_dGjdOj, calc_diff_S2f_tf_S2s_ts_d2jw_dGjdOj,
calc_ellipsoid_S2f_tf_S2s_ts_d2jw_dGjdOj, calc_diff_S2f_S2s_ts_d2jw_dGjdS2f,
calc_ellipsoid_S2f_S2s_ts_d2jw_dGjdS2f, calc_diff_S2f_tf_S2s_ts_d2jw_dGjdS2f,
calc_ellipsoid_S2f_tf_S2s_ts_d2jw_dGjdS2f, calc_diff_S2f_S2s_ts_d2jw_dGjdS2s,
calc_ellipsoid_S2f_S2s_ts_d2jw_dGjdS2s, calc_diff_S2f_tf_S2s_ts_d2jw_dGjdtf,
calc_ellipsoid_S2f_tf_S2s_ts_d2jw_dGjdtf, calc_diff_S2f_S2s_ts_d2jw_dGjdts,
calc_ellipsoid_S2f_S2s_ts_d2jw_dGjdts, calc_diff_S2f_S2s_ts_d2jw_dOjdOk,
calc_diff_S2f_tf_S2s_ts_d2jw_dOjdOk, calc_diff_S2f_S2s_ts_d2jw_dOjdS2f,
calc_diff_S2f_tf_S2s_ts_d2jw_dOjdS2f, calc_diff_S2f_tf_S2s_ts_d2jw_dOjdtf,
calc_diff_S2f_S2s_ts_d2jw_dOjdts, calc_S2f_S2s_ts_d2jw_dS2fdS2s,
calc_S2f_tf_S2s_ts_d2jw_dS2fdtf, calc_S2f_S2s_ts_d2jw_dS2fdts,
calc_S2f_S2s_ts_d2jw_dS2sdts, calc_S2f_tf_S2s_ts_d2jw_dtf2,
calc_S2f_S2s_ts_d2jw_dts2
from lib.spectral_densities.model_free_components import
calc_S2_te_jw_comps, calc_S2f_S2_ts_jw_comps, calc_S2f_S2s_ts_jw_comps,
calc_S2f_tf_S2_ts_jw_comps, calc_S2f_tf_S2s_ts_jw_comps, calc_diff_djw_comps,
calc_S2_te_djw_comps, calc_diff_S2_te_djw_comps, calc_S2f_S2_ts_djw_comps,
calc_diff_S2f_S2_ts_djw_comps, calc_S2f_tf_S2_ts_djw_comps,
calc_diff_S2f_tf_S2_ts_djw_comps, calc_S2f_S2s_ts_djw_comps,
calc_diff_S2f_S2s_ts_djw_comps, calc_S2f_tf_S2s_ts_djw_comps,
calc_diff_S2f_tf_S2s_ts_djw_comps
-
-from target_functions.chi2 import *
+from target_functions.chi2 import chi2, dchi2_element, d2chi2_element
class Mf:
Modified: branches/relax_disp/target_functions/n_state_model.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/target_functions/n_state_model.py?rev=20149&r1=20148&r2=20149&view=diff
==============================================================================
--- branches/relax_disp/target_functions/n_state_model.py (original)
+++ branches/relax_disp/target_functions/n_state_model.py Sun Jun 16 14:56:07
2013
@@ -29,7 +29,7 @@
from lib.alignment.paramag_centre import vectors_single_centre,
vectors_centre_per_state
from lib.alignment.pcs import ave_pcs_tensor, ave_pcs_tensor_ddeltaij_dAmn,
ave_pcs_tensor_ddeltaij_dc, pcs_constant_grad, pcs_tensor
from lib.alignment.rdc import ave_rdc_tensor, ave_rdc_tensor_dDij_dAmn,
rdc_tensor
-from lib.errors import RelaxError, RelaxImplementError
+from lib.errors import RelaxError
from lib.float import isNaN
from lib.geometry.rotations import euler_to_R_zyz
from lib.physical_constants import pcs_constant
r20149 - in /branches/relax_disp: ./ devel_scripts/ gui/spin_viewer/ gui/wizards/ target_functions/