Author: bugman
Date: Fri Oct 16 15:51:51 2015
New Revision: 28063
URL: http://svn.gna.org/viewcvs/relax?rev=28063&view=rev
Log:
Updated all of relax to protect against future changes occurring in the numpy
Python package.
From numpy version 1.9, the FutureWarning "__main__:1: FutureWarning:
comparison to `None` will
result in an elementwise object comparison in the future." is seen in a large
percentage of all
relax's user functions. This is caught and turned into a RelaxWarning with the
same message.
The issue is that the behaviour of the comparison operators '==' and '!=' will
change with future
numpy versions. These have been replaced with 'is' and 'is not' throughout the
relax code base.
Changes have also been made to the minfx and bmrblib packages to match.
Modified:
trunk/data_store/align_tensor.py
trunk/data_store/diff_tensor.py
trunk/lib/alignment/pcs.py
trunk/lib/alignment/rdc.py
trunk/lib/arg_check.py
trunk/lib/structure/represent/cone.py
trunk/lib/structure/superimpose.py
trunk/lib/xml.py
trunk/pipe_control/eliminate.py
trunk/pipe_control/interatomic.py
trunk/pipe_control/mol_res_spin.py
trunk/pipe_control/paramag.py
trunk/pipe_control/rdc.py
trunk/pipe_control/structure/main.py
trunk/specific_analyses/frame_order/api.py
trunk/specific_analyses/frame_order/data.py
trunk/specific_analyses/frame_order/optimisation.py
trunk/specific_analyses/frame_order/uf.py
trunk/specific_analyses/model_free/api.py
trunk/specific_analyses/model_free/optimisation.py
trunk/specific_analyses/n_state_model/api.py
trunk/specific_analyses/n_state_model/optimisation.py
trunk/specific_analyses/n_state_model/parameters.py
trunk/specific_analyses/relax_disp/optimisation.py
trunk/specific_analyses/relax_fit/api.py
trunk/target_functions/frame_order.py
trunk/target_functions/mf.py
trunk/target_functions/n_state_model.py
trunk/target_functions/relax_disp.py
trunk/test_suite/system_tests/frame_order.py
trunk/test_suite/system_tests/unit_vectors.py
[This mail would be too long, it was shortened to contain the URLs only.]
Modified: trunk/data_store/align_tensor.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/data_store/align_tensor.py?rev=28063&r1=28062&r2=28063&view=diff
Modified: trunk/data_store/diff_tensor.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/data_store/diff_tensor.py?rev=28063&r1=28062&r2=28063&view=diff
Modified: trunk/lib/alignment/pcs.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/lib/alignment/pcs.py?rev=28063&r1=28062&r2=28063&view=diff
Modified: trunk/lib/alignment/rdc.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/lib/alignment/rdc.py?rev=28063&r1=28062&r2=28063&view=diff
Modified: trunk/lib/arg_check.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/lib/arg_check.py?rev=28063&r1=28062&r2=28063&view=diff
Modified: trunk/lib/structure/represent/cone.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/lib/structure/represent/cone.py?rev=28063&r1=28062&r2=28063&view=diff
Modified: trunk/lib/structure/superimpose.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/lib/structure/superimpose.py?rev=28063&r1=28062&r2=28063&view=diff
Modified: trunk/lib/xml.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/lib/xml.py?rev=28063&r1=28062&r2=28063&view=diff
Modified: trunk/pipe_control/eliminate.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/pipe_control/eliminate.py?rev=28063&r1=28062&r2=28063&view=diff
Modified: trunk/pipe_control/interatomic.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/pipe_control/interatomic.py?rev=28063&r1=28062&r2=28063&view=diff
Modified: trunk/pipe_control/mol_res_spin.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/pipe_control/mol_res_spin.py?rev=28063&r1=28062&r2=28063&view=diff
Modified: trunk/pipe_control/paramag.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/pipe_control/paramag.py?rev=28063&r1=28062&r2=28063&view=diff
Modified: trunk/pipe_control/rdc.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/pipe_control/rdc.py?rev=28063&r1=28062&r2=28063&view=diff
Modified: trunk/pipe_control/structure/main.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/pipe_control/structure/main.py?rev=28063&r1=28062&r2=28063&view=diff
Modified: trunk/specific_analyses/frame_order/api.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/specific_analyses/frame_order/api.py?rev=28063&r1=28062&r2=28063&view=diff
Modified: trunk/specific_analyses/frame_order/data.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/specific_analyses/frame_order/data.py?rev=28063&r1=28062&r2=28063&view=diff
Modified: trunk/specific_analyses/frame_order/optimisation.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/specific_analyses/frame_order/optimisation.py?rev=28063&r1=28062&r2=28063&view=diff
Modified: trunk/specific_analyses/frame_order/uf.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/specific_analyses/frame_order/uf.py?rev=28063&r1=28062&r2=28063&view=diff
Modified: trunk/specific_analyses/model_free/api.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/specific_analyses/model_free/api.py?rev=28063&r1=28062&r2=28063&view=diff
Modified: trunk/specific_analyses/model_free/optimisation.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/specific_analyses/model_free/optimisation.py?rev=28063&r1=28062&r2=28063&view=diff
Modified: trunk/specific_analyses/n_state_model/api.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/specific_analyses/n_state_model/api.py?rev=28063&r1=28062&r2=28063&view=diff
Modified: trunk/specific_analyses/n_state_model/optimisation.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/specific_analyses/n_state_model/optimisation.py?rev=28063&r1=28062&r2=28063&view=diff
Modified: trunk/specific_analyses/n_state_model/parameters.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/specific_analyses/n_state_model/parameters.py?rev=28063&r1=28062&r2=28063&view=diff
Modified: trunk/specific_analyses/relax_disp/optimisation.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/specific_analyses/relax_disp/optimisation.py?rev=28063&r1=28062&r2=28063&view=diff
Modified: trunk/specific_analyses/relax_fit/api.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/specific_analyses/relax_fit/api.py?rev=28063&r1=28062&r2=28063&view=diff
Modified: trunk/target_functions/frame_order.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/target_functions/frame_order.py?rev=28063&r1=28062&r2=28063&view=diff
Modified: trunk/target_functions/mf.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/target_functions/mf.py?rev=28063&r1=28062&r2=28063&view=diff
Modified: trunk/target_functions/n_state_model.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/target_functions/n_state_model.py?rev=28063&r1=28062&r2=28063&view=diff
Modified: trunk/target_functions/relax_disp.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/target_functions/relax_disp.py?rev=28063&r1=28062&r2=28063&view=diff
Modified: trunk/test_suite/system_tests/frame_order.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/frame_order.py?rev=28063&r1=28062&r2=28063&view=diff
Modified: trunk/test_suite/system_tests/unit_vectors.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/unit_vectors.py?rev=28063&r1=28062&r2=28063&view=diff
_______________________________________________
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
