# ChangeLog for sci-chemistry/relax
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/relax/ChangeLog,v 1.33 2015/02/07 07:56:16 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/relax/ChangeLog,v 1.34 2015/02/07 07:58:05 jlec Exp $
+
+ 07 Feb 2015; Justin Lecher <jlec@gentoo.org> -files/relax-2.1.0-gentoo.patch,
+ -files/relax-2.2.1-gentoo.patch, -files/relax-3.0.1-gentoo.patch,
+ -files/relax-3.0.2-wxpython.patch, -files/relax-3.0.2-wxpython-2.patch,
+ -files/relax-3.1.0-sample-script.patch,
+ -files/relax-3.1.0-sample-script-backport.patch,
+ -files/relax-3.1.7-dpar.patch, -files/relax-3.2.2-gentoo.patch:
+ Drop old patches
*relax-3.3.6 (07 Feb 2015)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
-AUX relax-2.1.0-gentoo.patch 910 SHA256 2e85e979fa61e950def08e5a71e0d61662d5d8755a50fa6f4210000760778dbe SHA512 45c537b69b84e67fbadfcc30ae51f8f2d86d897c6187a1008b974899e8464cc638ad21b7e43eb2395887a962dcd6a751e24e4d46fec3639413a90de7fbfb98e6 WHIRLPOOL fd3ffa8d5926586b2d8ff56e3e3e20cf816987a23358e823c39ed4217d53fbea43185c5bcc1abb9bbcb0703e84f1243cbca5db7cb26d432755b488950db72171
-AUX relax-2.2.1-gentoo.patch 1676 SHA256 8c31035e6d9abbca876a5d29ce25abe2a6daf6efb55c23a6436cf687d92e49bb SHA512 9e11f5a802b0b9ed8353fd7125e17b6e14d05495d0951bc7536f652ce39ec8baa57acd6574ff6319dd2a6b6938a5bd0a51b95540e22d907675c3cac5e47b8e6d WHIRLPOOL ccd635d5724c7d2db784d457ef126f424f26bb854bc1b85c8b214aaf0e8589a557dc951354c95961968521c6b536663ff78afdf397fac5e18b6143ab4e86a6be
-AUX relax-3.0.1-gentoo.patch 1645 SHA256 266faa00ccfae77171785800825ec16ad518e0e22ac2ade74154ab01d547fa17 SHA512 6869b5dca42d7428ab177ee3134feded9788d61cf0fe870dd1198039b9f520b4e7e745feae0ba01189f832fd21a6141ca53f8929694d25207f08667b2744606c WHIRLPOOL c74adb00570006e0c515d4b88234044d76ac7ca15e0c1224ed626d05efd71b114abdc8d14196921cf022db55f67fc250bf95a86d339c2052f99672724c1f1366
-AUX relax-3.0.2-wxpython-2.patch 2258 SHA256 281440662cd3aacbf0c77269c3216be5df34aedd7bfa24bdde2ad22d4cbfec1c SHA512 f0d49f3870c28c776a300264a4656711db4e01f5ac065a3d079887ad299c50ab66bb899403ef13a13ad1dde80cde7f5cf44f8a6f25a8ec80b62e068cf55717b4 WHIRLPOOL 02601f57d0573bd0da665fd15da0e3196cd550c2403b700088e224e83925c03c5a1e54838bf52485f3625b067f2e5ff9775fce5964e0c571a3cfbdcc616de820
-AUX relax-3.0.2-wxpython.patch 26526 SHA256 e027848934357fabe880bf99792cfebbbe9285c5a62bf806e1b547158b3f7f7f SHA512 1c98220c4eda426fac0c8b463e9360bff74ab9b5923c3c068c90b02971860a267ded2b39e7f41ddc71fd15bd92fab911ab5b879b66715bc0953b3a4184901b22 WHIRLPOOL 5db39eaf6219faa48efe4609c45f0cf22f333a499032e2ec03a33c4afe64c9153629b25379a72853e83ee4a0457e172a963a358a4e2497a9d020992aa2d2ec93
-AUX relax-3.1.0-sample-script-backport.patch 7311 SHA256 2621ab6890a0711abb4961f76153813570597b48b59aa3a206354c993b205ac4 SHA512 17183054434a8495e1d7ecade631f34b324e2c7d6d80f1406cadfcc5fdf7f6c9099db372674c12e80b1975990467eb2f42f6bdfce0a7e27998cdeea48fa98338 WHIRLPOOL 00cea4f17144aa0b27b675cae1127c2f9e6bb6d8bc4ebebb4acf219d25966edd87f41f26c3971877d8a338abd29dcb18181eb9343debd7aa7951052609bac306
-AUX relax-3.1.0-sample-script.patch 1809 SHA256 7201cd4d6b9379e3fc2d6115847f1134ac80505922d91ba56ab96507facfcfd7 SHA512 aaca5fe9294f4c013cda8d3f10e24badcd0b6e4a5cdc757bd023a3d55dd8f2d8a671b5c52d3fa064811dcf0bf0d40b8a8004d5447dfebfafb9908e7fcac5fe6a WHIRLPOOL a9e9980f45353eee1ac5e5a537706ca4bff82663ffc0518b2f66a59bf7071ba8ab807ab60afc1f68f062aba9e6d07e9db1f133f24061028ca0dac864de73c7f1
-AUX relax-3.1.7-dpar.patch 1310 SHA256 85061d16fabdc9d7f3f7f28bf1ad2b8a8798c6ab1322a66afb6fbd9d0591241f SHA512 40120bbe9d4474abec930e612633d8f961daa06df6f0a918a8d13469c564fc1fcf44fb6fe1cc643cbbc97587c16a1e6e4881e59f48aa2413c5c58d433a26477c WHIRLPOOL 254fb90ddcb3a2c8a1a0d805b9e805fe0870e8acec2795006c10419cdaf55389b803351dc155b3903eb164a33cb4790e25452f9d1d32b1169231889e77762265
-AUX relax-3.2.2-gentoo.patch 921 SHA256 01a4227e666d62cc37641cc69ac594a9523310989cf67c75bb2166c71561de1f SHA512 fe7f30fd5903904f123c329ce774ba3fbda2365f779bb45b4e7d24c0d32f63e4465e7daa8385853681aa1bdb8693d3103b92a148b7f06fec9fdf7769f44b517a WHIRLPOOL b251efdfa25161b8cf1f8d355d6b94066efc8c309ab1802d1170067d8726013c25447a7e598f0b0d3b92d725e2b7755f2284d10ac9055281815b3bde65bd678c
DIST relax-3.3.4.src.tar.bz2 89206485 SHA256 03ecc20353126d155c7d5c9ab45e3bb146a87243472711c937befced2db333c0 SHA512 78ae5778ef0fe84fc3a26648dd2192d529fb1e5241728f7c06a5a2cec2ce849a2c75c19a931123a17d5c210acc4f4c2401574b10a1fbbe0307d2d9867567352d WHIRLPOOL 4fcdec36e8df412091ab1a99a6b017ebc72f8e5c400429e698221f22e4ef7ae35713a6e2a05f6f1b573e5223f8eccc7cb0d2a20b1171e5bc483fd3ef1a0242bc
DIST relax-3.3.5.src.tar.bz2 90164368 SHA256 d9e3668221dba7589ba1d12ab40df517b5b6f742ee413864cc87ab636546e2ef SHA512 c8c248abf0edb54af631c11b102b641d41a106036bbdb88d8f1563c9750d3c7d402ee150d7afd770b845d3a421e431afcf95e6222197f9dc1afec61ddcd0bf37 WHIRLPOOL d9070bed833ef063c22fec5e55b1968c65b672ee100247b1af9a25d3149eb57475aeb94a4f125fc3cd278d97ac248e7826b083c840b47f9db83bae7e1aaae710
DIST relax-3.3.6.src.tar.bz2 90005292 SHA256 2b1994626a910036c63d67c609c49b3bde8c754b60763de62c2ac8f6c3f589c3 SHA512 cda773a4af259d25550e4e4dbd8500594afd9df051ba06130355058347f308b804726acafaa76957e062c78d1d8fb26f843b3ac97d5aecd534b53c1a5155cafb WHIRLPOOL 0bf0f51664a132653fbd981ee6776cb16dd6371504df2167658027325d632cda8a6f4a21d4a530c46dc75c93b3ffb87f5189d4986acadb344154cd7420361e0b
EBUILD relax-3.3.4.ebuild 1626 SHA256 b1e6b8c47a00dc9534d062388a3f24647ae16df705ce72d1314275152b42287e SHA512 87c04b683cd44b96c8770eb1ff6ce4985d20b1b3111e2455f1fbdacda5f90fc821878b6530e1040fb4f5e97150cf06b22aa47b02be00f0fc966f87bf711a1214 WHIRLPOOL 329920303bdfefec2583efe39096f6d6d8bff036bafc2bdf802d365bd40b45b09659b3777cc9f84c4475c138563dc403a2ff75df61121b4038f167c7caec8b07
EBUILD relax-3.3.5.ebuild 1626 SHA256 e3ccbe04dc546d4eb8e0f9655dabf74cb166058e3de7001d6bc4113136a72a68 SHA512 e860a1c3bd71cc4ef3700f1e5d7ef1793cd31deb19d0c27f23c198168e368c8e33cadda000f7bca02dcfc055525dd13498b9dc047d1782318290761bd393de77 WHIRLPOOL b911d22dfa7af2ce560046908a7b0b7b0a184328abfffe8bfb327bf59fbf6a95f984cf7a82211ffeba7b508669c126e7b9750497d1cc0956daf316e5af25ad39
EBUILD relax-3.3.6.ebuild 1626 SHA256 90de2a1cc5c98fe07cbd6dd3890d7f44dbafb55f53a01a5b8919ff897f464f4e SHA512 de0e02e1775bbc1c04af5decd22571018f237c47e6206b5a3773d878994e19f6761e468ee5217b6fa191597c94b061e7b486fd904b605f0086e2e84780cd2dcc WHIRLPOOL 63ddb15d7d7de226f9020cd29f8b9202a75df70a7ff81fc38d16af5291678a5a28cffd4eaac808fb4f96970e5d081522a75b439858a88727909252aee95e2662
-MISC ChangeLog 5263 SHA256 077deccfcbf03ae6d1e925835d670d229209161967a84b54668b22a8d3717425 SHA512 581c5e3522bf3976eae0c7126656205beb2c3016be4f3628cc7ce470f808fc17d2b353a1f7a79780600a0b5903628d2b604816ed3128d082e94e04ffc3da8723 WHIRLPOOL 0ff61e11f87e4ed9e3df602fe87759bdade026f00032e8ecf032bf0460156cb398e66f708dfef44a50555b3dfa291bdc482bf962e8f4ce82a0d77fafdeeb169f
+MISC ChangeLog 5664 SHA256 161ec44f2114bbba876d036b5a30d5e2c3925d436e4748b0abb373498e47b67d SHA512 49ed1a64536cd0c77a712642faf770e64b55609832c6cff002801aee89c89f84ffaf4c73a541a1f6960fb2910b6621d80a7dd04959823479219e34aed11fe536 WHIRLPOOL a8af35aa3a873bf7da9c1691877097cc7003ddc1831d551fc1afc1c1aebcaec5acbd9b8d0dc214bfdaeaf1afb9a8d8aaa0a653f06438ebb746919f3fc29d7c09
MISC metadata.xml 1315 SHA256 58aef1b2b940b7211a85032dfc7212025aca6a3cd313b1a6e203854bbd3dd03e SHA512 dcb1d935782546693b79aa74dc37d55701ff4cb1756860a7f0d9919534ad2ae6f1dcad20cace867b10297c577cb6444dd5e212b13f57c3d81b30b382d8458c04 WHIRLPOOL e2de7c85fb3494a98c2ee1b08dd06d28676f43f64367ad29a8723f712e12e9052daa82794bb6626506de568701b1ea09efe059a8d3a13f6aee5fd607a913e441
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0
-iQJ8BAEBCgBmBQJU1cYSXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJU1caHXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirkdAP/1WqIQtGRJ7Q/XUhQEGRnpcl
-ckz3biEi9Y9egnsl3tOJXY4WimvMFH+IMDh5BjMqtIck2GmmSBvIHqSn2qhDEs85
-egxFmK/wbTfmnlKT4gcYVjL/BkWggrd4VvliLhOD5xHsWFzlrpkQZP/+U3V5z/Hg
-bGDaYQN2xtMMnvimXFYWLRv4imm7+x4K++xFL7WAU3kctbpn5IzEUz5eMRiwMMuB
-Al8bWJZDd8l4orqhlc4GLx5LlzK6q0O5/qm3WP0dQOQQEtwvkW3g2Cd+tKrUbskD
-F60k2NWOBrvNVn1TirBMWdCTDPLs9lG9lTcYdYAdEo/pFEpFeVq+HAbITsH8aLe7
-ItY2G1SoIswZboCvoOvGNCE2JBvJRXWURob2WAvCcy5s1TsbZE0rYrYM6E8ItY89
-uZqVlDDPkq4HZ2wjscOWcahWoDVsISSann+jQJd/tb46NqWHvWbiGI5Ws9Mlbbcs
-1U5g0D0U+cl2EzJC+fMA0YkzBs+SiLLTia0GTjCZhoEQUlyoDC8FIpbdJ66RcWWV
-s7HQrlWUGEhljpSthQ0OUcPIUIjzydaxfH3O94rGpNZFUgFofNxESrKIEyiQJjX1
-OUzwWp7kvIin7qs6VAiM0bCYLv9KGFlySDmGCjnCC0fHk6OXbnpWd79VNwVFDxsd
-h66HysLU1vDD5u4Wb/cp
-=pWXP
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirUC0P/j1sjfKBXhAPXElPY8cUW5nY
+2Gq6MfJsurl4rnYtUKQkLSVkEEo9wKpanwfz7l2DTYRqOlZyqx4/799jyLe2s8gJ
+SuZfnitzYYdaZAg7iN44tQ6AdOT2qpdQg4gUr92bR3MoJZ4pFuwm1ewoXcYUGzgJ
+sab4OBNlOsXhJf7FaT+0nKDR9avbSMSENSPNEx4IERRQnrgUd3oL8kuuPdwtcdYf
+WsoJAPCPnyIJVsb4KC+yMr0cqfuLQyc8ap5xpUcUXUQDg6Bw2LMEUkI68uK5yVrb
+6tCvkzry8AyAQKSR2tMn4lbH4kOVTCgMUxPym44iyw5bCP0Y2uEe0ER2UE7MIJrp
+36uzlLaWHJ3uBs3fvR8MnIjVycKJ0hIEg7OPjICua0GI2a1zT0PnnroNob4mgS9o
+br6FbP1NxpaW9tr/WVrvC0p+jC01j8z/IBFHb+0Hf0jBd4sXDjXe6D6M9tVIs/5j
+7vix910KUEeLOIADe3LKkkKV35Xa9N3exauD4GCy4FfAzJO/ZzEuS1WGhHSRVhJj
+ahzyDlHlxUezujvgsQH+dKgdo2kq/NKp9nHt7bH2xtHZiWYu92rUEobTgClml/GC
+KRKc6o+tb8BIt9C6KpLXYsPTRHBq5oPcsdOvvhZehetywJOWV0g1cRhPw21hKPJc
+yFnb4XnEF/MAtMYwoAF8
+=xtLV
-----END PGP SIGNATURE-----
+++ /dev/null
- sconstruct | 6 +++++-
- 1 files changed, 5 insertions(+), 1 deletions(-)
-
-diff --git a/sconstruct b/sconstruct
-index c0fab95..c9d5e2c 100644
---- a/sconstruct
-+++ b/sconstruct
-@@ -26,7 +26,7 @@
-
- # Import statements.
- from numpy import get_include
--from os import getcwd, path, remove, sep, walk
-+from os import getcwd, path, remove, sep, walk, environ
- import platform
- from re import search
- from shutil import rmtree
-@@ -586,6 +586,10 @@ class Main:
- for file in files:
- nodes.append(env.SharedObject(dir + path.sep + file, CCFLAGS=cflags))
-
-+ env.Append(LINKFLAGS = environ['LDFLAGS'])
-+ env.Append(CFLAGS = environ['CFLAGS'])
-+ env.Replace(CC = environ['CC'])
-+
- # Build the relaxation curve fitting module.
- self.relax_fit_object = env.SharedLibrary(target=dir + path.sep + 'relax_fit', source=nodes, SHLIBPREFIX=prefix, SHLIBSUFFIX=suffix)
-
+++ /dev/null
- scons/install.py | 10 ----------
- sconstruct | 6 +++++-
- 2 files changed, 5 insertions(+), 11 deletions(-)
-
-diff --git a/scons/install.py b/scons/install.py
-index b2d355a..d7c7911 100644
---- a/scons/install.py
-+++ b/scons/install.py
-@@ -109,16 +109,6 @@ def install(target, source, env):
- symlink(env['RELAX_PATH'] + sep + 'relax', env['SYMLINK'])
-
-
-- # Byte compile.
-- ###############
--
-- # Run relax to create the *.pyc files.
-- print("\nCreating the byte-compiled *.pyc files.")
-- python_path = sys.prefix + path.sep + 'bin' + path.sep + 'python' + `sys.version_info[0]` + '.' + `sys.version_info[1]`
-- cmd = "cd %s; %s -m compileall . ; %s -O -m compileall ." % (env['RELAX_PATH'], python_path, python_path)
-- print(cmd)
-- system(cmd)
--
- # Final printout.
- print("\n\n\n")
-
-diff --git a/sconstruct b/sconstruct
-index 8e968cd..8e7d949 100644
---- a/sconstruct
-+++ b/sconstruct
-@@ -26,7 +26,7 @@
-
- # Import statements.
- from numpy import get_include
--from os import getcwd, path, remove, rmdir, sep, walk
-+from os import getcwd, path, remove, rmdir, sep, walk, environ
- import platform
- from re import search
- from shutil import rmtree
-@@ -596,6 +596,10 @@ class Main:
- for file in files:
- nodes.append(env.SharedObject(dir + path.sep + file, CCFLAGS=cflags))
-
-+ env.Append(LINKFLAGS = environ['LDFLAGS'])
-+ env.Append(CFLAGS = environ['CFLAGS'])
-+ env.Replace(CC = environ['CC'])
-+
- # Build the relaxation curve fitting module.
- self.relax_fit_object = env.SharedLibrary(target=dir + path.sep + 'relax_fit', source=nodes, SHLIBPREFIX=prefix, SHLIBSUFFIX=suffix)
-
+++ /dev/null
- scons/install.py | 10 ----------
- sconstruct | 6 +++++-
- 2 files changed, 5 insertions(+), 11 deletions(-)
-
-diff --git a/scons/install.py b/scons/install.py
-index b2d355a..d7c7911 100644
---- a/scons/install.py
-+++ b/scons/install.py
-@@ -109,16 +109,6 @@ def install(target, source, env):
- symlink(env['RELAX_PATH'] + sep + 'relax', env['SYMLINK'])
-
-
-- # Byte compile.
-- ###############
--
-- # Run relax to create the *.pyc files.
-- print("\nCreating the byte-compiled *.pyc files.")
-- python_path = sys.prefix + path.sep + 'bin' + path.sep + 'python' + `sys.version_info[0]` + '.' + `sys.version_info[1]`
-- cmd = "cd %s; %s -m compileall . ; %s -O -m compileall ." % (env['RELAX_PATH'], python_path, python_path)
-- print(cmd)
-- system(cmd)
--
- # Final printout.
- print("\n\n\n")
-
-diff --git a/sconstruct b/sconstruct
-index 8e968cd..8e7d949 100644
---- a/sconstruct
-+++ b/sconstruct
-@@ -26,6 +26,6 @@
-
- # Import statements.
--from os import getcwd, path, remove, rmdir, sep, walk
-+from os import getcwd, path, remove, rmdir, sep, walk, environ
- import platform
- from re import search
- from shutil import rmtree
-@@ -596,6 +596,10 @@ class Main:
- for file in files:
- nodes.append(env.SharedObject(dir + path.sep + file, CCFLAGS=cflags))
-
-+ env.Append(LINKFLAGS = environ['LDFLAGS'])
-+ env.Append(CFLAGS = environ['CFLAGS'])
-+ env.Replace(CC = environ['CC'])
-+
- # Build the relaxation curve fitting module.
- self.relax_fit_object = env.SharedLibrary(target=dir + path.sep + 'relax_fit', source=nodes, SHLIBPREFIX=prefix, SHLIBSUFFIX=suffix)
-
+++ /dev/null
- gui/components/free_file_format.py | 2 +-
- gui/input_elements/sequence.py | 4 ++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/gui/components/free_file_format.py b/gui/components/free_file_format.py
-index 61c2783..f4bd7ba 100644
---- a/gui/components/free_file_format.py
-+++ b/gui/components/free_file_format.py
-@@ -610,7 +610,7 @@ class Free_file_format_window(wx.Dialog, Wiz_page):
-
- # The reset button.
- button = wx.lib.buttons.ThemedGenBitmapTextButton(self, -1, None, " Reset")
-- button.SetBitmapLabel(wx.Bitmap(fetch_icon('oxygen.actions.edit_delete', "22x22"), wx.BITMAP_TYPE_ANY))
-+ button.SetBitmapLabel(wx.Bitmap(fetch_icon('oxygen.actions.edit-delete', "22x22"), wx.BITMAP_TYPE_ANY))
- button.SetFont(font.normal)
- button.SetToolTipString("Reset the free file format settings to the original values.")
- button.SetMinSize(self.SIZE_BUTTON)
-diff --git a/gui/input_elements/sequence.py b/gui/input_elements/sequence.py
-index b719a21..7883da5 100644
---- a/gui/input_elements/sequence.py
-+++ b/gui/input_elements/sequence.py
-@@ -175,7 +175,7 @@ class Sequence:
- sub_sizer.AddSpacer(5)
-
- # The edit button.
-- button = wx.BitmapButton(parent, -1, wx.Bitmap(fetch_icon('oxygen.actions.edit_rename', "16x16"), wx.BITMAP_TYPE_ANY))
-+ button = wx.BitmapButton(parent, -1, wx.Bitmap(fetch_icon('oxygen.actions.edit-rename', "16x16"), wx.BITMAP_TYPE_ANY))
- button.SetMinSize((height_element, height_element))
- button.SetToolTipString("Edit the values.")
- sub_sizer.Add(button, 0, wx.ADJUST_MINSIZE|wx.ALIGN_CENTER_VERTICAL, 0)
-@@ -565,7 +565,7 @@ class Sequence_window(wx.Dialog):
-
- # The delete all button.
- button = wx.lib.buttons.ThemedGenBitmapTextButton(self, -1, None, " Delete all")
-- button.SetBitmapLabel(wx.Bitmap(fetch_icon('oxygen.actions.edit_delete', "22x22"), wx.BITMAP_TYPE_ANY))
-+ button.SetBitmapLabel(wx.Bitmap(fetch_icon('oxygen.actions.edit-delete', "22x22"), wx.BITMAP_TYPE_ANY))
- button.SetFont(font.normal)
- button.SetToolTipString("Delete all items.")
- button.SetMinSize(self.SIZE_BUTTON)
+++ /dev/null
- dep_check.py | 2 ++
- devel_scripts/gui/about_gui.py | 2 ++
- devel_scripts/gui/about_model_free.py | 2 ++
- devel_scripts/gui/about_relax.py | 2 ++
- devel_scripts/gui/refs.py | 2 ++
- devel_scripts/gui/spin_create.py | 2 ++
- devel_scripts/gui/uf_sequence_read.py | 2 ++
- devel_scripts/python_seek.py | 2 ++
- gui/__init__.py | 2 ++
- gui/about.py | 2 ++
- gui/analyses/__init__.py | 2 ++
- gui/analyses/auto_model_free.py | 2 ++
- gui/analyses/auto_noe.py | 2 ++
- gui/analyses/auto_rx_base.py | 2 ++
- gui/analyses/base.py | 2 ++
- gui/analyses/elements/bool_element.py | 2 ++
- gui/analyses/elements/float_element.py | 2 ++
- gui/analyses/elements/model_list.py | 2 ++
- gui/analyses/elements/spin_element.py | 2 ++
- gui/analyses/elements/text_element.py | 2 ++
- gui/analyses/wizard.py | 2 ++
- gui/components/base_list.py | 2 ++
- gui/components/free_file_format.py | 2 ++
- gui/components/grid.py | 2 ++
- gui/components/menu.py | 2 ++
- gui/components/molecule.py | 2 ++
- gui/components/relax_data.py | 2 ++
- gui/components/relax_data_meta.py | 2 ++
- gui/components/spectrum.py | 2 ++
- gui/controller.py | 2 ++
- gui/errors.py | 2 ++
- gui/export_bmrb.py | 2 ++
- gui/filedialog.py | 2 ++
- gui/fonts.py | 2 ++
- gui/icons.py | 2 ++
- gui/input_elements/bool.py | 2 ++
- gui/input_elements/combo_list.py | 2 ++
- gui/input_elements/dir.py | 2 ++
- gui/input_elements/file.py | 2 ++
- gui/input_elements/sequence.py | 2 ++
- gui/input_elements/sequence_2D.py | 2 ++
- gui/input_elements/spin_id.py | 2 ++
- gui/input_elements/value.py | 2 ++
- gui/interpreter.py | 2 ++
- gui/menu.py | 2 ++
- gui/message.py | 2 ++
- gui/misc.py | 2 ++
- gui/pipe_editor.py | 2 ++
- gui/references.py | 2 ++
- gui/relax_gui.py | 2 ++
- gui/relax_prompt.py | 2 ++
- gui/results_viewer.py | 2 ++
- gui/spin_viewer/containers.py | 2 ++
- gui/spin_viewer/frame.py | 2 ++
- gui/spin_viewer/splitter.py | 2 ++
- gui/spin_viewer/tree.py | 2 ++
- gui/uf_objects.py | 2 ++
- gui/wizards/peak_intensity.py | 2 ++
- gui/wizards/wiz_objects.py | 2 ++
- pipe_control/reset.py | 2 ++
- test_suite/gui_tests/__init__.py | 2 ++
- test_suite/gui_tests/base_classes.py | 2 ++
- test_suite/gui_tests/model_free.py | 2 ++
- test_suite/gui_tests/noe.py | 2 ++
- test_suite/gui_tests/rx.py | 2 ++
- test_suite/gui_tests/state.py | 2 ++
- test_suite/relax_test_runner.py | 2 ++
- test_suite/test_suite_runner.py | 2 ++
- 68 files changed, 136 insertions(+)
-
-diff --git a/dep_check.py b/dep_check.py
-index cc9a781..29d0dd5 100644
---- a/dep_check.py
-+++ b/dep_check.py
-@@ -67,6 +67,8 @@ except ImportError:
-
- # wx module.
- try:
-+ import wxversion
-+ wxversion.select("2.8")
- import wx
- wx_module = True
- except ImportError:
-diff --git a/devel_scripts/gui/about_gui.py b/devel_scripts/gui/about_gui.py
-index 2255b12..e32da8b 100644
---- a/devel_scripts/gui/about_gui.py
-+++ b/devel_scripts/gui/about_gui.py
-@@ -20,6 +20,8 @@
- ###############################################################################
-
- # Python module imports.
-+import wxversion
-+wxversion.select("2.8")
- import wx
-
- # GUI module imports.
-diff --git a/devel_scripts/gui/about_model_free.py b/devel_scripts/gui/about_model_free.py
-index ff39906..2b608fe 100644
---- a/devel_scripts/gui/about_model_free.py
-+++ b/devel_scripts/gui/about_model_free.py
-@@ -20,6 +20,8 @@
- ###############################################################################
-
- # Python module imports.
-+import wxversion
-+wxversion.select("2.8")
- import wx
-
- # GUI module imports.
-diff --git a/devel_scripts/gui/about_relax.py b/devel_scripts/gui/about_relax.py
-index d3c6bfa..e9c4e77 100644
---- a/devel_scripts/gui/about_relax.py
-+++ b/devel_scripts/gui/about_relax.py
-@@ -20,6 +20,8 @@
- ###############################################################################
-
- # Python module imports.
-+import wxversion
-+wxversion.select("2.8")
- import wx
-
- # GUI module imports.
-diff --git a/devel_scripts/gui/refs.py b/devel_scripts/gui/refs.py
-index e23a252..6620ad7 100644
---- a/devel_scripts/gui/refs.py
-+++ b/devel_scripts/gui/refs.py
-@@ -20,6 +20,8 @@
- ###############################################################################
-
- # Python module imports.
-+import wxversion
-+wxversion.select("2.8")
- import wx
-
- # GUI module imports.
-diff --git a/devel_scripts/gui/spin_create.py b/devel_scripts/gui/spin_create.py
-index 2dcccda..5a7cbbc 100644
---- a/devel_scripts/gui/spin_create.py
-+++ b/devel_scripts/gui/spin_create.py
-@@ -20,6 +20,8 @@
- ###############################################################################
-
- # Python module imports.
-+import wxversion
-+wxversion.select("2.8")
- import wx
-
- # GUI module imports.
-diff --git a/devel_scripts/gui/uf_sequence_read.py b/devel_scripts/gui/uf_sequence_read.py
-index a1659cb..dc384df 100644
---- a/devel_scripts/gui/uf_sequence_read.py
-+++ b/devel_scripts/gui/uf_sequence_read.py
-@@ -20,6 +20,8 @@
- ###############################################################################
-
- # Python module imports.
-+import wxversion
-+wxversion.select("2.8")
- import wx
-
- # GUI module imports.
-diff --git a/devel_scripts/python_seek.py b/devel_scripts/python_seek.py
-index 9e2eeb0..079dbb6 100755
---- a/devel_scripts/python_seek.py
-+++ b/devel_scripts/python_seek.py
-@@ -240,6 +240,8 @@ class Python_info:
- # The commands.
- commands = [
- "try:\n",
-+ " import wxversion\n",
-+ " wxversion.select('2.8')\n",
- " import wx\n",
- " version = wx.version()\n",
- "except:\n",
-diff --git a/gui/__init__.py b/gui/__init__.py
-index 7c7b89c..9be9834 100644
---- a/gui/__init__.py
-+++ b/gui/__init__.py
-@@ -32,6 +32,8 @@ import dep_check
- import sys
- from time import sleep
- if dep_check.wx_module:
-+ import wxversion
-+ wxversion.select("2.8")
- import wx
-
- # relax module imports.
-diff --git a/gui/about.py b/gui/about.py
-index 91512ac..0bafd78 100644
---- a/gui/about.py
-+++ b/gui/about.py
-@@ -24,6 +24,8 @@
- from copy import deepcopy
- from numpy import zeros
- import webbrowser
-+import wxversion
-+wxversion.select("2.8")
- import wx
- import wx.html
- from wx.lib.wordwrap import wordwrap
-diff --git a/gui/analyses/__init__.py b/gui/analyses/__init__.py
-index 863a78d..5e3ba00 100644
---- a/gui/analyses/__init__.py
-+++ b/gui/analyses/__init__.py
-@@ -25,6 +25,8 @@
- # Python module imports.
- import inspect
- import sys
-+import wxversion
-+wxversion.select("2.8")
- import wx
- from types import ListType
-
-diff --git a/gui/analyses/auto_model_free.py b/gui/analyses/auto_model_free.py
-index aa38030..b63689c 100644
---- a/gui/analyses/auto_model_free.py
-+++ b/gui/analyses/auto_model_free.py
-@@ -26,6 +26,8 @@
- # Python module imports.
- from math import ceil
- from os import sep
-+import wxversion
-+wxversion.select("2.8")
- import wx
- import wx.lib.buttons
- import wx.lib.mixins.listctrl
-diff --git a/gui/analyses/auto_noe.py b/gui/analyses/auto_noe.py
-index 05b28e1..8dff7e6 100644
---- a/gui/analyses/auto_noe.py
-+++ b/gui/analyses/auto_noe.py
-@@ -25,6 +25,8 @@
-
- # Python module imports.
- from os import sep
-+import wxversion
-+wxversion.select("2.8")
- import wx
-
- # relax module imports.
-diff --git a/gui/analyses/auto_rx_base.py b/gui/analyses/auto_rx_base.py
-index f953104..a547e9e 100644
---- a/gui/analyses/auto_rx_base.py
-+++ b/gui/analyses/auto_rx_base.py
-@@ -24,6 +24,8 @@
- """Module containing the base class for the automatic R1 and R2 analysis frames."""
-
- # Python module imports.
-+import wxversion
-+wxversion.select("2.8")
- import wx
-
- # relax module imports.
-diff --git a/gui/analyses/base.py b/gui/analyses/base.py
-index 0ef26f4..00da057 100644
---- a/gui/analyses/base.py
-+++ b/gui/analyses/base.py
-@@ -24,6 +24,8 @@
- """Module containing the base class for all frames."""
-
- # Python module imports.
-+import wxversion
-+wxversion.select("2.8")
- import wx
- from wx.lib import buttons
- from wx.lib import scrolledpanel
-diff --git a/gui/analyses/elements/bool_element.py b/gui/analyses/elements/bool_element.py
-index e4a1bd8..fa2258f 100644
---- a/gui/analyses/elements/bool_element.py
-+++ b/gui/analyses/elements/bool_element.py
-@@ -24,6 +24,8 @@
- """Module containing the base class for all frames."""
-
- # Python module imports.
-+import wxversion
-+wxversion.select("2.8")
- import wx
- import wx.lib.buttons
-
-diff --git a/gui/analyses/elements/float_element.py b/gui/analyses/elements/float_element.py
-index 78e152d..bb938bf 100644
---- a/gui/analyses/elements/float_element.py
-+++ b/gui/analyses/elements/float_element.py
-@@ -24,6 +24,8 @@
- """Module containing the base class for all frames."""
-
- # Python module imports.
-+import wxversion
-+wxversion.select("2.8")
- import wx
- import wx.lib.buttons
-
-diff --git a/gui/analyses/elements/model_list.py b/gui/analyses/elements/model_list.py
-index 990e8c3..79862cd 100644
---- a/gui/analyses/elements/model_list.py
-+++ b/gui/analyses/elements/model_list.py
-@@ -23,6 +23,8 @@
- """Auto-analysis GUI element for the control of lists of models."""
-
- # Python module imports.
-+import wxversion
-+wxversion.select("2.8")
- import wx
- from wx.lib import scrolledpanel
- import wx.lib.mixins.listctrl
-diff --git a/gui/analyses/elements/spin_element.py b/gui/analyses/elements/spin_element.py
-index a662d07..b06872e 100644
---- a/gui/analyses/elements/spin_element.py
-+++ b/gui/analyses/elements/spin_element.py
-@@ -24,6 +24,8 @@
- """Module containing the base class for all frames."""
-
- # Python module imports.
-+import wxversion
-+wxversion.select("2.8")
- import wx
- import wx.lib.buttons
-
-diff --git a/gui/analyses/elements/text_element.py b/gui/analyses/elements/text_element.py
-index 895671f..5dfa19b 100644
---- a/gui/analyses/elements/text_element.py
-+++ b/gui/analyses/elements/text_element.py
-@@ -24,6 +24,8 @@
- """Module containing the base class for all frames."""
-
- # Python module imports.
-+import wxversion
-+wxversion.select("2.8")
- import wx
- import wx.lib.buttons
-
-diff --git a/gui/analyses/wizard.py b/gui/analyses/wizard.py
-index ca83f7c..3d0ebc5 100644
---- a/gui/analyses/wizard.py
-+++ b/gui/analyses/wizard.py
-@@ -25,6 +25,8 @@
- # Python module imports.
- from os import sep
- from time import asctime, localtime
-+import wxversion
-+wxversion.select("2.8")
- import wx
- from wx.lib import buttons
-
-diff --git a/gui/components/base_list.py b/gui/components/base_list.py
-index bba25e4..1fbf9df 100644
---- a/gui/components/base_list.py
-+++ b/gui/components/base_list.py
-@@ -24,6 +24,8 @@
- """Module containing the base GUI element for listing things."""
-
- # Python module imports.
-+import wxversion
-+wxversion.select("2.8")
- import wx
- import wx.lib.buttons
-
-diff --git a/gui/components/free_file_format.py b/gui/components/free_file_format.py
-index 61c2783..3106945 100644
---- a/gui/components/free_file_format.py
-+++ b/gui/components/free_file_format.py
-@@ -21,6 +21,8 @@
- ###############################################################################
-
- # Python module imports.
-+import wxversion
-+wxversion.select("2.8")
- import wx
- from wx.lib import buttons
-
-diff --git a/gui/components/grid.py b/gui/components/grid.py
-index 30a2a4a..aa64d14 100644
---- a/gui/components/grid.py
-+++ b/gui/components/grid.py
-@@ -25,6 +25,8 @@
-
- # Python module imports.
- from re import search
-+import wxversion
-+wxversion.select("2.8")
- import wx
- import wx.lib.buttons
-
-diff --git a/gui/components/menu.py b/gui/components/menu.py
-index 8a408b8..cf04f46 100644
---- a/gui/components/menu.py
-+++ b/gui/components/menu.py
-@@ -24,6 +24,8 @@
- """Module for the main relax menu bar."""
-
- # Python module imports.
-+import wxversion
-+wxversion.select("2.8")
- import wx
-
-
-diff --git a/gui/components/molecule.py b/gui/components/molecule.py
-index e74fc0a..f4a29a7 100644
---- a/gui/components/molecule.py
-+++ b/gui/components/molecule.py
-@@ -24,6 +24,8 @@
- """Module containing the classes for GUI components involving molecules."""
-
- # Python module imports.
-+import wxversion
-+wxversion.select("2.8")
- import wx
- import wx.lib.buttons
-
-diff --git a/gui/components/relax_data.py b/gui/components/relax_data.py
-index 3a68f20..dad36d7 100644
---- a/gui/components/relax_data.py
-+++ b/gui/components/relax_data.py
-@@ -24,6 +24,8 @@
- """Module containing the classes for GUI components involving relaxation data."""
-
- # Python module imports.
-+import wxversion
-+wxversion.select("2.8")
- import wx
- import wx.lib.buttons
-
-diff --git a/gui/components/relax_data_meta.py b/gui/components/relax_data_meta.py
-index 2c80815..1952911 100644
---- a/gui/components/relax_data_meta.py
-+++ b/gui/components/relax_data_meta.py
-@@ -24,6 +24,8 @@
- """Module containing the classes for GUI components involving relaxation data."""
-
- # Python module imports.
-+import wxversion
-+wxversion.select("2.8")
- import wx
-
- # relax module imports.
-diff --git a/gui/components/spectrum.py b/gui/components/spectrum.py
-index 8c7bc65..b9036c5 100644
---- a/gui/components/spectrum.py
-+++ b/gui/components/spectrum.py
-@@ -24,6 +24,8 @@
- """Module containing the classes for GUI components involving spectral data."""
-
- # Python module imports.
-+import wxversion
-+wxversion.select("2.8")
- import wx
- import wx.lib.buttons
-
-diff --git a/gui/controller.py b/gui/controller.py
-index dea6c9b..847c828 100644
---- a/gui/controller.py
-+++ b/gui/controller.py
-@@ -25,6 +25,8 @@
-
- # Python module imports.
- import sys
-+import wxversion
-+wxversion.select("2.8")
- import wx
- import wx.stc
-
-diff --git a/gui/errors.py b/gui/errors.py
-index 8f6b5c1..4d95ee2 100644
---- a/gui/errors.py
-+++ b/gui/errors.py
-@@ -24,6 +24,8 @@
-
- # Python module imports.
- import sys
-+import wxversion
-+wxversion.select("2.8")
- import wx
-
- # relax module imports.
-diff --git a/gui/export_bmrb.py b/gui/export_bmrb.py
-index 806c75a..827ce13 100644
---- a/gui/export_bmrb.py
-+++ b/gui/export_bmrb.py
-@@ -23,6 +23,8 @@
- """The BMRB export wizard."""
-
- # Python module imports.
-+import wxversion
-+wxversion.select("2.8")
- import wx
-
- # relax module imports.
-diff --git a/gui/filedialog.py b/gui/filedialog.py
-index 6301b9e..13bf8f3 100644
---- a/gui/filedialog.py
-+++ b/gui/filedialog.py
-@@ -25,6 +25,8 @@
-
- # Python module imports.
- from os import chdir, getcwd
-+import wxversion
-+wxversion.select("2.8")
- import wx
-
- # relax module imports.
-diff --git a/gui/fonts.py b/gui/fonts.py
-index 4a5cb32..7674d1a 100644
---- a/gui/fonts.py
-+++ b/gui/fonts.py
-@@ -23,6 +23,8 @@
- """A standard set of font definitions for consistency throughout the GUI."""
-
- # Python module imports.
-+import wxversion
-+wxversion.select("2.8")
- import wx
-
- # relax module imports.
-diff --git a/gui/icons.py b/gui/icons.py
-index 43bc885..53639ff 100644
---- a/gui/icons.py
-+++ b/gui/icons.py
-@@ -25,6 +25,8 @@
- # Python module imports.
- from os import sep
- import sys
-+import wxversion
-+wxversion.select("2.8")
- import wx
-
- # relax module imports.
-diff --git a/gui/input_elements/bool.py b/gui/input_elements/bool.py
-index 4fbe165..cb0df2d 100644
---- a/gui/input_elements/bool.py
-+++ b/gui/input_elements/bool.py
-@@ -23,6 +23,8 @@
- """Module containing a set of special GUI elements to be used in the relax wizards."""
-
- # Python module imports.
-+import wxversion
-+wxversion.select("2.8")
- import wx
-
- # relax module imports.
-diff --git a/gui/input_elements/combo_list.py b/gui/input_elements/combo_list.py
-index 456bf3b..13fc006 100644
---- a/gui/input_elements/combo_list.py
-+++ b/gui/input_elements/combo_list.py
-@@ -24,6 +24,8 @@
-
- # Python module imports.
- from copy import deepcopy
-+import wxversion
-+wxversion.select("2.8")
- import wx
-
- # relax module imports.
-diff --git a/gui/input_elements/dir.py b/gui/input_elements/dir.py
-index 18476cb..f705e8b 100644
---- a/gui/input_elements/dir.py
-+++ b/gui/input_elements/dir.py
-@@ -23,6 +23,8 @@
- """Module containing a set of special GUI elements to be used in the relax wizards."""
-
- # Python module imports.
-+import wxversion
-+wxversion.select("2.8")
- import wx
-
- # relax module imports.
-diff --git a/gui/input_elements/file.py b/gui/input_elements/file.py
-index 9dbc0c6..3e78914 100644
---- a/gui/input_elements/file.py
-+++ b/gui/input_elements/file.py
-@@ -23,6 +23,8 @@
- """Module containing a set of special GUI elements to be used in the relax wizards."""
-
- # Python module imports.
-+import wxversion
-+wxversion.select("2.8")
- import wx
-
- # relax module imports.
-diff --git a/gui/input_elements/sequence.py b/gui/input_elements/sequence.py
-index b719a21..db72993 100644
---- a/gui/input_elements/sequence.py
-+++ b/gui/input_elements/sequence.py
-@@ -23,6 +23,8 @@
- """Module containing a set of special GUI elements to be used in the relax wizards."""
-
- # Python module imports.
-+import wxversion
-+wxversion.select("2.8")
- import wx
- import wx.lib.mixins.listctrl
-
-diff --git a/gui/input_elements/sequence_2D.py b/gui/input_elements/sequence_2D.py
-index 140d762..5103675 100644
---- a/gui/input_elements/sequence_2D.py
-+++ b/gui/input_elements/sequence_2D.py
-@@ -24,6 +24,8 @@
-
- # Python module imports.
- import sys
-+import wxversion
-+wxversion.select("2.8")
- import wx
- import wx.lib.mixins.listctrl
-
-diff --git a/gui/input_elements/spin_id.py b/gui/input_elements/spin_id.py
-index f8114c3..40cd905 100644
---- a/gui/input_elements/spin_id.py
-+++ b/gui/input_elements/spin_id.py
-@@ -24,6 +24,8 @@
-
- # Python module imports.
- from copy import deepcopy
-+import wxversion
-+wxversion.select("2.8")
- import wx
-
- # relax module imports.
-diff --git a/gui/input_elements/value.py b/gui/input_elements/value.py
-index c3b6c0a..16e7c03 100644
---- a/gui/input_elements/value.py
-+++ b/gui/input_elements/value.py
-@@ -24,6 +24,8 @@
-
- # Python module imports.
- from copy import deepcopy
-+import wxversion
-+wxversion.select("2.8")
- import wx
-
- # relax module imports.
-diff --git a/gui/interpreter.py b/gui/interpreter.py
-index 7587669..a2c7298 100644
---- a/gui/interpreter.py
-+++ b/gui/interpreter.py
-@@ -27,6 +27,8 @@ import sys
- from threading import Thread
- from time import sleep
- from traceback import print_exc
-+import wxversion
-+wxversion.select("2.8")
- import wx
-
- # relax module imports.
-diff --git a/gui/menu.py b/gui/menu.py
-index 958b6e4..74cf867 100644
---- a/gui/menu.py
-+++ b/gui/menu.py
-@@ -25,6 +25,8 @@
-
- # Python module imports.
- import sys
-+import wxversion
-+wxversion.select("2.8")
- import wx
-
- # relax module imports.
-diff --git a/gui/message.py b/gui/message.py
-index cbeffb4..25cc012 100644
---- a/gui/message.py
-+++ b/gui/message.py
-@@ -22,6 +22,8 @@
-
- # Python module imports
- import sys
-+import wxversion
-+wxversion.select("2.8")
- import wx
- import wx.lib.buttons
- import wx.lib.scrolledpanel
-diff --git a/gui/misc.py b/gui/misc.py
-index 1416b1b..0387317 100644
---- a/gui/misc.py
-+++ b/gui/misc.py
-@@ -29,6 +29,8 @@ import os
- import platform
- import sys
- from textwrap import wrap
-+import wxversion
-+wxversion.select("2.8")
- import wx
-
- # relax module imports.
-diff --git a/gui/pipe_editor.py b/gui/pipe_editor.py
-index 41472da..3266314 100644
---- a/gui/pipe_editor.py
-+++ b/gui/pipe_editor.py
-@@ -23,6 +23,8 @@
- """The pipe editor GUI element."""
-
- # Python module imports.
-+import wxversion
-+wxversion.select("2.8")
- import wx
- import wx.grid
-
-diff --git a/gui/references.py b/gui/references.py
-index e9619ac..38d0e81 100644
---- a/gui/references.py
-+++ b/gui/references.py
-@@ -24,6 +24,8 @@
-
- # Python module imports.
- import webbrowser
-+import wxversion
-+wxversion.select("2.8")
- import wx
- import wx.html
-
-diff --git a/gui/relax_gui.py b/gui/relax_gui.py
-index b452c01..778ac7c 100644
---- a/gui/relax_gui.py
-+++ b/gui/relax_gui.py
-@@ -31,6 +31,8 @@ import sys
- from textwrap import wrap
- from time import sleep
- import webbrowser
-+import wxversion
-+wxversion.select("2.8")
- import wx
-
- # relax module imports.
-diff --git a/gui/relax_prompt.py b/gui/relax_prompt.py
-index bd27cea..f47ab97 100644
---- a/gui/relax_prompt.py
-+++ b/gui/relax_prompt.py
-@@ -24,6 +24,8 @@
-
- # Python module imports.
- import sys
-+import wxversion
-+wxversion.select("2.8")
- import wx
- import wx.py
- import wx.stc as stc
-diff --git a/gui/results_viewer.py b/gui/results_viewer.py
-index 7938c74..80e4171 100644
---- a/gui/results_viewer.py
-+++ b/gui/results_viewer.py
-@@ -24,6 +24,8 @@
- """Module containing the base class for the results frame."""
-
- # Python module imports.
-+import wxversion
-+wxversion.select("2.8")
- import wx
- from wx.lib import buttons
-
-diff --git a/gui/spin_viewer/containers.py b/gui/spin_viewer/containers.py
-index 58a6da9..4e104cd 100644
---- a/gui/spin_viewer/containers.py
-+++ b/gui/spin_viewer/containers.py
-@@ -25,6 +25,8 @@
-
- # Python module imports.
- from re import search
-+import wxversion
-+wxversion.select("2.8")
- import wx
-
- # relax module imports.
-diff --git a/gui/spin_viewer/frame.py b/gui/spin_viewer/frame.py
-index c22be26..3538939 100644
---- a/gui/spin_viewer/frame.py
-+++ b/gui/spin_viewer/frame.py
-@@ -23,6 +23,8 @@
- """The spin viewer frame."""
-
- # Python module imports.
-+import wxversion
-+wxversion.select("2.8")
- import wx
-
- # relax module imports.
-diff --git a/gui/spin_viewer/splitter.py b/gui/spin_viewer/splitter.py
-index 3366813..f899b30 100644
---- a/gui/spin_viewer/splitter.py
-+++ b/gui/spin_viewer/splitter.py
-@@ -24,6 +24,8 @@
-
-
- # Python module imports.
-+import wxversion
-+wxversion.select("2.8")
- import wx
-
- # relax module imports.
-diff --git a/gui/spin_viewer/tree.py b/gui/spin_viewer/tree.py
-index d8a8323..a719c58 100644
---- a/gui/spin_viewer/tree.py
-+++ b/gui/spin_viewer/tree.py
-@@ -24,6 +24,8 @@
-
-
- # Python module imports.
-+import wxversion
-+wxversion.select("2.8")
- import wx
-
- # relax module imports.
-diff --git a/gui/uf_objects.py b/gui/uf_objects.py
-index 254e1b0..0aec336 100644
---- a/gui/uf_objects.py
-+++ b/gui/uf_objects.py
-@@ -24,6 +24,8 @@
-
- # Python module imports.
- from re import search
-+import wxversion
-+wxversion.select("2.8")
- import wx
- from wx.lib import scrolledpanel
- import sys
-diff --git a/gui/wizards/peak_intensity.py b/gui/wizards/peak_intensity.py
-index a44d13f..ee84247 100644
---- a/gui/wizards/peak_intensity.py
-+++ b/gui/wizards/peak_intensity.py
-@@ -25,6 +25,8 @@
-
- # Python module imports.
- from os import sep
-+import wxversion
-+wxversion.select("2.8")
- import wx
- from wx.lib import scrolledpanel
-
-diff --git a/gui/wizards/wiz_objects.py b/gui/wizards/wiz_objects.py
-index a6e7f8b..16a180a 100644
---- a/gui/wizards/wiz_objects.py
-+++ b/gui/wizards/wiz_objects.py
-@@ -23,6 +23,8 @@
- """Base class module for the wizard GUI elements."""
-
- # Python module imports.
-+import wxversion
-+wxversion.select("2.8")
- import wx
- from wx.lib import buttons, scrolledpanel
-
-diff --git a/pipe_control/reset.py b/pipe_control/reset.py
-index d79872d..f778eb5 100644
---- a/pipe_control/reset.py
-+++ b/pipe_control/reset.py
-@@ -24,6 +24,8 @@ import dep_check
-
- # Python module imports.
- if dep_check.wx_module:
-+ import wxversion
-+ wxversion.select("2.8")
- import wx
-
- # relax module imports.
-diff --git a/test_suite/gui_tests/__init__.py b/test_suite/gui_tests/__init__.py
-index e79e796..48f4050 100644
---- a/test_suite/gui_tests/__init__.py
-+++ b/test_suite/gui_tests/__init__.py
-@@ -25,6 +25,8 @@
- # Python module imports.
- from re import search
- from unittest import TestSuite
-+import wxversion
-+wxversion.select("2.8")
- import wx
-
- # relax module imports.
-diff --git a/test_suite/gui_tests/base_classes.py b/test_suite/gui_tests/base_classes.py
-index c976bc1..787d8f6 100644
---- a/test_suite/gui_tests/base_classes.py
-+++ b/test_suite/gui_tests/base_classes.py
-@@ -27,6 +27,8 @@ from math import pi # This is needed for relax scripts as pi is located in th
- from os import sep
- from tempfile import mktemp, mkdtemp
- from unittest import TestCase
-+import wxversion
-+wxversion.select("2.8")
- import wx
-
- # relax module imports.
-diff --git a/test_suite/gui_tests/model_free.py b/test_suite/gui_tests/model_free.py
-index acf17e8..f3db394 100644
---- a/test_suite/gui_tests/model_free.py
-+++ b/test_suite/gui_tests/model_free.py
-@@ -21,6 +21,8 @@
-
- # Python module imports.
- from os import sep
-+import wxversion
-+wxversion.select("2.8")
- import wx
-
- # relax module imports.
-diff --git a/test_suite/gui_tests/noe.py b/test_suite/gui_tests/noe.py
-index 54c1e67..defc414 100644
---- a/test_suite/gui_tests/noe.py
-+++ b/test_suite/gui_tests/noe.py
-@@ -21,6 +21,8 @@
-
- # Python module imports.
- from os import F_OK, access, sep
-+import wxversion
-+wxversion.select("2.8")
- import wx
-
- # relax module imports.
-diff --git a/test_suite/gui_tests/rx.py b/test_suite/gui_tests/rx.py
-index c5ce2a3..cc8ac4d 100644
---- a/test_suite/gui_tests/rx.py
-+++ b/test_suite/gui_tests/rx.py
-@@ -21,6 +21,8 @@
-
- # Python module imports.
- from os import F_OK, access, sep
-+import wxversion
-+wxversion.select("2.8")
- import wx
-
- # relax module imports.
-diff --git a/test_suite/gui_tests/state.py b/test_suite/gui_tests/state.py
-index 3d96f43..4342950 100644
---- a/test_suite/gui_tests/state.py
-+++ b/test_suite/gui_tests/state.py
-@@ -21,6 +21,8 @@
-
- # Python module imports.
- from os import sep
-+import wxversion
-+wxversion.select("2.8")
- import wx
-
- # relax module imports.
-diff --git a/test_suite/relax_test_runner.py b/test_suite/relax_test_runner.py
-index 7154576..3ed921e 100644
---- a/test_suite/relax_test_runner.py
-+++ b/test_suite/relax_test_runner.py
-@@ -25,6 +25,8 @@ import sys
- from time import time
- from unittest import TextTestRunner
- if dep_check.wx_module:
-+ import wxversion
-+ wxversion.select("2.8")
- import wx
-
- # relax module imports.
-diff --git a/test_suite/test_suite_runner.py b/test_suite/test_suite_runner.py
-index b010e8f..23e8c66 100644
---- a/test_suite/test_suite_runner.py
-+++ b/test_suite/test_suite_runner.py
-@@ -26,6 +26,8 @@ import dep_check
- import os
- import sys
- if dep_check.wx_module:
-+ import wxversion
-+ wxversion.select("2.8")
- import wx
-
- # Formatting.
+++ /dev/null
---- trunk/sample_scripts/relax_disp/R1rho_analysis.py 2013/11/29 09:40:25 21705
-+++ trunk/sample_scripts/relax_disp/R1rho_analysis.py 2013/11/29 09:42:22 21706
-@@ -58,16 +58,16 @@
- # Set up the data pipe.
- #######################
-
-+# The path to the data files.
-+DATA_PATH = '../../test_suite/shared_data/dispersion/r1rho_off_res_tp02'
-+
- # Create the data pipe.
- pipe_name = 'base pipe'
- pipe_bundle = 'relax_disp'
- pipe.create(pipe_name=pipe_name, bundle=pipe_bundle, pipe_type='relax_disp')
-
--# The path to the data files.
--data_path = 'r1rho_off_res_tp02'
--
- # Load the sequence.
--sequence.read('fake_sequence.in', res_num_col=1, res_name_col=2)
-+sequence.read('fake_sequence.in', dir=DATA_PATH, res_num_col=1, res_name_col=2)
-
- # Name the spins so they can be matched to the assignments.
- spin.name(name='N')
-@@ -77,37 +77,37 @@
-
- # The spectral data - spectrum ID, peak list file name, spin-lock field strength (Hz), the spin-lock offset (ppm), the relaxation time (s), spectrometer frequency (Hz), and experimental error (RMSD of the base plane noise for each spectrum).
- data = [
-- ['ref_500MHz', 'ref_500MHz.list', None, 110.0, 0.1, 500e6, 200000.0]
-- ['nu_1000.0_500MHz', 'nu_1000.0_500MHz.list', 1000.0, 110.0, 0.1, 500e6, 200000.0]
-- ['nu_1500.0_500MHz', 'nu_1500.0_500MHz.list', 1500.0, 110.0, 0.1, 500e6, 200000.0]
-- ['nu_2000.0_500MHz', 'nu_2000.0_500MHz.list', 2000.0, 110.0, 0.1, 500e6, 200000.0]
-- ['nu_2500.0_500MHz', 'nu_2500.0_500MHz.list', 2500.0, 110.0, 0.1, 500e6, 200000.0]
-- ['nu_3000.0_500MHz', 'nu_3000.0_500MHz.list', 3000.0, 110.0, 0.1, 500e6, 200000.0]
-- ['nu_3500.0_500MHz', 'nu_3500.0_500MHz.list', 3500.0, 110.0, 0.1, 500e6, 200000.0]
-- ['nu_4000.0_500MHz', 'nu_4000.0_500MHz.list', 4000.0, 110.0, 0.1, 500e6, 200000.0]
-- ['nu_4500.0_500MHz', 'nu_4500.0_500MHz.list', 4500.0, 110.0, 0.1, 500e6, 200000.0]
-- ['nu_5000.0_500MHz', 'nu_5000.0_500MHz.list', 5000.0, 110.0, 0.1, 500e6, 200000.0]
-- ['nu_5500.0_500MHz', 'nu_5500.0_500MHz.list', 5500.0, 110.0, 0.1, 500e6, 200000.0]
-- ['nu_6000.0_500MHz', 'nu_6000.0_500MHz.list', 6000.0, 110.0, 0.1, 500e6, 200000.0]
-- ['ref_800MHz', 'ref_800MHz.list', None, 110.0, 0.1, 800e6, 200000.0]
-- ['nu_1000.0_800MHz', 'nu_1000.0_800MHz.list', 1000.0, 110.0, 0.1, 800e6, 200000.0]
-- ['nu_1500.0_800MHz', 'nu_1500.0_800MHz.list', 1500.0, 110.0, 0.1, 800e6, 200000.0]
-- ['nu_2000.0_800MHz', 'nu_2000.0_800MHz.list', 2000.0, 110.0, 0.1, 800e6, 200000.0]
-- ['nu_2500.0_800MHz', 'nu_2500.0_800MHz.list', 2500.0, 110.0, 0.1, 800e6, 200000.0]
-- ['nu_3000.0_800MHz', 'nu_3000.0_800MHz.list', 3000.0, 110.0, 0.1, 800e6, 200000.0]
-- ['nu_3500.0_800MHz', 'nu_3500.0_800MHz.list', 3500.0, 110.0, 0.1, 800e6, 200000.0]
-- ['nu_4000.0_800MHz', 'nu_4000.0_800MHz.list', 4000.0, 110.0, 0.1, 800e6, 200000.0]
-- ['nu_4500.0_800MHz', 'nu_4500.0_800MHz.list', 4500.0, 110.0, 0.1, 800e6, 200000.0]
-- ['nu_5000.0_800MHz', 'nu_5000.0_800MHz.list', 5000.0, 110.0, 0.1, 800e6, 200000.0]
-- ['nu_5500.0_800MHz', 'nu_5500.0_800MHz.list', 5500.0, 110.0, 0.1, 800e6, 200000.0]
-+ ['ref_500MHz', 'ref_500MHz.list', None, 110.0, 0.1, 500e6, 200000.0],
-+ ['nu_1000.0_500MHz', 'nu_1000.0_500MHz.list', 1000.0, 110.0, 0.1, 500e6, 200000.0],
-+ ['nu_1500.0_500MHz', 'nu_1500.0_500MHz.list', 1500.0, 110.0, 0.1, 500e6, 200000.0],
-+ ['nu_2000.0_500MHz', 'nu_2000.0_500MHz.list', 2000.0, 110.0, 0.1, 500e6, 200000.0],
-+ ['nu_2500.0_500MHz', 'nu_2500.0_500MHz.list', 2500.0, 110.0, 0.1, 500e6, 200000.0],
-+ ['nu_3000.0_500MHz', 'nu_3000.0_500MHz.list', 3000.0, 110.0, 0.1, 500e6, 200000.0],
-+ ['nu_3500.0_500MHz', 'nu_3500.0_500MHz.list', 3500.0, 110.0, 0.1, 500e6, 200000.0],
-+ ['nu_4000.0_500MHz', 'nu_4000.0_500MHz.list', 4000.0, 110.0, 0.1, 500e6, 200000.0],
-+ ['nu_4500.0_500MHz', 'nu_4500.0_500MHz.list', 4500.0, 110.0, 0.1, 500e6, 200000.0],
-+ ['nu_5000.0_500MHz', 'nu_5000.0_500MHz.list', 5000.0, 110.0, 0.1, 500e6, 200000.0],
-+ ['nu_5500.0_500MHz', 'nu_5500.0_500MHz.list', 5500.0, 110.0, 0.1, 500e6, 200000.0],
-+ ['nu_6000.0_500MHz', 'nu_6000.0_500MHz.list', 6000.0, 110.0, 0.1, 500e6, 200000.0],
-+ ['ref_800MHz', 'ref_800MHz.list', None, 110.0, 0.1, 800e6, 200000.0],
-+ ['nu_1000.0_800MHz', 'nu_1000.0_800MHz.list', 1000.0, 110.0, 0.1, 800e6, 200000.0],
-+ ['nu_1500.0_800MHz', 'nu_1500.0_800MHz.list', 1500.0, 110.0, 0.1, 800e6, 200000.0],
-+ ['nu_2000.0_800MHz', 'nu_2000.0_800MHz.list', 2000.0, 110.0, 0.1, 800e6, 200000.0],
-+ ['nu_2500.0_800MHz', 'nu_2500.0_800MHz.list', 2500.0, 110.0, 0.1, 800e6, 200000.0],
-+ ['nu_3000.0_800MHz', 'nu_3000.0_800MHz.list', 3000.0, 110.0, 0.1, 800e6, 200000.0],
-+ ['nu_3500.0_800MHz', 'nu_3500.0_800MHz.list', 3500.0, 110.0, 0.1, 800e6, 200000.0],
-+ ['nu_4000.0_800MHz', 'nu_4000.0_800MHz.list', 4000.0, 110.0, 0.1, 800e6, 200000.0],
-+ ['nu_4500.0_800MHz', 'nu_4500.0_800MHz.list', 4500.0, 110.0, 0.1, 800e6, 200000.0],
-+ ['nu_5000.0_800MHz', 'nu_5000.0_800MHz.list', 5000.0, 110.0, 0.1, 800e6, 200000.0],
-+ ['nu_5500.0_800MHz', 'nu_5500.0_800MHz.list', 5500.0, 110.0, 0.1, 800e6, 200000.0],
- ['nu_6000.0_800MHz', 'nu_6000.0_800MHz.list', 6000.0, 110.0, 0.1, 800e6, 200000.0]
- ]
-
- # Loop over the spectra.
- for id, file, field, offset, relax_time, H_frq, rmsd in data:
- # Load the peak intensities and set the errors.
-- spectrum.read_intensities(file=file, dir=data_path, spectrum_id=id, int_method='height')
-- spectrum.baseplane_rmsd(spectrum_id=id, error=error)
-+ spectrum.read_intensities(file=file, dir=DATA_PATH, spectrum_id=id, int_method='height')
-+ spectrum.baseplane_rmsd(spectrum_id=id, error=rmsd)
-
- # Set the relaxation dispersion experiment type.
- relax_disp.exp_type(spectrum_id=id, exp_type='R1rho')
-@@ -125,18 +125,17 @@
- spectrometer.frequency(id=id, frq=H_frq)
-
- # Load the R1 data.
--relax_data.read(ri_id='500MHz', ri_type='R1', frq=500e6, file='R1_500MHz.out', dir=data_path, mol_name_col=1, res_num_col=2, res_name_col=3, spin_num_col=4, spin_name_col=5, data_col=6, error_col=7)
--relax_data.read(ri_id='800MHz', ri_type='R1', frq=800e6, file='R1_800MHz.out', dir=data_path, mol_name_col=1, res_num_col=2, res_name_col=3, spin_num_col=4, spin_name_col=5, data_col=6, error_col=7)
-+relax_data.read(ri_id='500MHz', ri_type='R1', frq=500e6, file='R1_500MHz.out', dir=DATA_PATH, mol_name_col=1, res_num_col=2, res_name_col=3, spin_num_col=4, spin_name_col=5, data_col=6, error_col=7)
-+relax_data.read(ri_id='800MHz', ri_type='R1', frq=800e6, file='R1_800MHz.out', dir=DATA_PATH, mol_name_col=1, res_num_col=2, res_name_col=3, spin_num_col=4, spin_name_col=5, data_col=6, error_col=7)
-
--# Clustering.
--relax_disp.cluster(cluster_id='cluster', spin_id=':1-50')
-+# Clustering (only to be activated after an initial analysis without clustering).
-+#relax_disp.cluster(cluster_id='cluster', spin_id=':1-50')
-
- # Read the chemical shift data.
--chemical_shift.read(file='ref_500MHz.list', dir=data_path)
-+chemical_shift.read(file='ref_500MHz.list', dir=DATA_PATH)
-
- # Deselect unresolved spins.
--deselect.read(file='unresolved', dir='500_MHz', res_num_col=1)
--deselect.read(file='unresolved', dir='800_MHz', res_num_col=1)
-+deselect.read(file='unresolved', dir=DATA_PATH, res_num_col=1)
-
-
-
+++ /dev/null
- sample_scripts/relax_disp/R1rho_analysis.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/sample_scripts/relax_disp/R1rho_analysis.py b/sample_scripts/relax_disp/R1rho_analysis.py
-index 1dcbf68..11d6f97 100644
---- a/sample_scripts/relax_disp/R1rho_analysis.py
-+++ b/sample_scripts/relax_disp/R1rho_analysis.py
-@@ -77,7 +77,7 @@ spin.isotope(isotope='15N')
-
- # The spectral data - spectrum ID, peak list file name, spin-lock field strength (Hz), the spin-lock offset (ppm), the relaxation time (s), spectrometer frequency (Hz), and experimental error (RMSD of the base plane noise for each spectrum).
- data = [
-- ['ref_500MHz', 'ref_500MHz.list', , None, 110.0, 0.1, 500e6, 200000.0]
-+ ['ref_500MHz', 'ref_500MHz.list', None, 110.0, 0.1, 500e6, 200000.0]
- ['nu_1000.0_500MHz', 'nu_1000.0_500MHz.list', 1000.0, 110.0, 0.1, 500e6, 200000.0]
- ['nu_1500.0_500MHz', 'nu_1500.0_500MHz.list', 1500.0, 110.0, 0.1, 500e6, 200000.0]
- ['nu_2000.0_500MHz', 'nu_2000.0_500MHz.list', 2000.0, 110.0, 0.1, 500e6, 200000.0]
-@@ -89,7 +89,7 @@ data = [
- ['nu_5000.0_500MHz', 'nu_5000.0_500MHz.list', 5000.0, 110.0, 0.1, 500e6, 200000.0]
- ['nu_5500.0_500MHz', 'nu_5500.0_500MHz.list', 5500.0, 110.0, 0.1, 500e6, 200000.0]
- ['nu_6000.0_500MHz', 'nu_6000.0_500MHz.list', 6000.0, 110.0, 0.1, 500e6, 200000.0]
-- ['ref_800MHz', 'ref_800MHz.list', , None, 110.0, 0.1, 800e6, 200000.0]
-+ ['ref_800MHz', 'ref_800MHz.list', None, 110.0, 0.1, 800e6, 200000.0]
- ['nu_1000.0_800MHz', 'nu_1000.0_800MHz.list', 1000.0, 110.0, 0.1, 800e6, 200000.0]
- ['nu_1500.0_800MHz', 'nu_1500.0_800MHz.list', 1500.0, 110.0, 0.1, 800e6, 200000.0]
- ['nu_2000.0_800MHz', 'nu_2000.0_800MHz.list', 2000.0, 110.0, 0.1, 800e6, 200000.0]
+++ /dev/null
---- trunk/pipe_control/diffusion_tensor.py 2014/05/14 09:36:17 23171
-+++ trunk/pipe_control/diffusion_tensor.py 2014/05/14 16:32:29 23172
-@@ -364,7 +364,7 @@
- if cdp.diff_tensor.type == 'sphere':
- tensor_info_table(type='sphere', tm=cdp.diff_tensor.tm, Diso=cdp.diff_tensor.Diso, fixed=cdp.diff_tensor.fixed)
- elif cdp.diff_tensor.type == 'spheroid':
-- tensor_info_table(type='spheroid', tm=cdp.diff_tensor.tm, Diso=cdp.diff_tensor.Diso, Da=cdp.diff_tensor.Da, Dpar=cdp.diff_tensor.Dpar, Dper=cdp.diff_tensor.Dpar, Dratio=cdp.diff_tensor.Dratio, theta=cdp.diff_tensor.theta, phi=cdp.diff_tensor.phi, fixed=cdp.diff_tensor.fixed)
-+ tensor_info_table(type='spheroid', tm=cdp.diff_tensor.tm, Diso=cdp.diff_tensor.Diso, Da=cdp.diff_tensor.Da, Dpar=cdp.diff_tensor.Dpar, Dper=cdp.diff_tensor.Dper, Dratio=cdp.diff_tensor.Dratio, theta=cdp.diff_tensor.theta, phi=cdp.diff_tensor.phi, fixed=cdp.diff_tensor.fixed)
- elif cdp.diff_tensor.type == 'ellipsoid':
- tensor_info_table(type='ellipsoid', tm=cdp.diff_tensor.tm, Diso=cdp.diff_tensor.Diso, Da=cdp.diff_tensor.Da, Dr=cdp.diff_tensor.Dr, Dx=cdp.diff_tensor.Dx, Dy=cdp.diff_tensor.Dy, Dz=cdp.diff_tensor.Dz, alpha=cdp.diff_tensor.alpha, beta=cdp.diff_tensor.beta, gamma=cdp.diff_tensor.gamma, fixed=cdp.diff_tensor.fixed)
-
+++ /dev/null
- sconstruct | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/sconstruct b/sconstruct
-index 511a6dd..fc2d6de 100644
---- a/sconstruct
-+++ b/sconstruct
-@@ -25,7 +25,7 @@
-
-
- # Import statements.
--from os import F_OK, access, getcwd, path, remove, rmdir, sep, walk
-+from os import F_OK, access, getcwd, path, remove, rmdir, sep, walk, environ
- import platform
- from re import search
- from shutil import rmtree
-@@ -630,6 +630,11 @@ class Main:
- for file in files:
- nodes.append(env.SharedObject(dir + path.sep + file, CCFLAGS=cflags))
-
-+ env.Append(LINKFLAGS = environ['LDFLAGS'])
-+ env.Append(CFLAGS = environ['CFLAGS'])
-+ env.Replace(CC = environ['CC'])
-+
-+
- # Build the relaxation curve fitting module.
- self.relax_fit_object = env.SharedLibrary(target=dir + path.sep + 'relax_fit', source=nodes, SHLIBPREFIX=prefix, SHLIBSUFFIX=suffix)
-
projects / gentoo.git / commitdiff