From 7bfb56010d1090fe4c747375e943068b5b524dd9 Mon Sep 17 00:00:00 2001
From: manchandavishal <manchandavishal143@gmail.com>
Date: Tue, 28 Sep 2021 18:43:11 +0530
Subject: [PATCH] Bump Django version to Current LTS Version

This patch update Django version to the current LTS version i.e. 3.2.
Django 2.2 is going to end its extended support by April 2022[1].
horizon and all its plugins already support Django3.2 version, So
let's make this the default version. It also bump few other packages
version in lower-constraints.txt to make it work with Django 3.2.

Note: It also change 'openstack-tox-py38' job to non-voting
which I will revert in follow-up patch once this patch is merged.

[1] https://www.djangoproject.com/download/

Change-Id: I49e323b76ad2c2e680c3f133d0f219d850f7908c
---
 .zuul.d/django-jobs.yaml | 6 ++++--
 lower-constraints.txt    | 8 ++++----
 requirements.txt         | 4 ++--
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/.zuul.d/django-jobs.yaml b/.zuul.d/django-jobs.yaml
index f2dd5c1136..db85788d30 100644
--- a/.zuul.d/django-jobs.yaml
+++ b/.zuul.d/django-jobs.yaml
@@ -38,11 +38,13 @@
         # We specify a job in openstack-python3-yoga-jobs(-horizon)
         # to keep this project template as it is used in horizon plugins.
         # NOTE: We keep it as a template even though it is not used now.
-        - openstack-tox-py38
+        - openstack-tox-py38:
+            voting: false
         - horizon-tox-python3-django32:
             voting: false
     gate:
       jobs:
-        - openstack-tox-py38
+        - openstack-tox-py38:
+            voting: false
         # Skip these until the django3.x jobs become voting.
         # - horizon-tox-python3-django32
diff --git a/lower-constraints.txt b/lower-constraints.txt
index dc8a28e220..f3976063cf 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -15,9 +15,9 @@ cryptography==3.0
 debtcollector==1.2.0
 decorator==4.4.2
 deprecation==1.0
-Django==2.2
-django-appconf==1.0.2
-django-compressor==2.0
+Django==3.2
+django-appconf==1.0.5
+django-compressor==2.4.1
 django-debreach==1.4.2
 django-pyscss==2.0.2
 docutils==0.11
@@ -105,7 +105,7 @@ requests==2.25.1
 requestsexceptions==1.2.0
 restructuredtext-lint==1.1.1
 rfc3986==0.3.1
-rjsmin==1.0.12
+rjsmin==1.1.0
 Routes==2.3.1
 selenium==2.50.1
 semantic-version==2.3.1
diff --git a/requirements.txt b/requirements.txt
index fe857c6a72..151359316d 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -12,8 +12,8 @@ pbr>=5.5.0 # Apache-2.0
 # Horizon Core Requirements
 Babel>=2.6.0 # BSD
 debtcollector>=1.2.0 # Apache-2.0
-Django>=2.2,<3.0 # BSD
-django-compressor>=2.0 # MIT
+Django>=3.2,<3.3 # BSD
+django-compressor>=2.4.1 # MIT
 django-debreach>=1.4.2 # BSD License (2 clause)
 django-pyscss>=2.0.2 # BSD License (2 clause)
 futurist>=1.2.0 # Apache-2.0