From 61f086a0ac63e156fdc34715d40217970589e8a1 Mon Sep 17 00:00:00 2001
From: Garret Wassermann <gwasser@gmail.com>
Date: Sun, 12 Jun 2022 03:02:47 -0400
Subject: [PATCH] Bump to 0.4.0 release, add django 4 python metadata

---
 demo/setup.py | 5 +++--
 setup.py      | 7 ++-----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/demo/setup.py b/demo/setup.py
index dec6ac81d..463a15e05 100644
--- a/demo/setup.py
+++ b/demo/setup.py
@@ -13,7 +13,7 @@
 NAME = 'django-helpdesk-demodesk'
 DESCRIPTION = 'A demo Django project using django-helpdesk'
 README = open(os.path.join(here, 'README.rst')).read()
-VERSION = '0.4.0a1'
+VERSION = '0.4.0'
 #VERSION = open(os.path.join(project_root, 'VERSION')).read().strip()
 AUTHOR = 'django-helpdesk team'
 URL = 'https://github.com/django-helpdesk/django-helpdesk'
@@ -22,7 +22,8 @@
                'Programming Language :: Python :: 3.8',
                'Programming Language :: Python :: 3.9',
                'Programming Language :: Python :: 3.10',
-               'Framework :: Django :: 3.2']
+               'Framework :: Django :: 3.2',
+               'Framework :: Django :: 4.0']
 KEYWORDS = []
 PACKAGES = ['demodesk']
 REQUIREMENTS = [
diff --git a/setup.py b/setup.py
index 0e3575a95..3b71a5340 100644
--- a/setup.py
+++ b/setup.py
@@ -4,7 +4,7 @@
 from fnmatch import fnmatchcase
 from setuptools import setup, find_packages
 
-version = '0.4.0a1'
+version = '0.4.0'
 
 # Provided as an attribute, so you can append to these instead
 # of replicating them:
@@ -134,11 +134,8 @@ def get_long_description():
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
         "Framework :: Django",
-<<<<<<< HEAD
-=======
-        "Framework :: Django :: 2.2",
->>>>>>> 55c638aeef0b3032eab28bcdc8ee313da9cbf9c0
         "Framework :: Django :: 3.2",
+        "Framework :: Django :: 4.0",
         "Environment :: Web Environment",
         "Operating System :: OS Independent",
         "Intended Audience :: Customer Service",