aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@corte.si>2013-08-22 15:32:39 -0700
committerAldo Cortesi <aldo@corte.si>2013-08-22 15:32:39 -0700
commit6a31d3271219dffc9786f08e387ad5dc812fe86c (patch)
treef485a6324566f3e94a7545c34b9a140d32f54ea1
parentaaba940dea8f148db953c50c3f8259154b8f3bcc (diff)
parentfa3dce9e11a3cb97c48d5fc8ef4325b7ed5280db (diff)
downloadmitmproxy-6a31d3271219dffc9786f08e387ad5dc812fe86c.tar.gz
mitmproxy-6a31d3271219dffc9786f08e387ad5dc812fe86c.tar.bz2
mitmproxy-6a31d3271219dffc9786f08e387ad5dc812fe86c.zip
Merge pull request #162 from mhils/add_travis_ci
Add travis CI
-rw-r--r--.travis.yml10
-rw-r--r--requirements.txt1
2 files changed, 11 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 00000000..5f4a3602
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,10 @@
+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"
+ - "pip install --upgrade git+https://github.com/mitmproxy/netlib.git"
+ - "pip install --upgrade git+https://github.com/mitmproxy/pathod.git"
+# command to run tests, e.g. python setup.py test
+script: nosetests \ No newline at end of file
diff --git a/requirements.txt b/requirements.txt
index ce1659aa..ad61de60 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