From b9347efae7e2f04687863f54e8db7d9e10f9dc6a Mon Sep 17 00:00:00 2001 From: Raphaël Barrois Date: Tue, 20 Oct 2015 22:51:35 +0200 Subject: examples: Fix make test (Closes #238) Properly install dependencies from examples folders. --- Makefile | 3 ++- examples/flask_alchemy/requirements.txt | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 79b5e82..35f635c 100644 --- a/Makefile +++ b/Makefile @@ -17,6 +17,7 @@ MONGOENGINE ?= 0.9 NEXT_MONGOENGINE = $(shell python -c "v='$(MONGOENGINE)'; parts=v.split('.'); parts[-1]=str(int(parts[-1])+1); print('.'.join(parts))") REQ_FILE = auto_dev_requirements_django$(DJANGO)_alchemy$(ALCHEMY)_mongoengine$(MONGOENGINE).txt +EXAMPLES_REQ_FILES = $(shell find $(EXAMPLES_DIR) -name requirements.txt) all: default @@ -29,7 +30,7 @@ install-deps: $(REQ_FILE) pip install --upgrade -r $< pip freeze -$(REQ_FILE): dev_requirements.txt requirements.txt +$(REQ_FILE): dev_requirements.txt requirements.txt $(EXAMPLES_REQ_FILES) grep --no-filename "^[^#-]" $^ | egrep -v "^(Django|SQLAlchemy|mongoengine)" > $@ echo "Django>=$(DJANGO),<$(NEXT_DJANGO)" >> $@ echo "SQLAlchemy>=$(ALCHEMY),<$(NEXT_ALCHEMY)" >> $@ diff --git a/examples/flask_alchemy/requirements.txt b/examples/flask_alchemy/requirements.txt index 3ee3e5e..fb675a9 100644 --- a/examples/flask_alchemy/requirements.txt +++ b/examples/flask_alchemy/requirements.txt @@ -1,3 +1,2 @@ --r ../../requirements.txt Flask Flask-SQLAlchemy -- cgit v1.2.3