Commit 665f8bee by Ricardo Kirkner

get tox working again

bumped minimum supported version of django to 1.3 because of the use of the url templatetag
parents 9ad7ebc3 7cdfa5bb
...@@ -49,6 +49,7 @@ setup( ...@@ -49,6 +49,7 @@ setup(
name='django-openid-auth', name='django-openid-auth',
version=VERSION, version=VERSION,
author='Canonical Ltd', author='Canonical Ltd',
author_email='noreply@canonical.com',
description=description, description=description,
long_description=long_description, long_description=long_description,
license='BSD', license='BSD',
...@@ -76,5 +77,5 @@ setup( ...@@ -76,5 +77,5 @@ setup(
'django_openid_auth': ['templates/openid/*.html'], 'django_openid_auth': ['templates/openid/*.html'],
}, },
provides=['django_openid_auth'], provides=['django_openid_auth'],
requires=['django (>=1.1.2)', 'openid (>=2.2.0)', 'south'], requires=['django (>=1.3)', 'openid (>=2.2.0)', 'south'],
) )
[tox] [tox]
envlist = envlist =
py2.6-django1.1, py2.6-django1.2, py2.6-django1.3, py2.6-django1.4, py2.6-django1.3, py2.6-django1.4, py2.6-django1.5,
py2.7-django1.1, py2.7-django1.2, py2.7-django1.3, py2.7-django1.4 py2.7-django1.3, py2.7-django1.4, py2.7-django1.5
[testenv] [testenv]
commands = make check commands = make check
# Python 2.6 # Python 2.6
[testenv:py2.6-django1.1]
basepython = python2.6
deps = django >= 1.1, < 1.2
python-openid
[testenv:py2.6-django1.2]
basepython = python2.6
deps = django >= 1.2, < 1.3
python-openid
[testenv:py2.6-django1.3] [testenv:py2.6-django1.3]
basepython = python2.6 basepython = python2.6
deps = django >= 1.3, < 1.4 deps = django >= 1.3, < 1.4
...@@ -27,17 +17,12 @@ basepython = python2.6 ...@@ -27,17 +17,12 @@ basepython = python2.6
deps = django >= 1.4, < 1.5 deps = django >= 1.4, < 1.5
python-openid python-openid
# Python 2.7 [testenv:py2.6-django1.5]
[testenv:py2.7-django1.1] basepython = python2.6
basepython = python2.7 deps = django >= 1.5, < 1.6
deps = django >= 1.1, < 1.2
python-openid
[testenv:py2.7-django1.2]
basepython = python2.7
deps = django >= 1.2, < 1.3
python-openid python-openid
# Python 2.7
[testenv:py2.7-django1.3] [testenv:py2.7-django1.3]
basepython = python2.7 basepython = python2.7
deps = django >= 1.3, < 1.4 deps = django >= 1.3, < 1.4
...@@ -47,3 +32,8 @@ deps = django >= 1.3, < 1.4 ...@@ -47,3 +32,8 @@ deps = django >= 1.3, < 1.4
basepython = python2.7 basepython = python2.7
deps = django >= 1.4, < 1.5 deps = django >= 1.4, < 1.5
python-openid python-openid
[testenv:py2.7-django1.5]
basepython = python2.7
deps = django >= 1.5, < 1.6
python-openid
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment