From 8c73b5738721a8aabbc9004ec69277f27782d6a0 Mon Sep 17 00:00:00 2001
From: Thomas BAUDIER <thomas.baudier@creatis.insa-lyon.fr>
Date: Mon, 8 Jan 2024 11:59:29 +0100
Subject: [PATCH] Change minimal version of gaga-phsp and garf

Ignore tests test066_spect_gaga_garf_4_analyse1.py and test066_spect_gaga_garf_5_analyse2.py because for the moment they lead to errors. They need output data from previous tests and they do not create data, just compare them
---
 .github/workflows/main.yml     | 3 +--
 opengate/actors/arfactors.py   | 2 +-
 opengate/bin/opengate_tests    | 2 ++
 opengate/sources/gansources.py | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index bff6f8a1f..e9e05a1b1 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -363,8 +363,7 @@ jobs:
             pip install torch
           fi
           pip install SimpleITK
-          pip install gaga_phsp
-          pip install garf
+          pip install gaga_phsp==0.7.1
           pip install dist/opengate_core-*-${PYTHONFOLDER}-${OSNAME}*_${PLATFORM}64.whl
           pip install dist/opengate-*.whl
           export GIT_SSL_NO_VERIFY=1
diff --git a/opengate/actors/arfactors.py b/opengate/actors/arfactors.py
index 01e796244..ef7dec418 100644
--- a/opengate/actors/arfactors.py
+++ b/opengate/actors/arfactors.py
@@ -30,7 +30,7 @@ def import_garf():
     from packaging import version
 
     garf_version = pkg_resources.get_distribution("garf").version
-    garf_minimal_version = "2.4"
+    garf_minimal_version = "2.5"
     if version.parse(garf_version) < version.parse(garf_minimal_version):
         fatal(
             "The minimal version of garf is not correct. You should install at least the version "
diff --git a/opengate/bin/opengate_tests b/opengate/bin/opengate_tests
index 599f3a0c5..85364624f 100755
--- a/opengate/bin/opengate_tests
+++ b/opengate/bin/opengate_tests
@@ -64,6 +64,8 @@ def go(test_id, random_tests):
         "test066_spect_gaga_garf_1_reference.py",  # ignored because reference data (too long)
         "test066_spect_gaga_garf_2.py",  # ignored because reference data (too long, GPU)
         "test066_spect_gaga_garf_3_standalone.py",  # ignored because too long (GPU)
+        "test066_spect_gaga_garf_4_analyse1.py",
+        "test066_spect_gaga_garf_5_analyse2.py",
     ]
 
     onlyfiles = [
diff --git a/opengate/sources/gansources.py b/opengate/sources/gansources.py
index c7231688f..5bae26db5 100644
--- a/opengate/sources/gansources.py
+++ b/opengate/sources/gansources.py
@@ -35,7 +35,7 @@ def import_gaga_phsp():
     from packaging import version
 
     gaga_version = pkg_resources.get_distribution("gaga_phsp").version
-    gaga_minimal_version = "0.7.0"
+    gaga_minimal_version = "0.7.1"
     if version.parse(gaga_version) < version.parse(gaga_minimal_version):
         fatal(
             "The minimal version of gaga_phsp is not correct. You should install at least the version "