diff --git a/.gitignore b/.gitignore index 827c22381..178739382 100644 --- a/.gitignore +++ b/.gitignore @@ -23,7 +23,7 @@ var/ .installed.cfg *.egg venv/ -wheelhouse/ +vendor/ # PyInstaller # Usually these files are written by a python script from a template diff --git a/Makefile b/Makefile index 56200d921..d1b7695b0 100644 --- a/Makefile +++ b/Makefile @@ -85,7 +85,9 @@ generate-version-file: ## Generates the app version file .PHONY: build build: dependencies generate-version-file ## Build project npm run build - . venv/bin/activate && PIP_ACCEL_CACHE=${PIP_ACCEL_CACHE} pip-accel wheel --wheel-dir=wheelhouse -r requirements.txt + . venv/bin/activate && PIP_ACCEL_CACHE=${PIP_ACCEL_CACHE} pip-accel install -r requirements.txt + mkdir -p vendor/ + cp -r ${PIP_ACCEL_CACHE}/sources/ vendor/ .PHONY: cf-build cf-build: dependencies generate-version-file ## Build project @@ -199,7 +201,7 @@ clean-docker-containers: ## Clean up any remaining docker containers .PHONY: clean clean: - rm -rf node_modules cache target venv .coverage wheelhouse + rm -rf node_modules cache target venv .coverage vendor .PHONY: cf-login cf-login: ## Log in to Cloud Foundry diff --git a/scripts/aws_install_dependencies.sh b/scripts/aws_install_dependencies.sh index c2c658c99..ccf5a6578 100755 --- a/scripts/aws_install_dependencies.sh +++ b/scripts/aws_install_dependencies.sh @@ -2,4 +2,4 @@ echo "Install dependencies" cd /home/notify-app/notifications-admin; -pip3 install --find-links=wheelhouse -r /home/notify-app/notifications-admin/requirements.txt +pip3 install --find-links=vendor -r /home/notify-app/notifications-admin/requirements.txt