Merge "Drop Django 1.11 support"
This commit is contained in:
commit
ab081554d0
|
@ -14,7 +14,7 @@ cryptography==2.1
|
||||||
debtcollector==1.19.0
|
debtcollector==1.19.0
|
||||||
decorator==4.2.1
|
decorator==4.2.1
|
||||||
deprecation==2.0
|
deprecation==2.0
|
||||||
Django==1.11
|
Django==2.2
|
||||||
django-appconf==1.0.2
|
django-appconf==1.0.2
|
||||||
django-babel==0.6.2
|
django-babel==0.6.2
|
||||||
django-compressor==2.0
|
django-compressor==2.0
|
||||||
|
|
|
@ -7,6 +7,7 @@
|
||||||
# be installed in a specific order.
|
# be installed in a specific order.
|
||||||
#
|
#
|
||||||
# PBR should always appear first
|
# PBR should always appear first
|
||||||
|
Django>=2.2 # BSD
|
||||||
oslo.log>=3.36.0 # Apache-2.0
|
oslo.log>=3.36.0 # Apache-2.0
|
||||||
oslo.serialization!=2.19.1,>=2.18.0 # Apache-2.0
|
oslo.serialization!=2.19.1,>=2.18.0 # Apache-2.0
|
||||||
pbr!=2.1.0,>=2.0.0 # Apache-2.0
|
pbr!=2.1.0,>=2.0.0 # Apache-2.0
|
||||||
|
|
4
tox.ini
4
tox.ini
|
@ -1,5 +1,5 @@
|
||||||
[tox]
|
[tox]
|
||||||
envlist = py37,py3-{dj111,dj22},pep8,docs
|
envlist = py37,pep8,docs
|
||||||
minversion = 3.1.1
|
minversion = 3.1.1
|
||||||
skipsdist = True
|
skipsdist = True
|
||||||
ignore_basepython_conflict = True
|
ignore_basepython_conflict = True
|
||||||
|
@ -15,8 +15,6 @@ deps =
|
||||||
-r{toxinidir}/requirements.txt
|
-r{toxinidir}/requirements.txt
|
||||||
-r{toxinidir}/test-requirements.txt
|
-r{toxinidir}/test-requirements.txt
|
||||||
commands =
|
commands =
|
||||||
dj111: pip install django>=1.11,<2
|
|
||||||
dj22: pip install django>=2.2,<2.3
|
|
||||||
{envpython} {toxinidir}/manage.py test tacker_horizon --settings=tacker_horizon.test.settings {posargs}
|
{envpython} {toxinidir}/manage.py test tacker_horizon --settings=tacker_horizon.test.settings {posargs}
|
||||||
|
|
||||||
[testenv:py36]
|
[testenv:py36]
|
||||||
|
|
Loading…
Reference in New Issue