Author: tlinnet
Date: Mon Aug 25 12:31:52 2014
New Revision: 25242
URL: http://svn.gna.org/viewcvs/relax?rev=25242&view=rev
Log:
Re-used the dependency check "scipy_module", since leastsq() has been part of
Scipy since 2003.
Modified:
trunk/dep_check.py
trunk/specific_analyses/relax_disp/optimisation.py
trunk/test_suite/system_tests/relax_disp.py
Modified: trunk/dep_check.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/dep_check.py?rev=25242&r1=25241&r2=25242&view=diff
==============================================================================
--- trunk/dep_check.py (original)
+++ trunk/dep_check.py Mon Aug 25 12:31:52 2014
@@ -158,13 +158,6 @@
scipy_module = True
except:
scipy_module = False
-
-# scipy.optimize.leastsq import.
-try:
- from scipy.optimize import leastsq
- scipy_leastsq = True
-except:
- scipy_leastsq = False
# VMD module imports.
try:
Modified: trunk/specific_analyses/relax_disp/optimisation.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/specific_analyses/relax_disp/optimisation.py?rev=25242&r1=25241&r2=25242&view=diff
==============================================================================
--- trunk/specific_analyses/relax_disp/optimisation.py (original)
+++ trunk/specific_analyses/relax_disp/optimisation.py Mon Aug 25 12:31:52 2014
@@ -34,7 +34,7 @@
from warnings import warn
# relax module imports.
-from dep_check import C_module_exp_fn, scipy_leastsq
+from dep_check import C_module_exp_fn, scipy_module
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 section
@@ -324,8 +324,8 @@
"""
# Check that scipy.optimize.leastsq is available.
- if not scipy_leastsq:
- raise RelaxError("scipy.optimize.leastsq module is not available.")
+ if not scipy_module:
+ raise RelaxError("scipy module is not available.")
# Perform checks.
check_model_type(model=MODEL_R2EFF)
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=25242&r1=25241&r2=25242&view=diff
==============================================================================
--- trunk/test_suite/system_tests/relax_disp.py (original)
+++ trunk/test_suite/system_tests/relax_disp.py Mon Aug 25 12:31:52 2014
@@ -74,7 +74,7 @@
status.skipped_tests.append([methodName, 'Relax curve-fitting
C module', self._skip_type])
# If not scipy.optimize.leastsq.
- if not dep_check.scipy_leastsq:
+ if not dep_check.scipy_module:
# The list of tests to skip.
to_skip = [
"test_estimate_r2eff",
_______________________________________________
relax (http://www.nmr-relax.com)
This is the relax-commits mailing list
[email protected]
To unsubscribe from this list, get a password
reminder, or change your subscription options,
visit the list information page at
https://mail.gna.org/listinfo/relax-commits
