From 35704f35278dfab520ff063f6943b49e1c1555a6 Mon Sep 17 00:00:00 2001
From: mdipierro <massimo.dipierro@gmail.com>
Date: Sun, 7 Apr 2013 19:42:41 -0500
Subject: [PATCH] new .travis.ci for Pypy testing, thanks Niphlod

---
 .travis.yml | 14 ++++++++++----
 VERSION     |  2 +-
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 931c4b7c..c733016f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,22 +4,28 @@ python:
   - '2.5'
   - '2.6'
   - '2.7'
+  - 'pypy'
 env:
   - DB=sqlite:memory
   - DB=mysql://root:@localhost/test_w2p
   - DB=postgres://postgres:@localhost/test_w2p
 before_script:
   - pip install unittest2
-  - if [[ $DB == postgres* ]]; then pip install --use-mirrors psycopg2; fi
+  - if [[ $DB == postgres* ]]; then pip install --use-mirrors psycopg2; fi;
   - if [[ $TRAVIS_PYTHON_VERSION == '2.5' ]]; then pip install --use-mirrors pysqlite; fi
   - if [[ $DB == mysql* ]]; then mysql -e 'create database test_w2p;'; fi
   - if [[ $DB == postgres* ]]; then psql -c 'create database test_w2p;' -U postgres; fi
   #Temporal solution to travis issue #155
   - sudo chmod 777 /dev/shm
   - sudo rm -rf /dev/shm && sudo ln -s /run/shm /dev/shm
+matrix:
+  exclude:
+    - python: 'pypy'
+      env: DB=postgres://postgres:@localhost/test_w2p
+    - python: 'pypy'
+      env: DB=mysql://root:@localhost/test_w2p
+
 script: PYTHONPATH=. unit2 -v gluon.tests
 
 notifications:
-  email: false
-  irc:
-    channels: "irc.freenode.org#web2py"
+  email: true
diff --git a/VERSION b/VERSION
index ee2dd506..4295d576 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.4.6-stable+timestamp.2013.04.07.19.36.49
+Version 2.4.6-stable+timestamp.2013.04.07.19.41.51