Update from jazz (#53)

* Jazz Update: removed usages of datetime.utcnow() and datetime.utcfromtimestamp() by @kozlek

* Drop Black: Removed black for ruff

* Missing CI dependency: Fixed freezegun package missing in CI test

* EOL Python: Removed EOL python

* more on CI test

Author: eadwinCode

.github/workflows/test_full.yml

@@ -11,8 +11,17 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']
-        django-version: ['<2.1', '<2.2', '<3.0', '<3.1', '<3.2', '<3.3', '<4.1', '<4.2']
+        python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']
+        django-version: ['<3.2', '<3.3', '<4.1', '<4.2']
+        exclude:
+          - python-version: '3.8'
+            django-version: '<5.1'
+          - python-version: '3.9'
+            django-version: '<5.1'
+          - python-version: '3.12'
+            django-version: '<3.2'
+          - python-version: '3.12'
+            django-version: '<3.3'
 
     steps:
       - uses: actions/checkout@v4
@@ -23,7 +32,7 @@ jobs:
       - name: Install core
         run: pip install "Django${{ matrix.django-version }}"
       - name: Install tests
-        run: pip install pytest pytest-asyncio pytest-django django-ninja-extra python-jose==3.3.0 pyjwt[crypto]
+        run: pip install pytest pytest-asyncio pytest-django django-ninja-extra 'python-jose==3.3.0' 'pyjwt[crypto]' freezegun
       - name: Test
         run: pytest
   codestyle:
@@ -39,7 +48,5 @@ jobs:
         run: pip install flit
       - name: Install Dependencies
         run: flit install --symlink
-      - name: Black
-        run: black --check ninja_jwt tests
       - name: Ruff Linting Check
         run: ruff check ninja_jwt tests

Makefile

@@ -9,35 +9,28 @@ clean: ## Removing cached python compiled files
 	find . -name \*pyo | xargs  rm -fv
 	find . -name \*~  | xargs  rm -fv
 	find . -name __pycache__  | xargs  rm -rfv
+	find . -name .ruff_cache  | xargs  rm -rfv
 
-install: ## Install dependencies
-	make clean
+install:clean ## Install dependencies
 	flit install --deps develop --symlink
 	pre-commit install -f
 
-lint: ## Run code linters
-	make clean
-	black --check ninja_jwt tests
+lint:fmt ## Run code linters
 	ruff check ninja_jwt tests
 # 	mypy  ninja_jwt
 
-fmt format: ## Run code formatters
-	make clean
-	black ninja_jwt tests
+fmt format:clean ## Run code formatters
+	ruff format ninja_jwt tests
 	ruff check --fix ninja_jwt tests
 
-test: ## Run tests
-	make clean
+test:clean ## Run tests
 	pytest .
 
-test-cov: ## Run tests with coverage
-	make clean
+test-cov:clean ## Run tests with coverage
 	pytest --cov=ninja_jwt --cov-report term-missing tests
 
-doc-deploy: ## Run Deploy Documentation
-	make clean
+doc-deploy:clean ## Run Deploy Documentation
 	mkdocs gh-deploy --force
 
-doc-serve: ## Run Deploy Documentation
-	make clean
+doc-serve:clean ## Run Deploy Documentation
 	mkdocs serve

ninja_jwt/utils.py

@@ -51,15 +51,23 @@ def make_utc(dt):
 
 
 def aware_utcnow():
-    return make_utc(datetime.utcnow())
+    dt = datetime.now(tz=timezone.utc)
+    if not settings.USE_TZ:
+        dt = dt.replace(tzinfo=None)
+
+    return dt
 
 
 def datetime_to_epoch(dt):
     return timegm(dt.utctimetuple())
 
 
 def datetime_from_epoch(ts):
-    return make_utc(datetime.utcfromtimestamp(ts))
+    dt = datetime.fromtimestamp(ts, tz=timezone.utc)
+    if not settings.USE_TZ:
+        dt = dt.replace(tzinfo=None)
+
+    return dt
 
 
 def format_lazy(s, *args, **kwargs):

pyproject.toml

@@ -33,11 +33,10 @@ classifiers = [
     "Programming Language :: Python :: 3.8",
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3 :: Only",
     "Framework :: Django",
-    "Framework :: Django :: 2.1",
-    "Framework :: Django :: 2.2",
-    "Framework :: Django :: 3.0",
     "Framework :: Django :: 3.1",
     "Framework :: Django :: 3.2",
     "Framework :: Django :: 4.0",
@@ -66,11 +65,11 @@ test = [
     "pytest-cov",
     "pytest-django",
     "pytest-asyncio",
-    "black ==23.10.1",
-    "ruff ==0.1.4",
+    "ruff ==0.1.7",
     "django-stubs",
     "python-jose==3.3.0",
-    "click==8.1.7"
+    "click==8.1.7",
+    "freezegun"
 ]
 
 crypto = [

tests/test_utils.py

@@ -1,8 +1,8 @@
 from datetime import datetime, timedelta
-from unittest.mock import patch
 
 from django.test.utils import override_settings
 from django.utils import timezone
+from freezegun import freeze_time
 
 from ninja_jwt.utils import (
     aware_utcnow,
@@ -34,11 +34,9 @@ def test_it_should_return_the_correct_values(self):
 
 class TestAwareUtcnow:
     def test_it_should_return_the_correct_value(self):
-        now = datetime.utcnow()
-
-        with patch("ninja_jwt.utils.datetime") as fake_datetime:
-            fake_datetime.utcnow.return_value = now
+        now = datetime.now(tz=timezone.utc).replace(tzinfo=None)
 
+        with freeze_time(now):
             # Should return aware utcnow if USE_TZ == True
             with override_settings(USE_TZ=True):
                 assert timezone.make_aware(now, timezone=timezone.utc) == aware_utcnow()