openstack/deb-python-django-openstack-auth
Code Issues Proposed changes

Adding Django 1.6 support

Browse Source 
Bumping the upper version of Django to include 1.6.

Adding a tox env to maintain support for Django 1.5 and fixing
env for django 1.4

Implements blueprint django-16-support

Change-Id: I093b38f85bea1fbd7641571a3871a721abadd37c
This commit is contained in:
David Lyle
2014-02-03 11:34:54 -07:00
parent aa79d1ad05
commit 57717db0ef
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
requirements.txt
View File

@@ -1,4 +1,4 @@
pbr>=0.6,<1.0 pbr>=0.6,<1.0
Django>=1.4,<1.6 Django>=1.4,<1.7
python-keystoneclient>=0.6.0 python-keystoneclient>=0.6.0
six>=1.5.2 six>=1.5.2

12
tox.ini
View File

@@ -1,7 +1,7 @@
[tox] [tox]
minversion = 1.6 minversion = 1.6
skipsdist = True skipsdist = True
envlist = py26,py27,py27dj14,pep8,py33 envlist = py26,py27,py27dj14,py27dj15,pep8,py33
[testenv] [testenv]
usedevelop = True usedevelop = True
@@ -16,11 +16,13 @@ deps = -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt -r{toxinidir}/test-requirements.txt
commands = python openstack_auth/tests/run_tests.py commands = python openstack_auth/tests/run_tests.py
[testenv:py27dj15]
commands = pip install django>=1.5,<1.6
python openstack_auth/tests/run_tests.py
[testenv:py27dj14] [testenv:py27dj14]
deps = pbr>=0.5.21,<1.0 commands = pip install django==1.4
Django==1.4 python openstack_auth/tests/run_tests.py
python-keystoneclient>=0.3.2
-r{toxinidir}/test-requirements.txt
[testenv:pep8] [testenv:pep8]
commands = flake8 commands = flake8