r23367 - in /branches/frame_order_cleanup: ./ test_suite/unit_tests/_lib/_dispersion/test_ns_cpmg_2site_expanded.py version.py -- May 23, 2014 - 09:19

Author: bugman
Date: Fri May 23 09:19:44 2014
New Revision: 23367

URL: http://svn.gna.org/viewcvs/relax?rev=23367&view=rev
Log:
Merged revisions 23362,23365-23366 via svnmerge from 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk

........
  r23362 | bugman | 2014-05-22 19:55:47 +0200 (Thu, 22 May 2014) | 9 lines
  
  Created the test_ns_cpmg_2site_expanded_no_rex8() relaxation dispersion 
unit test.
  
  This is a demonstration commit, showing the 'NS CPMG 2-site expanded' model 
with no exchange when
  kex = 1e5.  I.e. when the motion is too fast for exchange to be observed.  
This test should be used
  for all dispersion models to make sure that they model this edge case 
correctly as well.
  
  This follows from 
http://article.gmane.org/gmane.science.nmr.relax.devel/5906.
........
  r23365 | bugman | 2014-05-23 09:03:27 +0200 (Fri, 23 May 2014) | 7 lines
  
  Attempt at fixing bug #22071, the relax unit test and system test not 
functioning.
  
  This is reported at https://gna.org/bugs/?22071.
  
  The fix here is that the git commands to show the current subversion 
revision number only works when
  run from the relax base directory, or one of the subdirectories.  This 
should now be fixed, as the
  pipe running the command will first 'cd' to the relax base directory.
........
  r23366 | bugman | 2014-05-23 09:18:34 +0200 (Fri, 23 May 2014) | 6 lines
  
  Another attempt at fixing bug #22071, the relax unit test and system test 
not functioning.
  
  This is reported at https://gna.org/bugs/?22071.
  
  This time the complicated shell command "cd %s; git svn find-rev $(git 
rev-parse HEAD)" has been
  replaced with "cd %s; git svn info".
........

Modified:
    branches/frame_order_cleanup/   (props changed)
    
branches/frame_order_cleanup/test_suite/unit_tests/_lib/_dispersion/test_ns_cpmg_2site_expanded.py
    branches/frame_order_cleanup/version.py

Propchange: branches/frame_order_cleanup/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri May 23 09:19:44 2014
@@ -1 +1 @@
-/trunk:1-23360
+/trunk:1-23366

Modified: 
branches/frame_order_cleanup/test_suite/unit_tests/_lib/_dispersion/test_ns_cpmg_2site_expanded.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/unit_tests/_lib/_dispersion/test_ns_cpmg_2site_expanded.py?rev=23367&r1=23366&r2=23367&view=diff
==============================================================================
--- 
branches/frame_order_cleanup/test_suite/unit_tests/_lib/_dispersion/test_ns_cpmg_2site_expanded.py
  (original)
+++ 
branches/frame_order_cleanup/test_suite/unit_tests/_lib/_dispersion/test_ns_cpmg_2site_expanded.py
  Fri May 23 09:19:44 2014
@@ -57,7 +57,7 @@
 
         # Check all R2eff values.
         for i in range(self.num_points):
-            self.assertAlmostEqual(self.R2eff[i], 2.0)
+            self.assertAlmostEqual(self.R2eff[i], 2.0, 5)
 
 
     def param_conversion(self, pA=None, kex=None):
@@ -154,3 +154,13 @@
 
         # Calculate and check the R2eff values.
         self.calc_r2eff()
+
+
+    def test_ns_cpmg_2site_expanded_no_rex8(self):
+        """Test the r2eff_ns_cpmg_2site_expanded() function for no exchange 
when kex = 1e5."""
+
+        # Parameter reset.
+        self.kex = 1e5
+
+        # Calculate and check the R2eff values.
+        self.calc_r2eff()

Modified: branches/frame_order_cleanup/version.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/version.py?rev=23367&r1=23366&r2=23367&view=diff
==============================================================================
--- branches/frame_order_cleanup/version.py     (original)
+++ branches/frame_order_cleanup/version.py     Fri May 23 09:19:44 2014
@@ -71,7 +71,7 @@
                 return str(row[1])
 
     # Try git-svn, reading the output if there are no errors.
-    pipe = Popen('git svn find-rev $(git rev-parse HEAD)', shell=True, 
stdin=PIPE, stdout=PIPE, stderr=PIPE, close_fds=False)
+    pipe = Popen('cd %s; git svn info' % status.install_path, shell=True, 
stdin=PIPE, stdout=PIPE, stderr=PIPE, close_fds=False)
     if not pipe.stderr.readlines():
         # Loop over the output lines.
         for line in pipe.stdout.readlines():
@@ -79,9 +79,12 @@
             if hasattr(line, 'decode'):
                 line = line.decode()
 
+            # Split up the line.
+            row = line.split()
+
             # The revision.
-            if search('^[0-9]', line):
-                return str(line[:-1])
+            if len(row) and row[0] == 'Revision:':
+                return str(row[1])
 
 
 def url():