r24388 - in /branches/frame_order_cleanup: ./ lib/structure/internal/object.py version.py -- July 02, 2014 - 09:34

Author: bugman
Date: Wed Jul  2 09:34:29 2014
New Revision: 24388

URL: http://svn.gna.org/viewcvs/relax?rev=24388&view=rev
Log:
Merged revisions 24386 via svnmerge from 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk

........
  r24386 | bugman | 2014-07-02 09:06:16 +0200 (Wed, 02 Jul 2014) | 10 lines
  
  Fix for the software verification tests.
  
  The recent expansion and improvements of the REMARK records created by the 
internal structural
  object PDB writing method imported the relax version to place this 
information into the PDB files.
  However this breaks the relax library design, as shown by the verification 
tests.  Instead the relax
  version information is being taken from the 
lib.structure.internal.object.RELAX_VERSION variable.
  This defaults to None, however the version module now sets this variable 
directly when it is
  imported so that it is always set to the current relax version when running 
relax.
........

Modified:
    branches/frame_order_cleanup/   (props changed)
    branches/frame_order_cleanup/lib/structure/internal/object.py
    branches/frame_order_cleanup/version.py

Propchange: branches/frame_order_cleanup/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Jul  2 09:34:29 2014
@@ -1 +1 @@
-/trunk:1-24383
+/trunk:1-24383,24386

Modified: branches/frame_order_cleanup/lib/structure/internal/object.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/lib/structure/internal/object.py?rev=24388&r1=24387&r2=24388&view=diff
==============================================================================
--- branches/frame_order_cleanup/lib/structure/internal/object.py       
(original)
+++ branches/frame_order_cleanup/lib/structure/internal/object.py       Wed 
Jul  2 09:34:29 2014
@@ -44,11 +44,11 @@
 from lib.structure.internal.molecules import MolContainer
 from lib.warnings import RelaxWarning
 from lib.xml import object_to_xml, xml_to_object
-from version import version_full
 
 
 # Module variables.
 CHAIN_ID_LIST = 
'ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789abcdefghijklmnopqrstuvwxyz'
+RELAX_VERSION = None
 
 
 class Internal:
@@ -2460,7 +2460,8 @@
         pdb_write.remark(file, num=40, remark=None)
         pdb_write.remark(file, num=40, remark="Created using relax 
(http://www.nmr-relax.com).")
         pdb_write.remark(file, num=40, remark=None)
-        pdb_write.remark(file, num=40, remark="relax version %s." % 
version_full())
+        if RELAX_VERSION:
+            pdb_write.remark(file, num=40, remark="relax version %s." % 
RELAX_VERSION)
         pdb_write.remark(file, num=40, remark="Created on %s." % asctime())
         num_remark = 2
 

Modified: branches/frame_order_cleanup/version.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/version.py?rev=24388&r1=24387&r2=24388&view=diff
==============================================================================
--- branches/frame_order_cleanup/version.py     (original)
+++ branches/frame_order_cleanup/version.py     Wed Jul  2 09:34:29 2014
@@ -33,6 +33,7 @@
     from subprocess import PIPE, Popen
 
 # relax module imports.
+import lib.structure.internal.object
 from status import Status; status = Status()
 
 
@@ -116,3 +117,6 @@
 
 # Fetch the repository information, if present.
 repo_information()
+
+# Set the version in the relax internal structural object.
+lib.structure.internal.object.RELAX_VERSION = version_full()