From a759a30d262765136ac602b12e7e966e52debe12 Mon Sep 17 00:00:00 2001 From: Olivier Kaloudoff Date: Sat, 12 Dec 2020 17:52:43 +0100 Subject: [PATCH 1/2] Fix pip call, add version $(VIRTUAL_ENV)/bin/pip$(PYTHON) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index fcceb7d6..fe5e3d2f 100644 --- a/Makefile +++ b/Makefile @@ -28,10 +28,10 @@ $(BUILD_DIR)/gitfs: $(BUILD_DIR) $(VIRTUAL_ENV)/bin/pex $(VIRTUAL_ENV)/bin/pex -v --disable-cache -r requirements.txt -e gitfs:mount -o $(BUILD_DIR)/gitfs . $(VIRTUAL_ENV)/bin/pex: virtualenv - $(VIRTUAL_ENV)/bin/pip install pex wheel + $(VIRTUAL_ENV)/bin/pip$(PYTHON) install pex wheel $(VIRTUAL_ENV)/bin/mkdocs: virtualenv - $(VIRTUAL_ENV)/bin/pip install mkdocs + $(VIRTUAL_ENV)/bin/pip$(PYTHON) install mkdocs $(BUILD_DIR): mkdir -p $(BUILD_DIR) From c4b58e8abe146b6de32bcc191191cd845af2d16d Mon Sep 17 00:00:00 2001 From: Olivier Kaloudoff Date: Sat, 12 Dec 2020 17:55:55 +0100 Subject: [PATCH 2/2] Fix missing path $(VIRTUAL_ENV) when calling virtualenv --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index fe5e3d2f..bdc80741 100644 --- a/Makefile +++ b/Makefile @@ -43,7 +43,7 @@ $(VIRTUAL_ENV)/bin/pip2.7: virtualenv --setuptools $(VIRTUAL_ENV) $(VIRTUAL_ENV)/bin/pip%: - virtualenv --setuptools $(VIRTUAL_ENV) -ppython$* + virtualenv $(VIRTUAL_ENV) --setuptools $(VIRTUAL_ENV) -ppython$* virtualenv: $(VIRTUAL_ENV)/bin/pip$(PYTHON)