From 3ea29e634c1e1a20a1f6f84f56ed8881e570d7c2 Mon Sep 17 00:00:00 2001 From: Guilhem Bonnefille <guilhem.bonnefille@c-s.fr> Date: Tue, 9 Nov 2021 13:44:27 +0000 Subject: [PATCH] fix: Use PIP_OPTS for setup.py based install The PIP_OPTS varenv is needed both when using requirement.txt or setup.py. --- templates/gitlab-ci-python.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/templates/gitlab-ci-python.yml b/templates/gitlab-ci-python.yml index adb60a2..5f8e3c9 100644 --- a/templates/gitlab-ci-python.yml +++ b/templates/gitlab-ci-python.yml @@ -106,7 +106,8 @@ variables: pip install ${PIP_OPTS} -r "${REQUIREMENTS_FILE}" elif [[ -f "${SETUP_PY_DIR}/setup.py" ]]; then log_info "--- installing from ${SETUP_PY_DIR}/setup.py file" - pip install "${SETUP_PY_DIR}/" + # shellcheck disable=SC2086 + pip install ${PIP_OPTS} "${SETUP_PY_DIR}/" else log_info "--- no requirements or setup.py file found from env or file ${REQUIREMENTS_FILE} - ${SETUP_PY_DIR}/setup.py does not exist" fi @@ -129,7 +130,8 @@ variables: pip install ${PIP_OPTS} -r "${DOCS_REQUIREMENTS_FILE}" elif [[ -f "${SETUP_PY_DIR}/setup.py" ]]; then log_info "--- installing from ${SETUP_PY_DIR}/setup.py file" - pip install "${SETUP_PY_DIR}/" + # shellcheck disable=SC2086 + pip install ${PIP_OPTS} "${SETUP_PY_DIR}/" else log_info "--- no doc requirements file found from env or file ${DOCS_REQUIREMENTS_FILE} - ${SETUP_PY_DIR}/setup.py does not exist" fi -- GitLab