From 33c9f0d6f5f3d7ac0c293e15a0eeabe22389ae58 Mon Sep 17 00:00:00 2001
From: Erwan Rouchet <rouchet@teklia.com>
Date: Tue, 2 Jul 2024 10:28:12 +0200
Subject: [PATCH] Bump to Django 5.0
---
.gitlab-ci.yml | 2 +-
Dockerfile | 4 ++--
arkindex/process/tests/test_user_workerruns.py | 3 +--
base/requirements.txt | 2 +-
4 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c58015fa04..494c015d2f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,7 +11,7 @@ include:
# For jobs that run backend scripts directly
.backend-setup:
- image: registry.gitlab.teklia.com/arkindex/backend/base:django-4.2
+ image: registry.gitlab.teklia.com/arkindex/backend/base:django-5.0
cache:
paths:
diff --git a/Dockerfile b/Dockerfile
index 591f81dd54..26195de587 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,11 +1,11 @@
# syntax=docker/dockerfile:1
-FROM registry.gitlab.teklia.com/arkindex/backend/base:django-4.2 as build
+FROM registry.gitlab.teklia.com/arkindex/backend/base:django-5.0 as build
RUN mkdir build
ADD . build
RUN cd build && python3 setup.py sdist
-FROM registry.gitlab.teklia.com/arkindex/backend/base:django-4.2
+FROM registry.gitlab.teklia.com/arkindex/backend/base:django-5.0
# Install arkindex and its deps
# Uses a source archive instead of full local copy to speedup docker build
diff --git a/arkindex/process/tests/test_user_workerruns.py b/arkindex/process/tests/test_user_workerruns.py
index a205e6ad8a..c3fb19ece5 100644
--- a/arkindex/process/tests/test_user_workerruns.py
+++ b/arkindex/process/tests/test_user_workerruns.py
@@ -1,8 +1,7 @@
-from datetime import datetime
+from datetime import datetime, timezone
from unittest.mock import call, patch
from django.urls import reverse
-from django.utils import timezone
from rest_framework import status
from arkindex.process.models import (
diff --git a/base/requirements.txt b/base/requirements.txt
index 7d69933625..c4d5f9292c 100644
--- a/base/requirements.txt
+++ b/base/requirements.txt
@@ -1,6 +1,6 @@
boto3==1.18.13
cryptography==3.4.7
-Django==4.2.13
+Django==5.0.6
ed25519==1.5
lxml==4.9.2
psycopg2-binary==2.9.1
--
GitLab