diff options
| author | Chris McDonough <chrism@plope.com> | 2012-06-14 19:30:22 -0700 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2012-06-14 19:30:22 -0700 |
| commit | eb3c87230402201669501d5889d43634b785a9ed (patch) | |
| tree | ceb2ef21bc644ccce72d82a0799f68c260534f52 | |
| parent | 22d13cca116df2c9b4b9015d873bcc53a362731c (diff) | |
| parent | e07b4f8edd32766dd0c8327d04a9c7b99d8dc2e9 (diff) | |
| download | pyramid-eb3c87230402201669501d5889d43634b785a9ed.tar.gz pyramid-eb3c87230402201669501d5889d43634b785a9ed.tar.bz2 pyramid-eb3c87230402201669501d5889d43634b785a9ed.zip | |
Merge pull request #616 from msabramo/testing
Add py33 to tox and add .travis.yml for Travis CI
| -rw-r--r-- | .travis.yml | 13 | ||||
| -rw-r--r-- | CONTRIBUTORS.txt | 2 | ||||
| -rw-r--r-- | tox.ini | 10 |
3 files changed, 24 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 000000000..2e737af04 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,13 @@ +language: python + +python: + - 2.6 + - 2.7 + - pypy + - 3.2 + +matrix: + allow_failures: + - python: pypy + +script: python setup.py test diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index 98f73d5f9..027fc0857 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -172,3 +172,5 @@ Contributors - Wayne Witzel III, 2012/03/27 - Marin Rukavina, 2012/05/03 + +- Marc Abramowitz, 2012/06/13 @@ -1,6 +1,6 @@ [tox] envlist = - py26,py27,py32,pypy,cover + py26,py27,py32,py33,pypy,cover [testenv] commands = @@ -21,6 +21,14 @@ deps = virtualenv venusian +[testenv:py33] +commands = + python setup.py test -q +deps = + WebTest + virtualenv + venusian + [testenv:cover] basepython = python2.6 |