From a61b8d3a5c9b384a0c712b2014d64e026934dba8 Mon Sep 17 00:00:00 2001
From: Michael Writhe <michael@writhem.com>
Date: Fri, 12 Oct 2012 10:18:12 -0600
Subject: [PATCH 1/3] added python 2.6 to travis and link to readme

---
 .travis.yml | 21 +++++++++++++++------
 README.rst  |  5 ++++-
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a30290e..594fa30 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,17 +1,26 @@
 language: python
 python:
-  # we will add support for this in future. currently 2.6 via travis is unsupported.
-  #- "2.6" 
+  - "2.6"
   - "2.7"
+before_install:
+  - wget http://hg.effbot.org/pil-117/raw/f356a1f64271/libImaging/Imaging.h
+  - wget http://hg.effbot.org/pil-117/raw/f356a1f64271/libImaging/ImPlatform.h
 install:
-  - sudo apt-get install -qq python-imaging python-dev python-numpy python-numpy-dev
   - pip install -q pillow
   - pip install -q numpy
   - python setup.py build
 before_script:
-  - git clone git://github.com/overviewer/Minecraft-Overviewer-Addons.git ~/mca/
+  - git clone git://github.com/overviewer/Minecraft-Overviewer-Addons.git ~/mcoa/
   - wget -N http://s3.amazonaws.com/MinecraftDownload/minecraft.jar -P ~/.minecraft/bin/
 script:
-  - python overviewer.py ~/mca/exmaple ~/test-output --rendermodes=smooth-lighting
+  - python overviewer.py ~/mcoa/exmaple ~/test-output --rendermodes=smooth-lighting
 notifications:
-  email: false
\ No newline at end of file
+  irc:
+    channels: "irc.freenode.org#overviewer"
+    on_success: always
+    on_failure: always
+  email: false
+branches:
+  only:
+    - master
+    - travis
\ No newline at end of file
diff --git a/README.rst b/README.rst
index ba0a42f..155e811 100644
--- a/README.rst
+++ b/README.rst
@@ -8,7 +8,10 @@ Documentation:
 
 Github code repository:
     http://github.com/overviewer/Minecraft-Overviewer
-
+	
+Travis-CI:
+    http://travis-ci.org/overviewer/Minecraft-Overviewer
+	
 Blog:
     http://overviewer.org/blog/
 

From a2b9a62c72989af731be49bb3a0cd6a00363ec7c Mon Sep 17 00:00:00 2001
From: Michael Writhe <michael@writhem.com>
Date: Fri, 12 Oct 2012 10:26:46 -0600
Subject: [PATCH 2/3] told travis about 3.2

---
 .travis.yml | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 594fa30..d08d936 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,6 +2,7 @@ language: python
 python:
   - "2.6"
   - "2.7"
+  - "3.2"
 before_install:
   - wget http://hg.effbot.org/pil-117/raw/f356a1f64271/libImaging/Imaging.h
   - wget http://hg.effbot.org/pil-117/raw/f356a1f64271/libImaging/ImPlatform.h
@@ -15,12 +16,7 @@ before_script:
 script:
   - python overviewer.py ~/mcoa/exmaple ~/test-output --rendermodes=smooth-lighting
 notifications:
-  irc:
-    channels: "irc.freenode.org#overviewer"
-    on_success: always
-    on_failure: always
   email: false
-branches:
-  only:
-    - master
-    - travis
\ No newline at end of file
+matrix:
+  allow_failures:
+    - python: "3.2"
\ No newline at end of file

From 2ad9990ff8c0be7d83223d41e50fe72d9c1c4822 Mon Sep 17 00:00:00 2001
From: Michael Writhe <michael@writhem.com>
Date: Fri, 12 Oct 2012 10:35:43 -0600
Subject: [PATCH 3/3] removed python 3 from travis

---
 .travis.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d08d936..76cf3fe 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,7 @@ language: python
 python:
   - "2.6"
   - "2.7"
-  - "3.2"
+  # - "3.2"
 before_install:
   - wget http://hg.effbot.org/pil-117/raw/f356a1f64271/libImaging/Imaging.h
   - wget http://hg.effbot.org/pil-117/raw/f356a1f64271/libImaging/ImPlatform.h
@@ -17,6 +17,6 @@ script:
   - python overviewer.py ~/mcoa/exmaple ~/test-output --rendermodes=smooth-lighting
 notifications:
   email: false
-matrix:
-  allow_failures:
-    - python: "3.2"
\ No newline at end of file
+# matrix:
+  # allow_failures:
+    # - python: "3.2"
\ No newline at end of file