diff options
| author | Ricardo Kirkner <ricardo.kirkner@canonical.com> | 2013-07-22 12:17:15 -0300 |
|---|---|---|
| committer | Ricardo Kirkner <ricardo.kirkner@canonical.com> | 2013-07-22 12:17:15 -0300 |
| commit | 665f8bee998500464c5d156e6093aff05fb388dc (patch) | |
| tree | fd774d8208e823084de01749e1492ec04e0fcc0d | |
| parent | 9ad7ebc3a118a7970e74f3a0b609225ba7456605 (diff) | |
| parent | 7cdfa5bbb80b3ca4d765df345393621af0adf9b5 (diff) | |
get tox working again
bumped minimum supported version of django to 1.3 because of the use of the url templatetag
| -rw-r--r-- | setup.py | 3 | ||||
| -rw-r--r-- | tox.ini | 34 |
2 files changed, 14 insertions, 23 deletions
@@ -49,6 +49,7 @@ setup( name='django-openid-auth', version=VERSION, author='Canonical Ltd', + author_email='noreply@canonical.com', description=description, long_description=long_description, license='BSD', @@ -76,5 +77,5 @@ setup( 'django_openid_auth': ['templates/openid/*.html'], }, provides=['django_openid_auth'], - requires=['django (>=1.1.2)', 'openid (>=2.2.0)', 'south'], + requires=['django (>=1.3)', 'openid (>=2.2.0)', 'south'], ) @@ -1,22 +1,12 @@ [tox] -envlist = - py2.6-django1.1, py2.6-django1.2, py2.6-django1.3, py2.6-django1.4, - py2.7-django1.1, py2.7-django1.2, py2.7-django1.3, py2.7-django1.4 +envlist = + py2.6-django1.3, py2.6-django1.4, py2.6-django1.5, + py2.7-django1.3, py2.7-django1.4, py2.7-django1.5 [testenv] commands = make check # 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] basepython = python2.6 deps = django >= 1.3, < 1.4 @@ -27,17 +17,12 @@ basepython = python2.6 deps = django >= 1.4, < 1.5 python-openid -# Python 2.7 -[testenv:py2.7-django1.1] -basepython = python2.7 -deps = django >= 1.1, < 1.2 - python-openid - -[testenv:py2.7-django1.2] -basepython = python2.7 -deps = django >= 1.2, < 1.3 +[testenv:py2.6-django1.5] +basepython = python2.6 +deps = django >= 1.5, < 1.6 python-openid +# Python 2.7 [testenv:py2.7-django1.3] basepython = python2.7 deps = django >= 1.3, < 1.4 @@ -47,3 +32,8 @@ deps = django >= 1.3, < 1.4 basepython = python2.7 deps = django >= 1.4, < 1.5 python-openid + +[testenv:py2.7-django1.5] +basepython = python2.7 +deps = django >= 1.5, < 1.6 + python-openid |