From 97d9fbb5f4bfb0d38aca5f620cbd7e8f891e3f47 Mon Sep 17 00:00:00 2001
From: Andre Anjos <andre.anjos@idiap.ch>
Date: Fri, 23 Sep 2016 11:32:59 +0200
Subject: [PATCH] Rename PYTHON_VER -> PYTHON_VERSION
---
gitlab/functions.sh | 4 ++--
templates/ci-for-cxx-extensions.yml | 12 ++++++------
templates/ci-for-python-only.yml | 12 ++++++------
3 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/gitlab/functions.sh b/gitlab/functions.sh
index ca37ba0..8b6d09a 100644
--- a/gitlab/functions.sh
+++ b/gitlab/functions.sh
@@ -106,7 +106,7 @@ doc_upload() {
log_info "Successfully uploaded ${1} with curl"
}
-check_env PYTHON_VER
+check_env PYTHON_VERSION
check_env CI_PROJECT_DIR
check_env CI_PROJECT_PATH
check_env CI_PROJECT_NAME
@@ -156,7 +156,7 @@ else
CXXFLAGS=${CFLAGS}
fi
-PYVER=py$(echo ${PYTHON_VER} | tr -d '.')
+PYVER=py$(echo ${PYTHON_VERSION} | tr -d '.')
BOB_PREFIX_PATH=${CONDA_FOLDER}/envs/bob-devel-${PYVER}
BOB_DOCUMENTATION_SERVER="${DOCSERVER}/software/bob/docs/latest/bob/%s/master/"
diff --git a/templates/ci-for-cxx-extensions.yml b/templates/ci-for-cxx-extensions.yml
index dfeb26f..a61544c 100644
--- a/templates/ci-for-cxx-extensions.yml
+++ b/templates/ci-for-cxx-extensions.yml
@@ -108,7 +108,7 @@ stages:
build_linux_27:
<<: *build_job
variables: &linux_27_build_variables
- PYTHON_VER: "2.7"
+ PYTHON_VERSION: "2.7"
tags:
- conda-linux
@@ -132,7 +132,7 @@ wheels_linux_27:
build_linux_34:
<<: *build_job
variables: &linux_34_build_variables
- PYTHON_VER: "3.4"
+ PYTHON_VERSION: "3.4"
tags:
- conda-linux
@@ -149,7 +149,7 @@ test_linux_34:
build_linux_35:
<<: *build_job
variables: &linux_35_build_variables
- PYTHON_VER: "3.5"
+ PYTHON_VERSION: "3.5"
tags:
- conda-linux
@@ -188,7 +188,7 @@ deploy_linux_35:
build_macosx_27:
<<: *build_job
variables: &macosx_27_build_variables
- PYTHON_VER: "2.7"
+ PYTHON_VERSION: "2.7"
tags:
- conda-macosx
@@ -205,7 +205,7 @@ test_macosx_27:
build_macosx_34:
<<: *build_job
variables: &macosx_34_build_variables
- PYTHON_VER: "3.4"
+ PYTHON_VERSION: "3.4"
tags:
- conda-macosx
@@ -222,7 +222,7 @@ test_macosx_34:
build_macosx_35:
<<: *build_job
variables: &macosx_35_build_variables
- PYTHON_VER: "3.5"
+ PYTHON_VERSION: "3.5"
tags:
- conda-macosx
diff --git a/templates/ci-for-python-only.yml b/templates/ci-for-python-only.yml
index 84dcfa0..4b23130 100644
--- a/templates/ci-for-python-only.yml
+++ b/templates/ci-for-python-only.yml
@@ -108,7 +108,7 @@ stages:
build_linux_27:
<<: *build_job
variables: &linux_27_build_variables
- PYTHON_VER: "2.7"
+ PYTHON_VERSION: "2.7"
WHEEL_TAG: "py27"
tags:
- conda-linux
@@ -133,7 +133,7 @@ wheels_linux_27:
build_linux_34:
<<: *build_job
variables: &linux_34_build_variables
- PYTHON_VER: "3.4"
+ PYTHON_VERSION: "3.4"
WHEEL_TAG: "py3"
tags:
- conda-linux
@@ -151,7 +151,7 @@ test_linux_34:
build_linux_35:
<<: *build_job
variables: &linux_35_build_variables
- PYTHON_VER: "3.5"
+ PYTHON_VERSION: "3.5"
WHEEL_TAG: "py3"
tags:
- conda-linux
@@ -191,7 +191,7 @@ deploy_linux_35:
build_macosx_27:
<<: *build_job
variables: &macosx_27_build_variables
- PYTHON_VER: "2.7"
+ PYTHON_VERSION: "2.7"
WHEEL_TAG: "py27"
tags:
- conda-macosx
@@ -209,7 +209,7 @@ test_macosx_27:
build_macosx_34:
<<: *build_job
variables: &macosx_34_build_variables
- PYTHON_VER: "3.4"
+ PYTHON_VERSION: "3.4"
WHEEL_TAG: "py3"
tags:
- conda-macosx
@@ -227,7 +227,7 @@ test_macosx_34:
build_macosx_35:
<<: *build_job
variables: &macosx_35_build_variables
- PYTHON_VER: "3.5"
+ PYTHON_VERSION: "3.5"
WHEEL_TAG: "py3"
tags:
- conda-macosx
--
GitLab