Author: bugman Date: Tue Feb 3 09:37:34 2015 New Revision: 27446 URL: http://svn.gna.org/viewcvs/relax?rev=27446&view=rev Log: Reverted r27241, the wxPython 2.8 warning.
The command used was: svn merge -r27241:r27240 . This was discussed at http://thread.gmane.org/gmane.science.nmr.relax.devel/7502/focus=7512. ..... r27241 | bugman | 2015-01-20 15:04:18 +0100 (Tue, 20 Jan 2015) | 6 lines Changed paths: M /trunk/dep_check.py 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. ..... Modified: trunk/dep_check.py Modified: trunk/dep_check.py URL: http://svn.gna.org/viewcvs/relax/trunk/dep_check.py?rev=27446&r1=27445&r2=27446&view=diff ============================================================================== --- trunk/dep_check.py (original) +++ trunk/dep_check.py Tue Feb 3 09:37:34 2015 @@ -1,6 +1,6 @@ ############################################################################### # # -# Copyright (C) 2008-2015 Edward d'Auvergne # +# Copyright (C) 2008-2014 Edward d'Auvergne # # Copyright (C) 2014 Troels E. Linnet # # # # This file is part of the program relax (http://www.nmr-relax.com). # @@ -107,9 +107,6 @@ 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] _______________________________________________ relax (http://www.nmr-relax.com) This is the relax-commits mailing list relax-commits@gna.org 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
