From 82b8321d07c434b1766dca1018f747892f68cb3a Mon Sep 17 00:00:00 2001 From: Imdad Ahad Date: Fri, 21 Jul 2017 11:06:00 +0100 Subject: [PATCH 1/2] Revert "Remove vendor folder before building artefact" --- Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 409133150..f834c6cb7 100644 --- a/Makefile +++ b/Makefile @@ -86,8 +86,7 @@ generate-version-file: ## Generates the app version file build: dependencies generate-version-file ## Build project npm run build . venv/bin/activate && PIP_ACCEL_CACHE=${PIP_ACCEL_CACHE} pip-accel install -r requirements.txt - rm -rf vendor - mkdir -p vendor + mkdir -p vendor/ cp ${PIP_ACCEL_CACHE}/sources/* vendor/ .PHONY: cf-build From 85a59746a0b54186bbe431acb3ed08660f2e3021 Mon Sep 17 00:00:00 2001 From: Imdad Ahad Date: Fri, 21 Jul 2017 11:21:17 +0100 Subject: [PATCH 2/2] Revert d06a72 and 6b9b1be but keep the wheel-removal changes --- .gitignore | 1 - Makefile | 4 +--- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 178739382..39a0e630d 100644 --- a/.gitignore +++ b/.gitignore @@ -23,7 +23,6 @@ var/ .installed.cfg *.egg venv/ -vendor/ # PyInstaller # Usually these files are written by a python script from a template diff --git a/Makefile b/Makefile index f834c6cb7..e255be409 100644 --- a/Makefile +++ b/Makefile @@ -86,8 +86,6 @@ generate-version-file: ## Generates the app version file build: dependencies generate-version-file ## Build project npm run build . venv/bin/activate && PIP_ACCEL_CACHE=${PIP_ACCEL_CACHE} pip-accel install -r requirements.txt - mkdir -p vendor/ - cp ${PIP_ACCEL_CACHE}/sources/* vendor/ .PHONY: cf-build cf-build: dependencies generate-version-file ## Build project @@ -201,7 +199,7 @@ clean-docker-containers: ## Clean up any remaining docker containers .PHONY: clean clean: - rm -rf node_modules cache target venv .coverage vendor + rm -rf node_modules cache target venv .coverage .PHONY: cf-login cf-login: ## Log in to Cloud Foundry