From 4319316e696e7bd7b0ec59daa8078f8001002056 Mon Sep 17 00:00:00 2001 From: Pamela Fox Date: Wed, 12 Jun 2024 21:45:00 -0700 Subject: [PATCH 1/2] Improve the bash scripts --- scripts/load_python_env.sh | 8 ++++++++ scripts/setup_postgres_azurerole.sh | 4 +++- scripts/setup_postgres_database.sh | 4 +++- scripts/setup_postgres_seeddata. | 0 scripts/setup_postgres_seeddata.sh | 4 +++- 5 files changed, 17 insertions(+), 3 deletions(-) create mode 100755 scripts/load_python_env.sh create mode 100644 scripts/setup_postgres_seeddata. diff --git a/scripts/load_python_env.sh b/scripts/load_python_env.sh new file mode 100755 index 00000000..58d7a045 --- /dev/null +++ b/scripts/load_python_env.sh @@ -0,0 +1,8 @@ + #!/bin/sh + +echo 'Creating Python virtual environment in .venv...' +python3 -m venv .venv + +echo 'Installing dependencies from "requirements.txt" into virtual environment (in quiet mode)...' +.venv/bin/python -m pip --quiet --disable-pip-version-check install -e src +.venv/bin/python -m pip --quiet --disable-pip-version-check install -r requirements-dev.txt diff --git a/scripts/setup_postgres_azurerole.sh b/scripts/setup_postgres_azurerole.sh index 4a507c44..d750ddc8 100755 --- a/scripts/setup_postgres_azurerole.sh +++ b/scripts/setup_postgres_azurerole.sh @@ -7,4 +7,6 @@ if [ -z "$POSTGRES_HOST" ] || [ -z "$POSTGRES_USERNAME" ] || [ -z "$APP_IDENTITY exit 1 fi -python ./src/fastapi_app/setup_postgres_azurerole.py --host $POSTGRES_HOST --username $POSTGRES_USERNAME --app-identity-name $APP_IDENTITY_NAME \ No newline at end of file +. ./scripts/load_python_env.sh + +.venv/bin/python ./src/fastapi_app/setup_postgres_azurerole.py --host $POSTGRES_HOST --username $POSTGRES_USERNAME --app-identity-name $APP_IDENTITY_NAME diff --git a/scripts/setup_postgres_database.sh b/scripts/setup_postgres_database.sh index 3d63ce77..add480ca 100755 --- a/scripts/setup_postgres_database.sh +++ b/scripts/setup_postgres_database.sh @@ -2,4 +2,6 @@ POSTGRES_HOST=$(azd env get-values | grep POSTGRES_HOST | sed 's/="/=/' | sed 's POSTGRES_USERNAME=$(azd env get-values | grep POSTGRES_USERNAME | sed 's/="/=/' | sed 's/"$//' | sed 's/^POSTGRES_USERNAME=//') POSTGRES_DATABASE=$(azd env get-values | grep POSTGRES_DATABASE | sed 's/="/=/' | sed 's/"$//' | sed 's/^POSTGRES_DATABASE=//') -python ./src/fastapi_app/setup_postgres_database.py --host $POSTGRES_HOST --username $POSTGRES_USERNAME --database $POSTGRES_DATABASE \ No newline at end of file +. ./scripts/load_python_env.sh + +.venv/bin/python ./src/fastapi_app/setup_postgres_database.py --host $POSTGRES_HOST --username $POSTGRES_USERNAME --database $POSTGRES_DATABASE diff --git a/scripts/setup_postgres_seeddata. b/scripts/setup_postgres_seeddata. new file mode 100644 index 00000000..e69de29b diff --git a/scripts/setup_postgres_seeddata.sh b/scripts/setup_postgres_seeddata.sh index 4ae9c031..0422d389 100755 --- a/scripts/setup_postgres_seeddata.sh +++ b/scripts/setup_postgres_seeddata.sh @@ -2,4 +2,6 @@ POSTGRES_HOST=$(azd env get-values | grep POSTGRES_HOST | sed 's/="/=/' | sed 's POSTGRES_USERNAME=$(azd env get-values | grep POSTGRES_USERNAME | sed 's/="/=/' | sed 's/"$//' | sed 's/^POSTGRES_USERNAME=//') POSTGRES_DATABASE=$(azd env get-values | grep POSTGRES_DATABASE | sed 's/="/=/' | sed 's/"$//' | sed 's/^POSTGRES_DATABASE=//') -python ./src/fastapi_app/setup_postgres_seeddata.py --host $POSTGRES_HOST --username $POSTGRES_USERNAME --database $POSTGRES_DATABASE \ No newline at end of file +. ./scripts/load_python_env.sh + +.venv/bin/python ./src/fastapi_app/setup_postgres_seeddata.py --host $POSTGRES_HOST --username $POSTGRES_USERNAME --database $POSTGRES_DATABASE From 4f85bc1cb0319b020189ae014afb7ba06075bcb7 Mon Sep 17 00:00:00 2001 From: Pamela Fox Date: Wed, 12 Jun 2024 21:48:56 -0700 Subject: [PATCH 2/2] Weirdly added file --- scripts/setup_postgres_seeddata. | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 scripts/setup_postgres_seeddata. diff --git a/scripts/setup_postgres_seeddata. b/scripts/setup_postgres_seeddata. deleted file mode 100644 index e69de29b..00000000