openstack/watcher-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. for more info. please
refer [1].
Depends-On: https://review.opendev.org/#/c/700733/
[1] https://etherpad.openstack.org/p/Enable_Django22_support_in_Horizon_Plugin

Change-Id: Ib5ea9d22170b9d0285a74c6e4924fd4b6e9f4eb8
This commit is contained in:
manchandavishal 2020-01-02 21:01:15 +00:00
parent 5fde7bde35
commit e589482e27
3 changed files with 7 additions and 9 deletions
Show Stats 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.4
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.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.2 django-compressor==2.2
@ -27,7 +27,7 @@ fixtures==3.0.0
flake8==2.5.5 flake8==2.5.5
futurist==1.6.0 futurist==1.6.0
hacking==0.12.0 hacking==0.12.0
horizon==14.0.0.b3 horizon==17.1.0
httplib2==0.10.3 httplib2==0.10.3
idna==2.6 idna==2.6
imagesize==1.0.0 imagesize==1.0.0
@ -58,7 +58,7 @@ oslo.i18n==3.20.0
oslo.policy==1.34.0 oslo.policy==1.34.0
oslo.serialization==2.25.0 oslo.serialization==2.25.0
oslo.utils==3.36.0 oslo.utils==3.36.0
osprofiler==2.0.0 osprofiler==2.3.0
packaging==17.1 packaging==17.1
pbr==2.0.0 pbr==2.0.0
pep8==1.5.7 pep8==1.5.7
@ -72,9 +72,9 @@ pyOpenSSL==17.5.0
pyparsing==2.2.0 pyparsing==2.2.0
pyperclip==1.6.0 pyperclip==1.6.0
pyScss==1.3.4 pyScss==1.3.4
python-cinderclient==3.5.0 python-cinderclient==5.0.0
python-glanceclient==2.9.1 python-glanceclient==2.9.1
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==10.1.0 python-novaclient==10.1.0

2
requirements.txt
View File

@ -4,7 +4,7 @@
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
PyYAML>=3.12 # MIT PyYAML>=3.12 # MIT
python-watcherclient>=1.1.0 # Apache-2.0 python-watcherclient>=1.1.0 # Apache-2.0

4
tox.ini
View File

@ -1,6 +1,6 @@
[tox] [tox]
minversion = 2.0 minversion = 2.0
envlist = py37,py36,py3-{dj111,dj22},pep8 envlist = py37,py36,pep8
skipsdist = True skipsdist = True
[testenv] [testenv]
@ -18,8 +18,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
rm -f .testrepository/times.dbm rm -f .testrepository/times.dbm
find . -type f -name "*.pyc" -delete find . -type f -name "*.pyc" -delete
find . -type d -name "__pycache__" -delete find . -type d -name "__pycache__" -delete