Merge branch 'cmlh-travis-ci'

Jon Heaton · Jon Heaton · commit c63d64e4ec80 · 2014-10-20T11:34:05.000+01:00
diff --git a/README.md b/README.md
@@ -1,3 +1,5 @@
+[![Build Status](https://api.travis-ci.org/Instagram/python-instagram.svg)](https://api.travis-ci.org/Instagram/python-instagram.svg)
+
 python-instagram
 ======
 A Python client for the Instagram REST and Search APIs
diff --git a/requirements.txt b/requirements.txt
@@ -0,0 +1,7 @@
+bottle==0.12.7
+bottle-session==0.3
+httplib2==0.9
+python-instagram==1.1.3
+redis==2.10.3
+simplejson==3.6.3
+wsgiref==0.1.2
diff --git a/travis.yml b/travis.yml
@@ -0,0 +1,7 @@
+language: python
+python:
+  - "2.7"
+# command to install dependencies
+install: "pip install -r requirements.txt"
+# command to run tests
+script: tests.py

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+[![Build Status](https://api.travis-ci.org/Instagram/python-instagram.svg)](https://api.travis-ci.org/Instagram/python-instagram.svg)`
	`2`	`+`
`1`	`3`	`python-instagram`
`2`	`4`	`======`
`3`	`5`	`A Python client for the Instagram REST and Search APIs`