summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.travis.yml3
-rw-r--r--README.rst1
-rw-r--r--tox.ini32
3 files changed, 13 insertions, 23 deletions
diff --git a/.travis.yml b/.travis.yml
index 703ecaf..bdd4e8d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,6 +2,9 @@ language: python
python:
- 2.6
- 2.7
+ - 3.1
+ - 3.2
+ - 3.3
install:
- pip install -i https://restricted.crate.io/ .
- pip install -i https://restricted.crate.io/ nose unittest2 pycrypto mock
diff --git a/README.rst b/README.rst
index 2463138..afdc803 100644
--- a/README.rst
+++ b/README.rst
@@ -5,6 +5,7 @@ OAuthLib
logic.*
.. image:: https://secure.travis-ci.org/idangazit/oauthlib.png?branch=master
+ :target: https://travis-ci.org/idan/oauthlib
OAuth often seems complicated and difficult-to-implement. There are several
prominent libraries for signing OAuth requests, but they all suffer from one or
diff --git a/tox.ini b/tox.ini
index e29a2cd..7deab28 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,30 +1,16 @@
-# TODO(ib-lundgren): Fix this, it's ugly...
[tox]
envlist = py26,py27,py31,py32,py33
-[testenv:py26]
+
+[testenv]
deps=nose
- unittest2
pycrypto
mock
commands=nosetests -w tests
+
+[testenv:py26]
+deps=unittest2
+ {[testenv]deps}
+
[testenv:py27]
-deps=nose
- unittest2
- pycrypto
- mock
-commands=nosetests -w tests
-[testenv:py31]
-deps=nose
- pycrypto
- mock
-commands=nosetests -w tests
-[testenv:py32]
-deps=nose
- pycrypto
- mock
-commands=nosetests -w tests
-[testenv:py33]
-deps=nose
- pycrypto
- mock
-commands=nosetests -w tests
+deps=unittest2
+ {[testenv]deps}