From 6b1e86431849f893a7cabfedbc60488963b18a5a Mon Sep 17 00:00:00 2001
From: manchandavishal <manchandavishal143@gmail.com>
Date: Wed, 1 Jan 2020 20:25:12 +0000
Subject: [PATCH] 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: Ie197efeb0080c5ad7f223823ff8b1888ff7dc0de
---
 lower-constraints.txt | 10 +++++-----
 requirements.txt      |  2 +-
 tox.ini               |  4 +---
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/lower-constraints.txt b/lower-constraints.txt
index fe304f4..96d4b42 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -14,7 +14,7 @@ cryptography==2.1
 debtcollector==1.2.0
 decorator==3.4.0
 deprecation==1.0
-Django==1.11
+Django==2.2
 django-appconf==1.0.2
 django-babel==0.6.2
 django-compressor==2.0
@@ -31,7 +31,7 @@ flake8-import-order==0.12
 futurist==1.2.0
 greenlet==0.4.10
 hacking==1.1.0
-horizon==14.0.0.0b3
+horizon==17.1.0
 idna==2.6
 iso8601==0.1.11
 Jinja2==2.10
@@ -66,7 +66,7 @@ oslo.policy==1.30.0
 oslo.serialization==2.18.0
 oslo.service==1.24.0
 oslo.utils==3.33.0
-osprofiler==1.4.0
+osprofiler==2.3.0
 Paste==2.0.2
 PasteDeploy==1.5.0
 pbr==2.0.0
@@ -85,11 +85,11 @@ pyOpenSSL==17.1.0
 pyparsing==2.1.0
 pyperclip==1.5.27
 pyScss==1.3.4
-python-cinderclient==3.3.0
+python-cinderclient==5.0.0
 python-dateutil==2.5.3
 python-glanceclient==2.8.0
 python-heatclient==1.10.0
-python-keystoneclient==3.15.0
+python-keystoneclient==3.22.0
 python-mimeparse==1.6.0
 python-neutronclient==6.7.0
 python-novaclient==9.1.0
diff --git a/requirements.txt b/requirements.txt
index 21d55a0..aff7b71 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -12,7 +12,7 @@ python-heatclient>=1.10.0 # Apache-2.0
 
 # This will be installed from git in OpenStack CI if the job setting
 # required-projects for horizon:
-horizon>=14.0.0.0b3 # Apache-2.0
+horizon>=17.1.0 # Apache-2.0
 
 xstatic-angular-uuid>=0.0.4.0 # MIT
 xstatic-angular-vis>=4.16.0.0 # MIT
diff --git a/tox.ini b/tox.ini
index c3a03f8..0778c94 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py36,py37,py3-{dj111,dj22},pep8,releasenotes
+envlist = py36,py37,pep8,releasenotes
 minversion = 3.1.1
 skipsdist = True
 ignore_basepython_conflict = True
@@ -19,8 +19,6 @@ deps = -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/
        -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
   python manage.py test heat_dashboard.test --settings=heat_dashboard.test.settings --exclude-tag integration
 
 [testenv:integration]