From e720096a1c7e0890f42fd5366640583fcc3c87a1 Mon Sep 17 00:00:00 2001 From: John Dewey Date: Mon, 2 Jun 2014 10:54:55 -0700 Subject: [PATCH] Using a makefile --- .travis.yml | 4 +--- Makefile | 11 +++++++++++ README.md | 3 +-- Vagrantfile | 3 +-- 4 files changed, 14 insertions(+), 7 deletions(-) create mode 100644 Makefile diff --git a/.travis.yml b/.travis.yml index ff5fc30..edd9f6e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,5 @@ language: python python: - 2.6 - 2.7 -install: - - pip install tox script: - - tox + - make test diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..f2af14a --- /dev/null +++ b/Makefile @@ -0,0 +1,11 @@ +all: test + +deps: + @echo "--> Installing dependencies" + @pip install tox + +test: deps + @echo "--> Running tests" + @tox + +.PHONY: all deps test diff --git a/README.md b/README.md index 4fc45cb..f4aaa72 100644 --- a/README.md +++ b/README.md @@ -22,8 +22,7 @@ Development Testing ======= - $ sudo pip install tox - $ tox + $ make test License ======= diff --git a/Vagrantfile b/Vagrantfile index 77f2062..1159bf5 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -1,5 +1,4 @@ -# -*- mode: ruby -*- -# vi: set ft=ruby : +# encoding: UTF-8 Vagrant.configure('2') do |config| config.vm.box = 'hashicorp/precise64'