diff --git a/Makefile b/Makefile index 570d47f..73c7110 100644 --- a/Makefile +++ b/Makefile @@ -13,28 +13,28 @@ build: reset statics dummy-data # --- dummy data --------------------------------------------------------------- -dummy-data: resolve-poetry resolve-environment +dummy-data: resolve-environment poetry run python dummy_data/make_random_tasks.py # --- CI ----------------------------------------------------------------------- local-ci: refactor lint tests -refactor: resolve-poetry resolve-environment +refactor: resolve-environment poetry run black . poetry run ruff --fix -lint: resolve-poetry resolve-environment +lint: resolve-environment poetry run ruff check poetry run mypy business_logic poetry run mypy web_interface poetry run mypy server -tests: resolve-poetry resolve-environment +tests: resolve-environment poetry run pytest business_logic --noconftest .PHONY: server -server: resolve-poetry resolve-environment +server: resolve-environment STATIC_FOLDER_NAME=$(static_folder_name) \ PATH_TO_TASK_DUMMY_DATA=$(path_to_task_dummy_data) \ poetry run uvicorn server.__main__:app --reload @@ -67,8 +67,10 @@ reset-statics: # --- deployment ------------------------------------------------------------- -netlify: resolve-poetry resolve-environment +netlify: resolve-environment build server +resolve-environment: resolve-poetry-on-unix + poetry install --sync resolve-poetry-on-unix: ifeq (, $(shell which poetry)) @@ -79,9 +81,6 @@ ifeq (, $(shell which poetry)) endif @echo "poetry resolved" -resolve-environment: resolve-poetry - poetry install --sync - # --- functions ---------------------------------------------------------------- # "build" will run the given 1 and pipe the stdout of 1 into 2 if 1 finishes without errors