3 files changed, 27 insertions, 23 deletions

diff --git a/tests/models/gr/test_authentication.py b/tests/models/gr/test_authentication.py
index 6c84a5d..51595a7 100644
--- a/tests/models/gr/test_authentication.py
+++ b/tests/models/gr/test_authentication.py
@@ -1,9 +1,9 @@
 import binascii
 import json
 import os
-from datetime import datetime, timezone
+from collections.abc import Callable
+from datetime import UTC, datetime, timezone
 from random import randint
-from typing import Callable
 from uuid import uuid4
 
 import pytest
@@ -251,7 +251,7 @@ class TestGRToken:
     def gr_token(self, gr_user):
         from generalresearch.models.gr.authentication import GRToken
 
-        now = datetime.now(tz=timezone.utc)
+        now = datetime.now(tz=UTC)
         token = binascii.hexlify(os.urandom(20)).decode()
 
         gr_token = GRToken(key=token, created=now, user_id=gr_user.id)
diff --git a/tests/models/gr/test_base.py b/tests/models/gr/test_base.py
index a9f01a8..8da28d3 100644
--- a/tests/models/gr/test_base.py
+++ b/tests/models/gr/test_base.py
@@ -1,6 +1,6 @@
 import subprocess
+from collections.abc import Callable
 from pathlib import Path
-from typing import Callable
 
 import pytest
 from pydantic import PostgresDsn
@@ -10,9 +10,11 @@ from generalresearch.pg_helper import PostgresConfig
 
 class TestGRPostgresDjangoCreation:
 
-    def test_git(self, git_key_path: Path, gr_repo: Callable[..., Path]):
+    def test_git(self, gr_repo: Callable[..., Path]):
         repo_path = gr_repo()
 
+        print("test_git.PATH:", repo_path)
+
         try:
             # Run the git command inside the target directory
             result = subprocess.run(
@@ -36,11 +38,13 @@ class TestGRPostgresDjangoCreation:
         dsn = django_db_factory("gr")
         assert isinstance(dsn, PostgresDsn)
 
-    # def test_django_tables(self, thl_web_rw: PostgresConfig):
-    #     res = thl_web_rw.execute_sql_query(query="""
-    #         SELECT COUNT(*)
-    #         FROM information_schema.tables
-    #         WHERE table_schema = 'public';
-    #     """)
-    #     assert len(res) == 1
-    #     assert res[0]["count"] == 56
+    def test_django_tables(self, gr_db: PostgresConfig):
+        res = gr_db.execute_sql_query(query="""
+            SELECT COUNT(*) 
+            FROM information_schema.tables
+            WHERE table_schema = 'public';
+        """)
+        print(res)
+        assert len(res) == 1
+        assert res[0]["count"] == 56
+        assert True
diff --git a/tests/models/gr/test_business.py b/tests/models/gr/test_business.py
index 7a84f23..716ec75 100644
--- a/tests/models/gr/test_business.py
+++ b/tests/models/gr/test_business.py
@@ -1,5 +1,5 @@
 import os
-from datetime import datetime, timedelta, timezone
+from datetime import UTC, datetime, timedelta, timezone
 from decimal import Decimal
 from typing import Optional
 from uuid import uuid4
@@ -82,15 +82,15 @@ class TestBusinessContact:
 
 class TestBusiness:
     @pytest.fixture
-    def start(self) -> "datetime":
-        return datetime(year=2018, month=3, day=14, hour=0, tzinfo=timezone.utc)
+    def start(self) -> datetime:
+        return datetime(year=2018, month=3, day=14, hour=0, tzinfo=UTC)
 
     @pytest.fixture
     def offset(self) -> str:
         return "30d"
 
     @pytest.fixture
-    def duration(self) -> Optional["timedelta"]:
+    def duration(self) -> timedelta | None:
         return None
 
     def test_init(self, business):
@@ -413,15 +413,15 @@ class TestBusiness:
 class TestBusinessBalance:
 
     @pytest.fixture
-    def start(self) -> "datetime":
-        return datetime(year=2018, month=3, day=14, hour=0, tzinfo=timezone.utc)
+    def start(self) -> datetime:
+        return datetime(year=2018, month=3, day=14, hour=0, tzinfo=UTC)
 
     @pytest.fixture
     def offset(self) -> str:
         return "30d"
 
     @pytest.fixture
-    def duration(self) -> Optional["timedelta"]:
+    def duration(self) -> timedelta | None:
         return None
 
     @pytest.mark.skip
@@ -1138,7 +1138,7 @@ class TestBusinessBalance:
 class TestBusinessMethods:
 
     @pytest.fixture(scope="function")
-    def start(self, utc_90days_ago) -> "datetime":
+    def start(self, utc_90days_ago) -> datetime:
         s = utc_90days_ago.replace(microsecond=0)
         return s
 
@@ -1149,7 +1149,7 @@ class TestBusinessMethods:
     @pytest.fixture(scope="function")
     def duration(
         self,
-    ) -> Optional["timedelta"]:
+    ) -> timedelta | None:
         return None
 
     def test_cache_key(self, business, gr_redis):
@@ -1212,7 +1212,7 @@ class TestBusinessMethods:
 
         # We're going to pull only a specific year, but make sure that
         # it's being assigned to the field regardless
-        year = datetime.now(tz=timezone.utc).year
+        year = datetime.now(tz=UTC).year
         res = Business.from_redis(
             uuid=business.uuid,
             fields=[f"pop_financial:{year}"],