From ae43d955331447092a64bb73f7d4ed97102486fb Mon Sep 17 00:00:00 2001 From: Dmitry Shemetov Date: Wed, 11 Sep 2024 11:18:34 -0700 Subject: [PATCH 1/3] fix: build-indicators.sh looks for setup.py again Reverting a premature change. --- jenkins/build-indicator.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jenkins/build-indicator.sh b/jenkins/build-indicator.sh index 84006767c..584d0dbbc 100755 --- a/jenkins/build-indicator.sh +++ b/jenkins/build-indicator.sh @@ -17,4 +17,4 @@ source env/bin/activate pip install pip==23.0.1 --retries 10 --timeout 20 pip install numpy --retries 10 --timeout 20 pip install ../_delphi_utils_python/. --retries 10 --timeout 20 -[ ! -f pyproject.toml ] || pip install . --retries 10 --timeout 20 +[ ! -f setup.py ] || pip install . --retries 10 --timeout 20 From f1e1543e322d1e0c229332e66af9e1c11a038d18 Mon Sep 17 00:00:00 2001 From: Dmitry Shemetov Date: Wed, 11 Sep 2024 13:29:53 -0700 Subject: [PATCH 2/3] fix: readability and future-proof --- jenkins/build-indicator.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jenkins/build-indicator.sh b/jenkins/build-indicator.sh index 584d0dbbc..2e6dcca8f 100755 --- a/jenkins/build-indicator.sh +++ b/jenkins/build-indicator.sh @@ -17,4 +17,4 @@ source env/bin/activate pip install pip==23.0.1 --retries 10 --timeout 20 pip install numpy --retries 10 --timeout 20 pip install ../_delphi_utils_python/. --retries 10 --timeout 20 -[ ! -f setup.py ] || pip install . --retries 10 --timeout 20 +([ -f setup.py ] || [ -f pyproject.toml ]) && pip install . --retries 10 --timeout 20 From e6df5a0665f5d99de8e4b28b3519b1da29fce6ae Mon Sep 17 00:00:00 2001 From: Dmitry Shemetov Date: Wed, 11 Sep 2024 13:44:15 -0700 Subject: [PATCH 3/3] fix: more readability --- jenkins/build-indicator.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/jenkins/build-indicator.sh b/jenkins/build-indicator.sh index 2e6dcca8f..88f79424a 100755 --- a/jenkins/build-indicator.sh +++ b/jenkins/build-indicator.sh @@ -17,4 +17,6 @@ source env/bin/activate pip install pip==23.0.1 --retries 10 --timeout 20 pip install numpy --retries 10 --timeout 20 pip install ../_delphi_utils_python/. --retries 10 --timeout 20 -([ -f setup.py ] || [ -f pyproject.toml ]) && pip install . --retries 10 --timeout 20 +if [ -f setup.py ] || [ -f pyproject.toml ]; then + pip install . --retries 10 --timeout 20 +fi