Yup: relax_disp_speed -s tlinnet@linmac:disp_speed$ cd $s; git svn info Path: . URL: svn+ssh://svn.gna.org/svn/relax/branches/disp_speed Repository Root: svn+ssh://svn.gna.org/svn/relax Repository UUID: b7916896-f9f9-0310-9fe5-b3996d8957d5 Revision: 23372 Node Kind: directory Schedule: normal Last Changed Author: tlinnet Last Changed Rev: 23372 Last Changed Date: 2014-05-23 10:30:49 +0200 (Fri, 23 May 2014) 2014-05-23 10:42 GMT+02:00 Edward d'Auvergne <edward@xxxxxxxxxxxxx>:
Hi, Cheers. The change I made at r23366 (http://article.gmane.org/gmane.science.nmr.relax.scm/21112) however replaces this with: $ cd $s; git svn info Does this work for you? Regards, Edward On 23 May 2014 10:38, Troels Emtekær Linnet <tlinnet@xxxxxxxxxxxxx> wrote:Hi Ed. It still does not work: But relax> from status import Status; status = Status() relax> print status.install_path /Users/tlinnet/software/disp_speed relax> tlinnet@linmac:disp_speed$ s=/Users/tlinnet/software/disp_speed tlinnet@linmac:disp_speed$ cd $s; git svn find-rev $(git rev-parse HEAD) 23372 2014-05-23 9:21 GMT+02:00 Edward d'Auvergne <edward@xxxxxxxxxxxxx>:Hi, I just made another simplification for the git-svn version.py support: r23366: http://article.gmane.org/gmane.science.nmr.relax.scm/21112 Once this issue is resolved, I'll look at releasing relax 3.2.1 with all the recent bugfixes. Cheers, Edward On 23 May 2014 09:12, Edward d'Auvergne <edward@xxxxxxxxxxxxx> wrote:Hi Troels, If that change doesn't work, could you try running: $ cd %s; git svn find-rev $(git rev-parse HEAD) where the %s is replaced by the value of status.install_path. This is the command in the version file for obtaining the subversion revision number from a git-svn copy. Or: $ cd %s; git svn info This is the command used to find the repository URL. These two bits of information are used for the relax intro text, which used to look like: """ relax repository checkout rNone None Molecular dynamics by NMR data analysis Copyright (C) 2001-2006 Edward d'Auvergne Copyright (C) 2006-2014 the relax development team """ But this new git-svn support: """ relax repository checkout r23365 svn+ssh://svn.gna.org/svn/relax/trunk Molecular dynamics by NMR data analysis Copyright (C) 2001-2006 Edward d'Auvergne Copyright (C) 2006-2014 the relax development team """ Maybe there is a shell incompatibility with one of these commands, so make sure you use the 'cd %s; ' part to check that too. Cheers, Edward On 23 May 2014 09:05, Edward d'Auvergne <edward@xxxxxxxxxxxxx> wrote:Hi, I first thought that it might have been this test suite printout change: r23360: http://article.gmane.org/gmane.science.nmr.relax.scm/21105 But now, with that last message, it's clear that it is these two to the version.py module: r23345: http://article.gmane.org/gmane.science.nmr.relax.scm/21088 r23343: http://article.gmane.org/gmane.science.nmr.relax.scm/21090 The git-svn support for extracting the repository information I added mustn't be functioning as I expected. I've attempted a fix at: r23365: http://article.gmane.org/gmane.science.nmr.relax.scm/21111 Cheers, Edward On 22 May 2014 22:58, Troels E. Linnet <NO-REPLY.INVALID-ADDRESS@xxxxxxx> wrote:Follow-up Comment #2, bug #22071 (project relax): If I break, this comes: File "./relax", line 7, in <module> relax.start(profile_flag=False) File "/sbinlab2/tlinnet/software/NMR-relax/relax_trunk/relax.py", line 118, in start processor.run() File "/sbinlab2/tlinnet/software/NMR-relax/relax_trunk/multi/processor.py", line 494, in run self.callback.init_master(self) File "/sbinlab2/tlinnet/software/NMR-relax/relax_trunk/multi/__init__.py", line 318, in default_init_master self.master.run() File "/sbinlab2/tlinnet/software/NMR-relax/relax_trunk/relax.py", line 246, in run runner.run_unit_tests() File "/sbinlab2/tlinnet/software/NMR-relax/relax_trunk/test_suite/test_suite_runner.py", line 192, in run_unit_tests self.unit_result = unit_runner.run(runner=self.runner) File "/sbinlab2/tlinnet/software/NMR-relax/relax_trunk/test_suite/unit_tests/unit_test_runner.py", line 624, in run finder.scan_paths() File "/sbinlab2/tlinnet/software/NMR-relax/relax_trunk/test_suite/unit_tests/unit_test_runner.py", line 378, in scan_paths test_case = load_test_case(dir_path, module_name, class_name) File "/sbinlab2/tlinnet/software/NMR-relax/relax_trunk/test_suite/unit_tests/unit_test_runner.py", line 316, in load_test_case return TestLoader().loadTestsFromTestCase(clazz) File "/sbinlab2/tlinnet/software/NMR-relax/relax_trunk/test_suite/relax_test_loader.py", line 56, in loadTestsFromTestCase test_case = testCaseClass(testCaseNames[i]) File "/sbinlab2/tlinnet/software/NMR-relax/relax_trunk/test_suite/unit_tests/_prompt/test_spectrum.py", line 43, in __init__ self.interpreter = Interpreter(show_script=False, raise_relax_error=True) File "/sbinlab2/tlinnet/software/NMR-relax/relax_trunk/prompt/interpreter.py", line 87, in __init__ self.__intro_string = info.intro_text() File "/sbinlab2/tlinnet/software/NMR-relax/relax_trunk/info.py", line 287, in intro_text text2 = "%s" % (url()) File "/sbinlab2/tlinnet/software/NMR-relax/relax_trunk/version.py", line 120, in url if not pipe.stderr.readlines(): _______________________________________________________ Reply to this item at: <http://gna.org/bugs/?22071> _______________________________________________ Message sent via/by Gna! http://gna.org/ _______________________________________________ relax (http://www.nmr-relax.com) This is the relax-devel mailing list relax-devel@xxxxxxx 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-devel