From e0569efdbd88be0565d9fc93f8cc01528d4c971e Mon Sep 17 00:00:00 2001
From: MADELA Patrick <patrick.madela@synchrotron-soleil.fr>
Date: Fri, 21 Feb 2025 17:05:04 +0100
Subject: [PATCH] Fix python version for conda forge image
---
conan-el7-gcc114-conda-forge/.gitlab-ci.yml | 2 +-
conan-el7-gcc114-conda-forge/environment.yml | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/conan-el7-gcc114-conda-forge/.gitlab-ci.yml b/conan-el7-gcc114-conda-forge/.gitlab-ci.yml
index 8f45f27..f38a58e 100644
--- a/conan-el7-gcc114-conda-forge/.gitlab-ci.yml
+++ b/conan-el7-gcc114-conda-forge/.gitlab-ci.yml
@@ -35,7 +35,7 @@ test:
- docker run ${DOCKER_RUN_EXTRA_OPTIONS} --rm ${CONTAINER_TEST_IMAGE} gcc --version | grep "11.4.0"
- docker run ${DOCKER_RUN_EXTRA_OPTIONS} --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.31.5"
- docker run ${DOCKER_RUN_EXTRA_OPTIONS} --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.47.1"
- - docker run ${DOCKER_RUN_EXTRA_OPTIONS} --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.13.1"
+ - docker run ${DOCKER_RUN_EXTRA_OPTIONS} --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.13.2"
- docker run ${DOCKER_RUN_EXTRA_OPTIONS} --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.12.1"
- docker run ${DOCKER_RUN_EXTRA_OPTIONS} --rm ${CONTAINER_TEST_IMAGE} jq --version | grep "1.7.1"
- docker run ${DOCKER_RUN_EXTRA_OPTIONS} --rm ${CONTAINER_TEST_IMAGE} yq --version | grep "3.4.3"
diff --git a/conan-el7-gcc114-conda-forge/environment.yml b/conan-el7-gcc114-conda-forge/environment.yml
index d3845fe..b0e394b 100644
--- a/conan-el7-gcc114-conda-forge/environment.yml
+++ b/conan-el7-gcc114-conda-forge/environment.yml
@@ -2,6 +2,7 @@ name: conan-el7-gcc114
channels:
- conda-forge
dependencies:
+- python=3.13.2
- cmake=3.31.5
- make=4.4.1
- autoconf=2.71
--
GitLab