Drop Django 1.11 support
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: If7c7ce79594449637655c4832db50c2c243ce1c0
This commit is contained in:
parent
2fd7d6ede2
commit
d30787d677
|
@ -12,7 +12,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.5.1
|
django-babel==0.5.1
|
||||||
django-compressor==2.0
|
django-compressor==2.0
|
||||||
|
@ -26,7 +26,7 @@ flake8==2.5.5
|
||||||
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==13.0.0
|
horizon==17.1.0
|
||||||
idna==2.6
|
idna==2.6
|
||||||
iso8601==0.1.11
|
iso8601==0.1.11
|
||||||
Jinja2==2.10
|
Jinja2==2.10
|
||||||
|
@ -62,7 +62,7 @@ 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
|
||||||
oslotest==3.2.0
|
oslotest==3.2.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
|
||||||
|
@ -84,7 +84,7 @@ python-barbicanclient==4.5.2
|
||||||
python-cinderclient==3.3.0
|
python-cinderclient==3.3.0
|
||||||
python-dateutil==2.5.3
|
python-dateutil==2.5.3
|
||||||
python-glanceclient==2.8.0
|
python-glanceclient==2.8.0
|
||||||
python-keystoneclient==3.8.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,11 +2,11 @@
|
||||||
# of appearance. Changing the order has an impact on the overall integration
|
# of appearance. Changing the order has an impact on the overall integration
|
||||||
# process, which may cause wedges in the gate later.
|
# process, which may cause wedges in the gate later.
|
||||||
|
|
||||||
horizon>=14.0.0.0b3 # Apache-2.0
|
horizon>=17.1.0 # Apache-2.0
|
||||||
Babel!=2.4.0,>=2.3.4 # BSD
|
Babel!=2.4.0,>=2.3.4 # BSD
|
||||||
openstacksdk>=0.24.0 # Apache-2.0
|
openstacksdk>=0.24.0 # Apache-2.0
|
||||||
oslo.log>=3.36.0 # Apache-2.0
|
oslo.log>=3.36.0 # Apache-2.0
|
||||||
pbr!=2.1.0,>=2.0.0 # Apache-2.0
|
pbr!=2.1.0,>=2.0.0 # Apache-2.0
|
||||||
python-barbicanclient>=4.5.2 # Apache-2.0
|
python-barbicanclient>=4.5.2 # Apache-2.0
|
||||||
python-keystoneclient>=3.8.0 # Apache-2.0
|
python-keystoneclient>=3.22.0 # Apache-2.0
|
||||||
six>=1.10.0 # MIT
|
six>=1.10.0 # MIT
|
||||||
|
|
4
tox.ini
4
tox.ini
|
@ -1,6 +1,6 @@
|
||||||
[tox]
|
[tox]
|
||||||
minversion = 2.5.0
|
minversion = 2.5.0
|
||||||
envlist = py3,py3-{dj111,dj22},pep8,eslint,karma
|
envlist = py3,pep8,eslint,karma
|
||||||
skipsdist = True
|
skipsdist = True
|
||||||
|
|
||||||
[testenv]
|
[testenv]
|
||||||
|
@ -17,8 +17,6 @@ deps = -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/
|
||||||
whitelist_externals = npm
|
whitelist_externals = npm
|
||||||
bash
|
bash
|
||||||
commands =
|
commands =
|
||||||
dj111: pip install django>=1.11,<2
|
|
||||||
dj22: pip install django>=2.2,<2.3
|
|
||||||
python manage.py test octavia_dashboard --settings=octavia_dashboard.tests.settings
|
python manage.py test octavia_dashboard --settings=octavia_dashboard.tests.settings
|
||||||
|
|
||||||
[testenv:pep8]
|
[testenv:pep8]
|
||||||
|
|
Loading…
Reference in New Issue