Merge "Drop Django 1.11 support"

This commit is contained in:
Zuul 2020-01-08 15:01:43 +00:00 committed by Gerrit Code Review
commit 101bff9c6e
3 changed files with 7 additions and 9 deletions

View File

@ -13,7 +13,7 @@ cryptography==2.1.4
debtcollector==1.19.0
decorator==4.2.1
deprecation==2.0
Django==1.11.11
Django==2.2
django-appconf==1.0.2
django-babel==0.6.2
django-compressor==2.2
@ -27,7 +27,7 @@ fixtures==3.0.0
flake8==2.5.5
futurist==1.6.0
hacking==0.12.0
horizon==14.0.0.b3
horizon==17.1.0
httplib2==0.10.3
idna==2.6
imagesize==1.0.0
@ -58,7 +58,7 @@ oslo.i18n==3.20.0
oslo.policy==1.34.0
oslo.serialization==2.25.0
oslo.utils==3.36.0
osprofiler==2.0.0
osprofiler==2.3.0
packaging==17.1
pbr==2.0.0
pep8==1.5.7
@ -72,9 +72,9 @@ pyOpenSSL==17.5.0
pyparsing==2.2.0
pyperclip==1.6.0
pyScss==1.3.4
python-cinderclient==3.5.0
python-cinderclient==5.0.0
python-glanceclient==2.9.1
python-keystoneclient==3.15.0
python-keystoneclient==3.22.0
python-mimeparse==1.6.0
python-neutronclient==6.7.0
python-novaclient==10.1.0

View File

@ -4,7 +4,7 @@
pbr!=2.1.0,>=2.0.0 # Apache-2.0
horizon>=14.0.0.0b3 # Apache-2.0
horizon>=17.1.0 # Apache-2.0
PyYAML>=3.12 # MIT
python-watcherclient>=1.1.0 # Apache-2.0

View File

@ -1,6 +1,6 @@
[tox]
minversion = 2.0
envlist = py37,py36,py3-{dj111,dj22},pep8
envlist = py37,py36,pep8
skipsdist = True
[testenv]
@ -18,8 +18,6 @@ deps =
-r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
commands =
dj111: pip install django>=1.11,<2
dj22: pip install django>=2.2,<2.3
rm -f .testrepository/times.dbm
find . -type f -name "*.pyc" -delete
find . -type d -name "__pycache__" -delete