Merge pull request #69 from onaio/pytz-deprecated

Remove pytz

oidc/apps.py

@@ -1,6 +1,7 @@
 """
 Application Module for oidc app
 """
+
 from django.apps import AppConfig
 from django.utils.translation import gettext_lazy as _
 

oidc/client.py

@@ -1,6 +1,7 @@
 """
 Client module for the oidc app
 """
+
 import json
 import secrets
 from typing import Optional

oidc/urls.py

@@ -1,6 +1,7 @@
 """
 URL Configuration file for ona-oidc
 """
+
 from django.conf import settings
 from django.urls import re_path
 

oidc/viewsets.py

@@ -1,6 +1,7 @@
 """
 oidc Viewsets module
 """
+
 import importlib
 import re
 from typing import Optional, Tuple
@@ -14,6 +15,7 @@
     HttpResponseBadRequest,
     HttpResponseRedirect,
 )
+from django.utils import timezone
 from django.utils.translation import gettext as _
 
 import jwt
@@ -410,15 +412,14 @@ class RapidProOpenIDConnectViewset(BaseOpenIDConnectViewset):
 
     def create_login_user(self, user_data: dict):
         Org = importlib.import_module("temba").orgs.models.Org
-        timezone = importlib.import_module("pytz").timezone
         org_name = user_data.pop("username")
         user_data["username"] = user_data.get("email")
 
         org_data = {
             "name": org_name,
             "slug": Org.get_unique_slug(org_name),
             "brand": settings.DEFAULT_BRAND,
-            "timezone": timezone("UTC"),
+            "timezone": f"{timezone.utc}",
         }
         user = self.user_model.objects.create(**user_data)
 

tox.ini

@@ -12,8 +12,8 @@ basepython = python3.9
 commands =
     pipenv sync --dev
     flake8 {toxinidir}/oidc
-    black -v oidc --check -t py38 -t py39
-    isort -c -v .
+    black -v {toxinidir}/oidc --check -t py38 -t py39
+    isort -c -v {toxinidir}/oidc
 
 [testenv]
 deps =