From 34601fafbd41066a35feb8574359ba43fcaa227f Mon Sep 17 00:00:00 2001 From: Deepak Mallubhotla Date: Tue, 7 Jun 2022 17:30:26 -0500 Subject: [PATCH] nix: makes do.sh play better with nix --- do.sh | 38 ++++++++++++++++++++++++++++++++------ 1 file changed, 32 insertions(+), 6 deletions(-) diff --git a/do.sh b/do.sh index 1ab44f1..aa4a83b 100644 --- a/do.sh +++ b/do.sh @@ -4,30 +4,56 @@ set -Eeuo pipefail # -e "Automatic exit from bash shell script on error" -u "Treat unset variables and parameters as errors" +checknix() { + if [[ "${DO_NIX_CUSTOM:=0}" -eq 1 ]]; then + echo "In an interactive nix env." + else + echo "Using poetry as runner, no nix detected." + fi +} + build() { echo "I am ${FUNCNAME[0]}ing" poetry build } fmt() { - poetry run black . + if [[ "${DO_NIX_CUSTOM:=0}" -eq 1 ]]; then + black . + else + poetry run black . + fi find . -type f -name "*.py" -exec sed -i -e 's/ /\t/g' {} \; } test() { echo "I am ${FUNCNAME[0]}ing" - poetry run flake8 pyewjn tests - poetry run mypy pyewjn - poetry run pytest --benchmark-disable + if [[ "${DO_NIX_CUSTOM:=0}" -eq 1 ]]; then + flake8 pyewjn tests + mypy pyewjn + pytest --benchmark-disable + else + poetry run flake8 pyewjn tests + poetry run mypy pyewjn + poetry run pytest --benchmark-disable + fi } benchmark() { echo "I am ${FUNCNAME[0]}ing" - poetry run pytest --benchmark-only + if [[ "${DO_NIX_CUSTOM:=0}" -eq 1 ]]; then + pytest --benchmark-only + else + poetry run pytest --benchmark-only + fi } htmlcov() { - poetry run pytest --cov-report=html + if [[ "${DO_NIX_CUSTOM:=0}" -eq 1 ]]; then + pytest --cov-report=html + else + poetry run pytest --cov-report=html + fi } release() {