From 5f4a92d0620e8a2ecaf6ed148c532568485bdfd6 Mon Sep 17 00:00:00 2001 From: Alexandru Fikl Date: Wed, 26 Jun 2024 19:09:15 +0300 Subject: [PATCH] fix conditional for disable-editable-pip-install --- ci-support.sh | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/ci-support.sh b/ci-support.sh index 4f437d1..3a13c3e 100644 --- a/ci-support.sh +++ b/ci-support.sh @@ -259,14 +259,10 @@ pip_install_project() # Append --editable to PROJECT_INSTALL_FLAGS, if not there already and if not # disabled. if ! test -f setup.cfg || ! grep -q disable-editable-pip-install setup.cfg; then - if [[ ! $PROJECT_INSTALL_FLAGS =~ (^|[[:space:]]*)(--editable|-e)[[:space:]]*$ ]]; then - PROJECT_INSTALL_FLAGS="$PROJECT_INSTALL_FLAGS --editable" - fi - fi - - if ! test -f pyproject.toml || ! grep -q disable-editable-pip-install pyproject.toml; then - if [[ ! $PROJECT_INSTALL_FLAGS =~ (^|[[:space:]]*)(--editable|-e)[[:space:]]*$ ]]; then - PROJECT_INSTALL_FLAGS="$PROJECT_INSTALL_FLAGS --editable" + if ! test -f pyproject.toml || ! tomlsh pyproject.toml has-key tool.inducer-ci-support.disable-editable-pip-install; then + if [[ ! $PROJECT_INSTALL_FLAGS =~ (^|[[:space:]]*)(--editable|-e)[[:space:]]*$ ]]; then + PROJECT_INSTALL_FLAGS="$PROJECT_INSTALL_FLAGS --editable" + fi fi fi -- GitLab