From 4790399041215ce05fa5496782822b5c2ef4a2a7 Mon Sep 17 00:00:00 2001 From: Maximilian Hils Date: Tue, 20 Aug 2013 13:25:47 +0200 Subject: [PATCH 1/4] add travis ci --- .travis.yml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 000000000..153322a6b --- /dev/null +++ b/.travis.yml @@ -0,0 +1,7 @@ +language: python +python: + - "2.7" +# command to install dependencies, e.g. pip install -r requirements.txt --use-mirrors +install: "pip install -r requirements.txt --use-mirrors" +# command to run tests, e.g. python setup.py test +script: nosetests \ No newline at end of file From 4bbcf795e3a8148219125f1b72359cae47e74d69 Mon Sep 17 00:00:00 2001 From: Maximilian Hils Date: Tue, 20 Aug 2013 13:32:18 +0200 Subject: [PATCH 2/4] travis ci: make sure that netlib is installed from head --- .travis.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 153322a6b..d3519b7f0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,9 @@ language: python python: - "2.7" # command to install dependencies, e.g. pip install -r requirements.txt --use-mirrors -install: "pip install -r requirements.txt --use-mirrors" +install: + - "pip install --upgrade git+https://github.com/mitmproxy/netlib.git" + - "pip install --upgrade git+https://github.com/mitmproxy/pathod.git" + - "pip install -r requirements.txt --use-mirrors" # command to run tests, e.g. python setup.py test script: nosetests \ No newline at end of file From 02120eb5c85f02c2053c6a6449dccb720485e185 Mon Sep 17 00:00:00 2001 From: Maximilian Hils Date: Tue, 20 Aug 2013 13:42:25 +0200 Subject: [PATCH 3/4] travis ci: fix pip install order --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d3519b7f0..5f4a36020 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,8 +3,8 @@ python: - "2.7" # command to install dependencies, e.g. pip install -r requirements.txt --use-mirrors install: + - "pip install -r requirements.txt --use-mirrors" - "pip install --upgrade git+https://github.com/mitmproxy/netlib.git" - "pip install --upgrade git+https://github.com/mitmproxy/pathod.git" - - "pip install -r requirements.txt --use-mirrors" # command to run tests, e.g. python setup.py test script: nosetests \ No newline at end of file From fa3dce9e11a3cb97c48d5fc8ef4325b7ed5280db Mon Sep 17 00:00:00 2001 From: Maximilian Hils Date: Tue, 20 Aug 2013 13:47:34 +0200 Subject: [PATCH 4/4] add jsbeautifier to requirements.txt --- requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements.txt b/requirements.txt index ce1659aad..ad61de60d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,3 +12,4 @@ pyasn1==0.1.7 requests==1.2.2 urwid==1.1.1 wsgiref==0.1.2 +jsbeautifier==1.4.0