Move bootstrap tasks into the Makefile

This is more consistent with how we run all other tasks. Note that
the virtual env setup is not generally applicable, and developers
of this repo should follow the guidance in the README.
This commit is contained in:
Ben Thorner
2021-02-17 17:22:45 +00:00
parent dc6fb1d1f2
commit af95ad68ea
3 changed files with 8 additions and 41 deletions

View File

@@ -21,6 +21,12 @@ NOTIFY_CREDENTIALS ?= ~/.notify-credentials
## DEVELOPMENT ## DEVELOPMENT
.PHONY: bootstrap
bootstrap: generate-version-file
pip3 install -r requirements_for_test.txt
createdb notification_api
. environment.sh && flask db upgrade
.PHONY: run-flask .PHONY: run-flask
run-flask: run-flask:
. environment.sh && flask run -p 6011 . environment.sh && flask run -p 6011

View File

@@ -59,7 +59,7 @@ To switch redis on you'll need to install it locally. On a OSX we've used brew f
``` ```
# install dependencies, etc. # install dependencies, etc.
./scripts/bootstrap.sh make bootstrap
# run the web app # run the web app
make run-flask make run-flask
@@ -75,7 +75,7 @@ make run-celery-beat
``` ```
# install dependencies, etc. # install dependencies, etc.
./scripts/bootstrap.sh make bootstrap
make test make test
``` ```

View File

@@ -1,39 +0,0 @@
#!/bin/bash
#
# Bootstrap virtualenv environment and postgres databases locally.
#
# NOTE: This script expects to be run from the project root with
# ./scripts/bootstrap.sh
set -o pipefail
function display_result {
RESULT=$1
EXIT_STATUS=$2
TEST=$3
if [ $RESULT -ne 0 ]; then
echo -e "\033[31m$TEST failed\033[0m"
exit $EXIT_STATUS
else
echo -e "\033[32m$TEST passed\033[0m"
fi
}
if [ ! $VIRTUAL_ENV ]; then
virtualenv -p python3 ./venv
. ./venv/bin/activate
fi
# we need the version file to exist otherwise the app will blow up
make generate-version-file
# Install Python development dependencies
pip3 install -r requirements_for_test.txt
# Create Postgres databases
createdb notification_api
# Upgrade databases
source environment.sh
flask db upgrade