From 1736242bd77d7ce8b31337c17b73a88332536a0a Mon Sep 17 00:00:00 2001
From: Anatoly Bubenkov <bubenkoff@gmail.com>
Date: Sat, 6 Jul 2013 14:23:02 +0200
Subject: [PATCH] add travis integration, fixes for py25 and py27 no pyc tox
 env

--HG--
branch : travis-integration
---
 .gitignore  | 32 ++++++++++++++++++++++++++++++++
 .travis.yml | 10 ++++++++++
 README.rst  |  3 +++
 tox.ini     |  5 +++++
 4 files changed, 50 insertions(+)
 create mode 100644 .gitignore
 create mode 100644 .travis.yml

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000..c42cec477
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,32 @@
+# Automatically generated by `hgimportsvn`
+.svn
+.hgsvn
+
+# Ignore local virtualenvs
+lib/
+bin/
+include/
+.Python/
+
+# These lines are suggested according to the svn:ignore property
+# Feel free to enable them by uncommenting them
+*.pyc
+*.pyo
+*.swp
+*.html
+*.class
+*.orig
+*~
+
+doc/*/_build
+build/
+dist/
+*.egg-info
+issue/
+env/
+3rdparty/
+.tox
+.cache
+.coverage
+.ropeproject
+
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 000000000..28af100fd
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,10 @@
+language: python
+# command to install dependencies
+install: "pip install -e . detox"
+# # command to run tests
+script: detox --recreate
+notifications:
+  irc:
+    - "chat.freenode.net#pylib"
+  email:
+    - pytest-commit@python.org
diff --git a/README.rst b/README.rst
index ffc2821e9..8c546b69a 100644
--- a/README.rst
+++ b/README.rst
@@ -16,6 +16,9 @@ scales to support complex functional testing.  It provides
 
 - many `external plugins <http://pytest.org/latest/plugins.html#installing-external-plugins-searching>`_.
 
+.. image:: https://secure.travis-ci.org/bubenkoff/pytest.png?branch=travis-integration
+   :target: http://travis-ci.org/bubenkoff/pytest
+
 A simple example for a test::
 
     # content of test_module.py
diff --git a/tox.ini b/tox.ini
index 16e2c12d7..426d7f939 100644
--- a/tox.ini
+++ b/tox.ini
@@ -13,6 +13,10 @@ deps=
 changedir=.
 commands= py.test --genscript=pytest1
 
+[testenv:py25]
+setenv =
+    PIP_INSECURE=1
+
 [testenv:py27-xdist]
 changedir=.
 basepython=python2.7
@@ -29,6 +33,7 @@ basepython=python2.7
 deps=pytest-xdist
 setenv=
     PYTHONDONTWRITEBYTECODE=1
+distribute=true
 commands=
   py.test -n3 -rfsxX \
         --junitxml={envlogdir}/junit-{envname}.xml {posargs:testing}