Merge pull request #120 from mboersma/use-python-dev

feat(Makefile): run style tests in container

Author: mboersma

.travis.yml

@@ -9,7 +9,5 @@ services:
 env:
   - DOCKER_BUILD_FLAGS="--pull --no-cache"
 sudo: required
-install:
-  - pip install -r rootfs/dev_requirements.txt
 script:
   - make test docker-build

Makefile

@@ -1,24 +1,25 @@
 SHORT_NAME := dockerbuilder
-DEIS_REGISTY ?= quay.io/
+DEIS_REGISTRY ?= quay.io/
 IMAGE_PREFIX ?= deis
 
 include versioning.mk
 
+DEV_ENV_IMAGE := quay.io/deis/python-dev:v0.1.0
+DEV_ENV_WORK_DIR := /app
+DEV_ENV_PREFIX := docker run --rm -v ${CURDIR}/rootfs:${DEV_ENV_WORK_DIR} -w ${DEV_ENV_WORK_DIR}
+DEV_ENV_CMD := ${DEV_ENV_PREFIX} ${DEV_ENV_IMAGE}
+
 # For cases where we're building from local
 docker-build:
 	docker build ${DOCKER_BUILD_FLAGS} -t ${IMAGE} rootfs
 	docker tag ${IMAGE} ${MUTABLE_IMAGE}
 
-setup-venv:
-	@if [ ! -d venv ]; then pyvenv venv && source venv/bin/activate; fi
-	pip install --disable-pip-version-check -q -r rootfs/dev_requirements.txt
-
 test: test-style test-functional
 
 test-style:
-	cd rootfs && flake8 --show-source --config=setup.cfg .
+	${DEV_ENV_CMD} flake8 --show-source --config=setup.cfg .
 
 test-functional:
 	@echo "Implement functional tests in _tests directory"
 
-.PHONY: all build docker-compile kube-up kube-down deploy
+.PHONY: all docker-build test test-style test-functional