From ec6418b3183faf1ff94bfea537fcb981e4cb4494 Mon Sep 17 00:00:00 2001 From: jrconlin Date: Tue, 23 Aug 2016 11:24:50 -0700 Subject: [PATCH] bug: update Makefile to use correct requirements closes #548 --- Makefile | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index a69890e4..a3c5b15a 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,12 @@ APPNAME = autopush DEPS = HERE = $(shell pwd) PTYPE=pypy -BIN = $(HERE)/pypy/bin +ifneq ($(PTYPE), python) + REQS=$(PTYPE)-requirements.txt +else + REQS=requirements.txt +endif +BIN = $(HERE)/$(PTYPE)/bin VIRTUALENV = virtualenv TESTS = $(APPNAME)/tests PYTHON = $(BIN)/$(PTYPE) @@ -37,9 +42,12 @@ $(BIN)/flake8: $(BIN)/pip $(INSTALL) flake8 $(BIN)/paster: lib $(BIN)/pip - $(INSTALL) -r requirements.txt + $(INSTALL) -r $(REQS) $(PYTHON) setup.py develop +$(PYTHON): + $(VIRTUALENV) $(PTYPE) -p $(PTYPE) + clean-env: rm -rf *.egg-info rm -rf $(BUILD_DIRS) @@ -47,7 +55,7 @@ clean-env: clean: clean-env build: $(BIN)/pip - $(INSTALL) -r requirements.txt + $(INSTALL) -r $(REQS) $(PYTHON) setup.py develop test: $(BIN)/tox $(HERE)/ddb