Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Backend
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container Registry
Analyze
Contributor analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Arkindex
Backend
Commits
33c9f0d6
Verified
Commit
33c9f0d6
authored
8 months ago
by
Erwan Rouchet
Browse files
Options
Downloads
Patches
Plain Diff
Bump to Django 5.0
parent
74a10e20
No related branches found
No related tags found
1 merge request
!2356
Bump to Django 5.0
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
.gitlab-ci.yml
+1
-1
1 addition, 1 deletion
.gitlab-ci.yml
Dockerfile
+2
-2
2 additions, 2 deletions
Dockerfile
arkindex/process/tests/test_user_workerruns.py
+1
-2
1 addition, 2 deletions
arkindex/process/tests/test_user_workerruns.py
base/requirements.txt
+1
-1
1 addition, 1 deletion
base/requirements.txt
with
5 additions
and
6 deletions
.gitlab-ci.yml
+
1
−
1
View file @
33c9f0d6
...
...
@@ -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
:
...
...
This diff is collapsed.
Click to expand it.
Dockerfile
+
2
−
2
View file @
33c9f0d6
# 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
...
...
This diff is collapsed.
Click to expand it.
arkindex/process/tests/test_user_workerruns.py
+
1
−
2
View file @
33c9f0d6
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
(
...
...
This diff is collapsed.
Click to expand it.
base/requirements.txt
+
1
−
1
View file @
33c9f0d6
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
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment