From 1c080a762cd3e0835b504abce7c954e70d89219b Mon Sep 17 00:00:00 2001 From: HawkOwl Date: Sun, 29 Dec 2013 13:07:13 +0800 Subject: [PATCH 1/3] remove mock from setup.py, move it to travis so that it can use it to test --- .travis.yml | 1 + setup.py | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5634d263f..d8f020bd6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,6 +13,7 @@ python: install: - pip install -q $TWISTED + - pip install -q mock - python setup.py -q install script: trial klein diff --git a/setup.py b/setup.py index afadb0290..460dd1d8e 100644 --- a/setup.py +++ b/setup.py @@ -17,8 +17,7 @@ description="werkzeug + twisted.web", install_requires=[ "Twisted>=12.1", - "werkzeug", - "mock" + "werkzeug" ], keywords="twisted flask werkzeug web", license="MIT", From 48908b302edce682d705471ddb29850386cce545 Mon Sep 17 00:00:00 2001 From: HawkOwl Date: Wed, 1 Jan 2014 13:27:48 +0800 Subject: [PATCH 2/3] shifted all the test deps onto one line --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index d8f020bd6..c1f161687 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,8 +12,7 @@ python: - pypy install: - - pip install -q $TWISTED - - pip install -q mock + - pip install -q $TWISTED mock - python setup.py -q install script: trial klein From 39d16f41c88ecbe3fb4235e41541cdc164a63774 Mon Sep 17 00:00:00 2001 From: HawkOwl Date: Thu, 2 Jan 2014 08:50:40 +0800 Subject: [PATCH 3/3] travisci installs mock automatically, so we don't need to install it --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c1f161687..5634d263f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,7 @@ python: - pypy install: - - pip install -q $TWISTED mock + - pip install -q $TWISTED - python setup.py -q install script: trial klein