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: I59e016fd771282798bd095c562e2fa11a8e4ea43
This commit is contained in:
manchandavishal 2020-01-02 19:46:22 +00:00 committed by Vishal Manchanda
parent c62fe30493
commit 8ab6fbd0cf
3 changed files with 9 additions and 10 deletions

View File

@ -16,10 +16,10 @@ cryptography==2.1.4
debtcollector==1.19.0
decorator==4.2.1
deprecation==2.0
Django==1.11
Django==2.2
django-appconf==1.0.2
django-compressor==2.0
django-formtools==2.0
django-formtools==2.2
django-pyscss==2.0.2
docutils==0.14
dogpile.cache==0.6.5
@ -31,7 +31,7 @@ fixtures==3.0.0
flake8==2.5.5
futurist==1.6.0
hacking==0.12.0
horizon==15.0.0.0b1
horizon==17.1.0
idna==2.6
imagesize==1.0.0
iso8601==0.1.11
@ -82,10 +82,10 @@ pyparsing==2.2.0
pyperclip==1.6.0
pyScss==1.3.4
python-barbicanclient==4.6.0
python-cinderclient==3.5.0
python-cinderclient==5.0.0
python-dateutil==2.7.0
python-glanceclient==2.9.1
python-keystoneclient==3.17.0
python-keystoneclient==3.22.0
python-mimeparse==1.6.0
python-muranoclient==0.8.2
python-neutronclient==6.7.0

View File

@ -4,7 +4,7 @@
pbr!=2.1.0,>=2.0.0 # Apache-2.0
beautifulsoup4>=4.6.0 # MIT
django-formtools>=2.0 # BSD
django-formtools>=2.2 # BSD
iso8601>=0.1.11 # MIT
six>=1.10.0 # MIT
python-muranoclient>=0.8.2 # Apache-2.0
@ -16,4 +16,4 @@ castellan>=0.18.0 # Apache-2.0
oslo.log>=3.36.0 # Apache-2.0
semantic-version>=2.3.1 # BSD
horizon>=15.0.0.0b1 # Apache-2.0
horizon>=17.1.0 # Apache-2.0

View File

@ -1,7 +1,8 @@
[tox]
envlist = py37,py3-{dj111,dj22},pep8
envlist = py37,pep8
minversion = 2.0
skipsdist = True
ignore_basepython_conflict = True
[testenv]
basepython = python3
@ -14,8 +15,6 @@ deps = -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/
-r{toxinidir}/test-requirements.txt
http://tarballs.openstack.org/heat-dashboard/heat-dashboard-master.tar.gz
commands =
dj111: pip install django>=1.11,<2
dj22: pip install django>=2.2,<2.3
{toxinidir}/manage.py test muranodashboard --settings=muranodashboard.tests.settings
[testenv:pep8]