openstack/magnum-ui
Code Issues Proposed changes

Remove py27dj17 from tox.ini

Browse Source 
The Django version is set to [Django>=1.8,<1.9 # BSD]
in the global-requirements.txt of OpenStack/Requirements.
The tox.ini should remove the py27dj17 like Horizon.
The Django version in the requirement.txt should be updated.

Change-Id: Ib0af7d45ac4ac6e412dd4cb7091c113f5a53ffcf
Closes-Bug: #1552124
This commit is contained in:
xiangxinyong 2016-03-07 15:00:39 +08:00
parent 9d81ce798e
commit a0c367d995
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
requirements.txt
View File

@ -10,7 +10,7 @@
pbr<2.0,>=1.6
python-magnumclient>=0.2.1
Babel>=1.3
Django<1.9,>=1.7
Django>=1.8,<1.9 # BSD
django-babel>=0.3.4
django_compressor>=1.4
django_openstack_auth>=1.4.0

7
tox.ini
View File

@ -1,5 +1,5 @@
[tox]
envlist = py27,py27dj17,py27dj18,pep834
envlist = py27,py27dj18,pep834
minversion = 1.6
skipsdist = True
@ -30,11 +30,6 @@ commands = {posargs}
[testenv:cover]
commands = /bin/bash run_tests.sh -N --no-pep8 --coverage {posargs}
[testenv:py27dj17]
basepython = python2.7
commands = pip install django>=1.7,<1.8
/bin/bash run_tests.sh -N --no-pep8 {posargs}
[testenv:py27dj18]
basepython = python2.7
commands = pip install django>=1.8,<1.9