Drop Django 1.11 support

Code Issues Proposed changes

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: Icdd22683361a56a366af5d8d5c9b082e98abbe21

This commit is contained in:

manchandavishal

2020年01月01日 19:33:09 +00:00

committed by Vishal Manchanda

parent 40fa37be8c

commit 47719d12de

3 changed files with 8 additions and 9 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

10
lower-constraints.txt

View File

@@ -17,7 +17,7 @@ cryptography==2.1

debtcollector==1.2.0

decorator==3.4.0

deprecation==1.0

Django==1.8

Django==2.2

django-appconf==1.0.2

django-babel==0.5.1

django-compressor==2.0

@@ -35,7 +35,7 @@ future==0.16.0

futurist==1.2.0

greenlet==0.4.10

hacking==0.12.0

horizon==14.0.0

horizon==17.1.0

httplib2==0.9.1

idna==2.6

imagesize==0.7.1

@@ -88,7 +88,7 @@ oslo.service==1.24.0

oslo.utils==3.33.0

oslo.versionedobjects==1.31.2

oslotest==3.2.0

osprofiler==1.4.0

osprofiler==2.3.0

ovs==2.8.0

ovsdbapp==0.10.0

paramiko==2.0.0

@@ -119,12 +119,12 @@ pyparsing==2.1.0

pyperclip==1.5.27

pyroute2==0.4.21

pyScss==1.3.4

python-cinderclient==3.3.0

python-cinderclient==5.0.0

python-dateutil==2.5.3

python-designateclient==2.7.0

python-editor==1.0.3

python-glanceclient==2.8.0

python-keystoneclient==3.8.0

python-keystoneclient==3.22.0

python-mimeparse==1.6.0

python-neutronclient==6.7.0

python-novaclient==9.1.0

2
requirements.txt

View File

@@ -15,7 +15,7 @@ debtcollector>=1.2.0 # Apache-2.0

# OpenStack CI will install the following projects from git

# if they are in the required-projects list for a job:

neutron>=13.0.0 # Apache-2.0

horizon>=14.0.0 # Apache-2.0

horizon>=17.1.0 # Apache-2.0

# The comment below indicates this project repo is current with neutron-lib

# and should receive neutron-lib consumption patches as they are released

5
tox.ini

View File

@@ -1,6 +1,6 @@

[tox]

minversion = 3.1.1

envlist = py37,py3-{dj111,dj22},pep8

envlist = py37,pep8

skipsdist = True

ignore_basepython_conflict = True

@@ -17,8 +17,7 @@ setenv =

deps = -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}

-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

commands =

stestr run {posargs}

python {toxinidir}/tools/django-manage.py test bgpvpn_dashboard