From f693fe6b2a114fedab76cb44ba020ba7939a2e34 Mon Sep 17 00:00:00 2001
From: mdipierro <massimo.dipierro@gmail.com>
Date: Fri, 15 Mar 2013 14:55:36 -0500
Subject: [PATCH] added .travis.yml

---
 .travis.yml | 25 +++++++++++++++++++++++++
 VERSION     |  2 +-
 travis.yml  | 17 -----------------
 3 files changed, 26 insertions(+), 18 deletions(-)
 create mode 100644 .travis.yml
 delete mode 100644 travis.yml

diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 00000000..677f7710
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,25 @@
+language: python
+
+python:
+  #Temporarily disable 2.5 tests - '2.5'
+  - '2.6'
+  - '2.7'
+env:
+  - DB=sqlite:memory
+  - DB=mysql://root:@localhost/test_w2p
+  - DB=postgres://postgres:@localhost/test_w2p
+before_script:
+  - pip install unittest2
+  - pip install psycopg2
+  - if [[ $TRAVIS_PYTHON_VERSION == '2.5' ]]; then pip install --use-mirrors pysqlite; fi
+  - mysql -e 'create database test_w2p;'
+  - psql -c 'create database test_w2p;' -U postgres
+  #Temporal solution to travis issue #155
+  - sudo chmod 777 /dev/shm
+  - sudo rm -rf /dev/shm && sudo ln -s /run/shm /dev/shm 
+script: PYTHONPATH=. unit2 -v gluon.tests
+
+notifications:
+  email: false
+  irc:
+    channels: "irc.freenode.org#web2py"
diff --git a/VERSION b/VERSION
index 2d085ce1..7b7d72d0 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.4.4-stable+timestamp.2013.03.15.14.13.59
+Version 2.4.4-stable+timestamp.2013.03.15.14.54.45
diff --git a/travis.yml b/travis.yml
deleted file mode 100644
index 5504b322..00000000
--- a/travis.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-language: python
-
-python:
-  - '2.5'
-  - '2.6'
-  - '2.7'
-
-before_script:
-  - pip install unittest2
-  - mysql -e 'create database test_pymysql;'
-  - mysql -e 'create database test_pymysql2;'
-
-script: PYTHONPATH=. unit2 -v gluon.tests
-
-notifications:
-  irc:
-    channels: "irc.freenode.org#web2py"