From 64d5cc8c1f6e7ef5382195196a853bb98c9a8618 Mon Sep 17 00:00:00 2001 From: Avery Kiihne Date: Wed, 6 Nov 2024 16:50:13 -0500 Subject: [PATCH] git fixes --- fre/pp/checkoutScript.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/fre/pp/checkoutScript.py b/fre/pp/checkoutScript.py index dc8f08af..55e4870e 100644 --- a/fre/pp/checkoutScript.py +++ b/fre/pp/checkoutScript.py @@ -20,7 +20,7 @@ ############################################# -def _checkoutTemplate(experiment, platform, target, branch='main'): +def _checkoutTemplate(experiment, platform, target): """ Checkout the workflow template files from the repo """ @@ -53,10 +53,7 @@ def _checkoutTemplate(experiment, platform, target, branch='main'): cloneproc = subprocess.run(clonecmd, shell=True, check=False, stdout=PIPE, stderr=STDOUT) if branch == 'main': - local_version = subprocess.run(['fre' ,'--version']) - if local_version != '2024.01': - subprocess.run(['git' ,'checkout' ,'tags/2024.01']) - + subprocess.run('git checkout tags/2024.01') if not cloneproc.returncode == 0: if re.search(preexist_error.encode('ASCII'),cloneproc.stdout) is not None: argstring = f" -e {experiment} -p {platform} -t {target}"