openstack/neutron-fwaas-dashboard
Code Issues Proposed changes

Drop Django 1.11 support

Browse Source 
Django 1.11 ends its extended support in April 2020 (which is before
Ussuri release), so horizon drops Django 1.11 support in Ussuri.

tox envs for non-primary Django versions are no longer needed in tox.ini
as testing environments for non-primary Django versions are setup in
the zuul jobs now.

horizon>=17.1.0 is required to use Django 2.2. requirements.txt and
lower-constraints.txt are updated accordingly.

Depends-On: https://review.opendev.org/#/c/700733/
Change-Id: I21b71ad592559e40a8ac6e5abee34cbbad4ea417
This commit is contained in:
Akihiro Motoki
2019-12-29 06:05:22 +09:00
parent 03a33e4c5a
commit b7b288f030
3 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lower-constraints.txt
View File

@@ -13,7 +13,7 @@ cryptography==2.1
debtcollector==1.2.0 debtcollector==1.2.0
decorator==3.4.0 decorator==3.4.0
deprecation==1.0 deprecation==1.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
@@ -30,7 +30,7 @@ flake8-import-order==0.13
futurist==1.2.0 futurist==1.2.0
greenlet==0.4.10 greenlet==0.4.10
hacking==0.12.0 hacking==0.12.0
horizon==14.0.0b3 horizon==17.1.0
idna==2.6 idna==2.6
imagesize==0.7.1 imagesize==0.7.1
iso8601==0.1.11 iso8601==0.1.11
@@ -66,7 +66,7 @@ oslo.policy==1.30.0
oslo.serialization==2.18.0 oslo.serialization==2.18.0
oslo.service==1.24.0 oslo.service==1.24.0
oslo.utils==3.33.0 oslo.utils==3.33.0
osprofiler==1.4.0 osprofiler==2.3.0
Paste==2.0.2 Paste==2.0.2
PasteDeploy==1.5.0 PasteDeploy==1.5.0
pbr==2.0.0 pbr==2.0.0
@@ -86,10 +86,10 @@ pyOpenSSL==17.1.0
pyparsing==2.1.0 pyparsing==2.1.0
pyperclip==1.5.27 pyperclip==1.5.27
pyScss==1.3.4 pyScss==1.3.4
python-cinderclient==3.3.0 python-cinderclient==5.0.0
python-dateutil==2.5.3 python-dateutil==2.5.3
python-glanceclient==2.8.0 python-glanceclient==2.8.0
python-keystoneclient==3.15.0 python-keystoneclient==3.22.0
python-mimeparse==1.6.0 python-mimeparse==1.6.0
python-neutronclient==6.7.0 python-neutronclient==6.7.0
python-novaclient==9.1.0 python-novaclient==9.1.0

2
requirements.txt
View File

@@ -3,5 +3,5 @@
# process, which may cause wedges in the gate later. # process, which may cause wedges in the gate later.
pbr!=2.1.0,>=2.0.0 # Apache-2.0 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
python-neutronclient>=6.7.0 # Apache-2.0 python-neutronclient>=6.7.0 # Apache-2.0

4
tox.ini
View File

@@ -1,5 +1,5 @@
[tox] [tox]
envlist = py37,py3-{dj111,dj22},pep8 envlist = py37,pep8
minversion = 2.3.2 minversion = 2.3.2
skipsdist = True skipsdist = True
@@ -17,8 +17,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
{[unit_tests]commands} {[unit_tests]commands}
[unit_tests] [unit_tests]