From c585c7bf4b1faca10d25bfabdd6e35b16a8427c6 Mon Sep 17 00:00:00 2001
From: Vee-Ouma <viouma@student.mmust.ac.ke>
Date: Sun, 27 Mar 2022 04:23:01 +0300
Subject: [PATCH] django upgrades

---
 .idea/cpims-dcs-3.0.iml | 2 +-
 .idea/misc.xml          | 5 ++++-
 notifications/models.py | 1 +
 notifications/urls.py   | 2 +-
 requirements.txt        | 2 +-
 5 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/.idea/cpims-dcs-3.0.iml b/.idea/cpims-dcs-3.0.iml
index 45020eea5..de9e64708 100644
--- a/.idea/cpims-dcs-3.0.iml
+++ b/.idea/cpims-dcs-3.0.iml
@@ -17,7 +17,7 @@
       <excludeFolder url="file://$MODULE_DIR$/venv" />
       <excludeFolder url="file://$MODULE_DIR$/venv2" />
     </content>
-    <orderEntry type="jdk" jdkName="Python 3.10 (cpims-dcs-3.0)" jdkType="Python SDK" />
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
   <component name="PyDocumentationSettings">
diff --git a/.idea/misc.xml b/.idea/misc.xml
index b59633109..a876b679e 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.10 (cpims-dcs-3.0)" project-jdk-type="Python SDK" />
+  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.9 (cpims-dcs-3.0)" project-jdk-type="Python SDK" />
+  <component name="PythonCompatibilityInspectionAdvertiser">
+    <option name="version" value="3" />
+  </component>
 </project>
\ No newline at end of file
diff --git a/notifications/models.py b/notifications/models.py
index 1f0dbeb04..9c91450ba 100644
--- a/notifications/models.py
+++ b/notifications/models.py
@@ -15,6 +15,7 @@
 from django.utils import timezone
 # from django.utils.six import text_type
 from jsonfield.fields import JSONField
+
 from model_utils import Choices
 
 from six import text_type
diff --git a/notifications/urls.py b/notifications/urls.py
index bf706edef..75836b949 100644
--- a/notifications/urls.py
+++ b/notifications/urls.py
@@ -8,7 +8,7 @@
 from . import views
 
 if StrictVersion(get_version()) >= StrictVersion('2.0'):
-    from django.urls import re_path as pattern
+    from django.urls import path, include, re_path
 else:
     from django.conf.urls import url as pattern
 
diff --git a/requirements.txt b/requirements.txt
index 6537eb706..f508367d0 100755
--- a/requirements.txt
+++ b/requirements.txt
@@ -38,7 +38,7 @@ openpyxl==3.0.9
 packaging==21.3
 pandas==1.4.1
 Pillow==9.0.1
-psycopg2==2.9.3
+psycopg2-binary==2.9.3
 pycparser==2.21
 Pygments==2.11.2
 PyJWT==2.3.0