Skip to content

Commit

Permalink
Merge pull request #720 from intuitem/update/django5.1
Browse files Browse the repository at this point in the history
use django 5.1
  • Loading branch information
ab-smith authored Aug 27, 2024
2 parents ed9c45c + 1ef6f54 commit db8685f
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion backend/app_tests/api/test_utils.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from django.db import models
from knox.auth import AuthToken
from knox.models import AuthToken
import pytest
import json
import re
Expand Down
2 changes: 1 addition & 1 deletion backend/app_tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
from test_vars import GROUPS_PERMISSIONS
from iam.models import User, UserGroup
from core.apps import startup
from knox.auth import AuthToken
from knox.models import AuthToken


class Test(dict):
Expand Down
2 changes: 1 addition & 1 deletion backend/ciso_assistant/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ def set_ciso_assistant_url(_, __, event_dict):
}

REST_KNOX = {
"SECURE_HASH_ALGORITHM": "cryptography.hazmat.primitives.hashes.SHA512",
"SECURE_HASH_ALGORITHM": "hashlib.sha512",
"AUTH_TOKEN_CHARACTER_LENGTH": 64,
"TOKEN_TTL": timedelta(seconds=AUTH_TOKEN_TTL),
"TOKEN_LIMIT_PER_USER": None,
Expand Down
2 changes: 1 addition & 1 deletion backend/iam/utils.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from knox.auth import AuthToken
from knox.models import AuthToken


def generate_token(user):
Expand Down
22 changes: 11 additions & 11 deletions backend/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
django==5.0.8
django==5.1
weasyprint==62.3
psycopg2-binary==2.9.9
gunicorn==22.0.0
pytest-django==4.8.0
pytest-html==4.1.1
django-filter==24.2
django-filter==24.3
whitenoise==6.7.0
argon2-cffi==23.1.0
typing-extensions==4.12.2
djangorestframework==3.15.2
django-stubs==5.0.2
coverage==7.5.4
django-stubs==5.0.4
coverage==7.6.1
django-tailwind==3.8.0
pyyaml==6.0.1
pyyaml==6.0.2
django-structlog==8.1.0
structlog==24.2.0
structlog==24.4.0
python-dotenv==1.0.1
drf-spectacular==0.27.2
django-rest-knox==4.2.0
django-allauth[socialaccount]==0.63.5
pre-commit==3.7.1
django-allauth[saml]==0.63.5
django-allauth==0.63.5
django-rest-knox==5.0.1
django-allauth[socialaccount]==64.0.0
pre-commit==3.8.0
django-allauth[saml]==64.0.0
django-allauth==64.0.0

0 comments on commit db8685f

Please sign in to comment.