From 12e9b081d90da6ac1572fcaccf8bbf377977ba72 Mon Sep 17 00:00:00 2001
From: Taylor Hanayik <taylor.hanayik@ndcn.ox.ac.uk>
Date: Tue, 21 May 2019 15:07:37 +0100
Subject: [PATCH] ENH: update fslversion call for the future :hash version
---
AUTHOR | 3 ++-
fsl/utils/platform.py | 5 ++++-
tests/test_platform.py | 4 ++--
3 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/AUTHOR b/AUTHOR
index 1a1c06ae3..b2501296d 100644
--- a/AUTHOR
+++ b/AUTHOR
@@ -2,4 +2,5 @@ Paul McCarthy <pauldmccarthy@gmail.com>
Michiel Cottaar <michiel.cottaar@ndcn.ox.ac.uk>
Matthew Webster <matthew.webster@ndcn.ox.ac.uk>
Sean Fitzgibbon <sean.fitzgibbon@ndcn.ox.ac.uk>
-Martin Craig <martin.craig@eng.ox.ac.uk>
\ No newline at end of file
+Martin Craig <martin.craig@eng.ox.ac.uk>
+Taylor Hanayik <taylor.hanayik@ndcn.ox.ac.uk>
\ No newline at end of file
diff --git a/fsl/utils/platform.py b/fsl/utils/platform.py
index 1d33d80b1..04ffb98d6 100644
--- a/fsl/utils/platform.py
+++ b/fsl/utils/platform.py
@@ -287,7 +287,10 @@ class Platform(notifier.Notifier):
if op.exists(versionFile):
with open(versionFile, 'rt') as f:
- self.__fslVersion = f.read().strip()
+ # split string at colon for new hash style versions
+ # first object in list is the non-hashed version string (e.g. 6.0.2)
+ # if no ":hash:" then standard FSL version string is still returned
+ self.__fslVersion = f.read().strip().split(":")[0]
self.notify(value=value)
diff --git a/tests/test_platform.py b/tests/test_platform.py
index 67aefe094..a747ac03a 100644
--- a/tests/test_platform.py
+++ b/tests/test_platform.py
@@ -161,7 +161,7 @@ def test_fsldir():
def makeFSL():
os.makedirs(op.join(fsldir, 'etc'))
with open(op.join(fsldir, 'etc', 'fslversion'), 'wt') as f:
- f.write('Dummy FSL\n')
+ f.write('6.0.2:7606e0d8\n')
try:
@@ -182,7 +182,7 @@ def test_fsldir():
assert os.environ['FSLDIR'] == fsldir
assert newFSLDir[0] == fsldir
assert p.fsldir == fsldir
- assert p.fslVersion == 'Dummy FSL'
+ assert p.fslVersion == '6.0.2'
finally:
shutil.rmtree(testdir)
--
GitLab