Author: bugman
Date: Tue Jan 20 15:17:02 2015
New Revision: 27245
URL: http://svn.gna.org/viewcvs/relax?rev=27245&view=rev
Log:
Merged revisions 27241-27243 via svnmerge from
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk
........
r27241 | bugman | 2015-01-20 15:04:18 +0100 (Tue, 20 Jan 2015) | 6 lines
Added a RelaxWarning printout to the dep_check module if wxPython 2.8 or
less is encountered.
This follows from
http://thread.gmane.org/gmane.science.nmr.relax.devel/7502. The warning text
is
simply written to STDERR as relax starts.
........
r27242 | bugman | 2015-01-20 15:05:32 +0100 (Tue, 20 Jan 2015) | 5 lines
Updated the wxPython version in the relax manual to be 2.9 or higher.
This is in the section http://www.nmr-relax.com/manual/Dependencies.html.
........
r27243 | bugman | 2015-01-20 15:13:19 +0100 (Tue, 20 Jan 2015) | 6 lines
The GUI tests are now skipped for wxPython version <= 2.8 due to bugs
causing fatal segfaults.
This follows from
http://thread.gmane.org/gmane.science.nmr.relax.devel/7502. These wxPython
versions are simply too buggy.
........
Modified:
branches/frame_order_cleanup/ (props changed)
branches/frame_order_cleanup/dep_check.py
branches/frame_order_cleanup/docs/latex/install.tex
branches/frame_order_cleanup/test_suite/test_suite_runner.py
Propchange: branches/frame_order_cleanup/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Jan 20 15:17:02 2015
@@ -1 +1 @@
-/trunk:1-27238
+/trunk:1-27244
Modified: branches/frame_order_cleanup/dep_check.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/dep_check.py?rev=27245&r1=27244&r2=27245&view=diff
==============================================================================
--- branches/frame_order_cleanup/dep_check.py (original)
+++ branches/frame_order_cleanup/dep_check.py Tue Jan 20 15:17:02 2015
@@ -1,6 +1,6 @@
###############################################################################
#
#
-# Copyright (C) 2008-2014 Edward d'Auvergne
#
+# Copyright (C) 2008-2015 Edward d'Auvergne
#
# Copyright (C) 2014 Troels E. Linnet
#
#
#
# This file is part of the program relax (http://www.nmr-relax.com).
#
@@ -107,6 +107,9 @@
try:
import wx
wx_module = True
+ wx_version = wx.version().split()[0]
+ if version_comparison(wx_version, '2.9') == -1:
+ sys.stderr.write("RelaxWarning: Version %s of wxPython dependency
is too old and buggy, version 2.9 or higher is required otherwise the GUI may
be unstable.\n" % wx_version)
except ImportError:
wx_module = False
message = sys.exc_info()[1]
Modified: branches/frame_order_cleanup/docs/latex/install.tex
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/docs/latex/install.tex?rev=27245&r1=27244&r2=27245&view=diff
==============================================================================
--- branches/frame_order_cleanup/docs/latex/install.tex (original)
+++ branches/frame_order_cleanup/docs/latex/install.tex Tue Jan 20 15:17:02
2015
@@ -17,7 +17,7 @@
\item[\href{http://www.scipy.org/}{SciPy}\index{SciPy}:] Version 0.7.1 or
higher.
This package is optional.
It is required only for the frame order theory analyses.
- \item[\href{http://wxpython.org/}{wxPython}\index{wxPython}:] Version 2.8
or higher.
+ \item[\href{http://wxpython.org/}{wxPython}\index{wxPython}:] Version 2.9
or higher.
This package is also optional.
It is required for the operation of the graphical user interface
(GUI)\index{User interface!GUI}.
\item[\href{http://mpi4py.scipy.org/}{mpi4py}\index{MPI!mpi4py}:] Version
1.2 or higher.
Modified: branches/frame_order_cleanup/test_suite/test_suite_runner.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/test_suite_runner.py?rev=27245&r1=27244&r2=27245&view=diff
==============================================================================
--- branches/frame_order_cleanup/test_suite/test_suite_runner.py
(original)
+++ branches/frame_order_cleanup/test_suite/test_suite_runner.py Tue
Jan 20 15:17:02 2015
@@ -1,6 +1,6 @@
###############################################################################
#
#
-# Copyright (C) 2006-2014 Edward d'Auvergne
#
+# Copyright (C) 2006-2015 Edward d'Auvergne
#
#
#
# This file is part of the program relax (http://www.nmr-relax.com).
#
#
#
@@ -140,7 +140,7 @@
title(file=sys.stdout, text='GUI tests')
# Run the tests.
- if dep_check.wx_module:
+ if dep_check.wx_module and
dep_check.version_comparison(dep_check.wx_version, '2.9') >= 0:
# Set up the GUI if needed (i.e. not in GUI mode already).
app = wx.GetApp()
if app == None:
@@ -166,7 +166,10 @@
# No wx module installed.
else:
- print("All GUI tests skipped due to the missing/broken wx
module.\n")
+ if dep_check.wx_module and
dep_check.version_comparison(dep_check.wx_version, '2.9') == -1:
+ print("All GUI tests skipped to avoid segfaults due to
bugs in wxPython versions <= 2.8.\n")
+ else:
+ print("All GUI tests skipped due to the missing/broken
wx module.\n")
self.gui_result = 'skip'
# Print out a summary of the test suite.
r27245 - in /branches/frame_order_cleanup: ./ dep_check.py docs/latex/install.tex test_suite/test_suite_runner.py