Merge branch 'travis-ci' into python2.6-test-fix-and-travis-ci

madzak · Feb 2, 2017 · 3a68373 · 3a68373
2 parents 63f660b + 6837552
commit 3a68373
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,13 @@
+sudo: false
+language: python
+python:
+  - "2.6"
+  - "2.7"
+  - "3.2"
+  - "3.3"
+  - "3.4"
+install: pip install tox-travis
+script: tox
+matrix:
+  allow_failures:
+    - python: "2.6"
diff --git a/README.markdown b/README.markdown
@@ -1,3 +1,5 @@
+[![Build Status](https://travis-ci.org/madzak/python-json-logger.svg?branch=master)](https://travis-ci.org/madzak/python-json-logger)
+
 Overview
 =======
 This library is provided to allow standard python logging to output log data as json objects. With JSON we can make our logs more readable by machines and we can stop writing custom parsers for syslog type records.