From d442b003ea154a630030a1c65dcab385fc9b299c Mon Sep 17 00:00:00 2001
From: mdipierro <massimo.dipierro@gmail.com>
Date: Sun, 8 Jun 2014 00:34:46 -0500
Subject: [PATCH] restored .travis.yml

---
 .travis.yml | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 VERSION     |  2 +-
 2 files changed, 61 insertions(+), 1 deletion(-)
 create mode 100644 .travis.yml

diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 00000000..8cf53e1b
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,60 @@
+language: python
+
+python:
+  - '2.6'
+  - '2.7'
+  - 'pypy'
+install:
+  - pip install -e .
+env:
+  - DB=sqlite:memory
+  - DB=mysql://root:@localhost/test_w2p
+  - DB=postgres://postgres:@localhost/test_w2p
+  - DB=google:datastore
+#  - DB=google:datastore+ndb
+  - DB=mongodb://mongodb:mongodb@localhost/test_w2p
+  - DB=imap://imap:imap@localhost:993
+before_script:
+  - if [[ $TRAVIS_PYTHON_VERSION != '2.7' ]]; then pip install unittest2; fi
+  - if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then pip install coverage; fi;
+  - if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then pip install python-coveralls; fi
+  - if [[ $DB == postgres* ]]; then pip install psycopg2; fi;
+  - if [[ $TRAVIS_PYTHON_VERSION == '2.5' ]]; then pip install 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
+
+  # Install last sdk for app engine (update only whenever a new release is available)
+  - if [[ $DB == google* ]]; then wget http://googleappengine.googlecode.com/files/google_appengine_1.8.9.zip -nv; fi
+  - if [[ $DB == google* ]]; then unzip -q google_appengine_1.8.9.zip; fi
+  - if [[ $DB == google* ]]; then mv -f ./google_appengine/google ./google; fi
+
+  - if [[ $DB == mongodb* ]]; then pip install pymongo; fi
+  - if [[ $DB == mongodb* ]]; then mongo test_w2p --eval 'db.addUser("mongodb", "mongodb");'; 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
+    - python: 'pypy'
+      env: DB=google:datastore
+    - python: '2.6'
+      env: DB=google:datastore
+#    - python: '2.6'
+#      env: DB=google:datastore+ndb
+
+
+script: export COVERAGE_PROCESS_START=gluon/tests/coverage.ini; ./web2py.py --run_system_tests --with_coverage
+after_success:
+  - if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then coverage combine; fi
+  - if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then coveralls --config_file=gluon/tests/coverage.ini; fi
+  
+notifications:
+  email: true
+
+services: mongodb
+
diff --git a/VERSION b/VERSION
index b3addc5a..e9e2f4e8 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.9.5-trunk+timestamp.2014.06.08.00.19.41
+Version 2.9.5-trunk+timestamp.2014.06.08.00.33.23