Skip to content

Upgrade packages (incl Django 6) #175

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
s4ke wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

Upgrade packages (incl Django 6) #175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b52035b
upgrade versions, multitenancy still broken
s4ke Dec 15, 2025
9dc0d0d
replace assertRegexpMatches with assertRegex in tests
s4ke Dec 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion client/Dockerfile-dev
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# This file is part of NF Compose
# [2019] - [2024] © NeuroForge GmbH & Co. KG

FROM python:3.11
FROM python:3.14

ARG CONTAINER_USER_ID
ARG CONTAINER_GROUP_ID
Expand Down
2 changes: 1 addition & 1 deletion client/ci_just_test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ CUR_DIR=$(pwd)

FAILED='no'

docker run --rm --network "${COMPOSE_PROJECT_NAME}_nfcompose" -v "$(pwd):/client" --rm python:3.11 bash -c 'cp -r /client /tests && cd /tests && rm -rf venv && bash create_venv.sh && source venv/bin/activate && bash install_dev_dependencies.sh && exec bash test.sh'
docker run --rm --network "${COMPOSE_PROJECT_NAME}_nfcompose" -v "$(pwd):/client" --rm python:3.14 bash -c 'cp -r /client /tests && cd /tests && rm -rf venv && bash create_venv.sh && source venv/bin/activate && bash install_dev_dependencies.sh && exec bash test.sh'
check_result "integration tests failed"
# END testing section

Expand Down
4 changes: 2 additions & 2 deletions client/ci_test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ check_result "failed to run ci_setup.sh"
FAILED='no'

# START testing section
HTTP_CODE=$(docker run --rm --network "${COMPOSE_PROJECT_NAME}_nfcompose" --rm python:3.11 bash -c 'exec curl -o /dev/null -w '%{http_code}' -s http://admin:[email protected]:8000/api/')
HTTP_CODE=$(docker run --rm --network "${COMPOSE_PROJECT_NAME}_nfcompose" --rm python:3.14 bash -c 'exec curl -o /dev/null -w '%{http_code}' -s http://admin:[email protected]:8000/api/')
if [ "$HTTP_CODE" == '200' ]; then
echo "successfully got HTTP 200 from skipper"
else
Expand All @@ -32,7 +32,7 @@ else
FAILED='yes'
fi

docker run --rm --network "${COMPOSE_PROJECT_NAME}_nfcompose" -v "$(pwd):/client" --rm python:3.11 bash -c 'cp -r /client /tests && cd /tests && rm -rf venv && bash create_venv.sh && source venv/bin/activate && bash install_dev_dependencies.sh && exec bash test.sh'
docker run --rm --network "${COMPOSE_PROJECT_NAME}_nfcompose" -v "$(pwd):/client" --rm python:3.14 bash -c 'cp -r /client /tests && cd /tests && rm -rf venv && bash create_venv.sh && source venv/bin/activate && bash install_dev_dependencies.sh && exec bash test.sh'
check_result "integration tests failed"
# END testing section

Expand Down
4 changes: 2 additions & 2 deletions deploy/local/test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ check_result "failed to run setup.sh"
FAILED='no'

# START testing section
HTTP_CODE=$(docker run --rm --network "${COMPOSE_PROJECT_NAME}_nfcompose" --rm python:3.11 bash -c 'exec curl -o /dev/null -w '%{http_code}' -s http://admin:[email protected]:8000/api/')
HTTP_CODE=$(docker run --rm --network "${COMPOSE_PROJECT_NAME}_nfcompose" --rm python:3.14 bash -c 'exec curl -o /dev/null -w '%{http_code}' -s http://admin:[email protected]:8000/api/')
if [ "$HTTP_CODE" == '200' ]; then
echo "successfully got HTTP 200 from skipper"
else
Expand All @@ -32,7 +32,7 @@ else
FAILED='yes'
fi

docker run --rm --network "${COMPOSE_PROJECT_NAME}_nfcompose" -v "$(pwd)/integration:/integration" --rm python:3.11 bash -c 'cp -r /integration /tests && cd /tests && bash create_venv.sh && source venv/bin/activate && pip3 install -r requirements.txt && exec bash test.sh'
docker run --rm --network "${COMPOSE_PROJECT_NAME}_nfcompose" -v "$(pwd)/integration:/integration" --rm python:3.14 bash -c 'cp -r /integration /tests && cd /tests && bash create_venv.sh && source venv/bin/activate && pip3 install -r requirements.txt && exec bash test.sh'
check_result "integration tests failed"
# END testing section

Expand Down
4 changes: 2 additions & 2 deletions e2e/nodejs/ci_test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ check_result "failed to run ci_setup.sh"
FAILED='no'

# START testing section
HTTP_CODE=$(docker run --rm --network "${COMPOSE_PROJECT_NAME}_nfcompose" --rm python:3.11 bash -c 'exec curl -o /dev/null -w '%{http_code}' -s http://admin:[email protected]:8000/api/')
HTTP_CODE=$(docker run --rm --network "${COMPOSE_PROJECT_NAME}_nfcompose" --rm python:3.14 bash -c 'exec curl -o /dev/null -w '%{http_code}' -s http://admin:[email protected]:8000/api/')
if [ "$HTTP_CODE" == '200' ]; then
echo "successfully got HTTP 200 from skipper"
else
Expand All @@ -32,7 +32,7 @@ else
FAILED='yes'
fi

docker run --rm --network "${COMPOSE_PROJECT_NAME}_nfcompose" -v "$(pwd):/client" --rm python:3.11 bash -c 'cp -r /client /tests && cd /tests && rm -rf venv && bash create_venv.sh && source venv/bin/activate && bash install_dev_dependencies.sh && exec bash test.sh'
docker run --rm --network "${COMPOSE_PROJECT_NAME}_nfcompose" -v "$(pwd):/client" --rm python:3.14 bash -c 'cp -r /client /tests && cd /tests && rm -rf venv && bash create_venv.sh && source venv/bin/activate && bash install_dev_dependencies.sh && exec bash test.sh'
check_result "integration tests failed"
# END testing section

Expand Down
4 changes: 2 additions & 2 deletions skipper/Dockerfile-base
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# This file is part of NF Compose
# [2019] - [2024] © NeuroForge GmbH & Co. KG

FROM python:3.11
FROM python:3.14

RUN apt-get update && apt-get install -y \
sudo \
Expand All @@ -13,7 +13,7 @@ RUN apt-get update && apt-get install -y \
RUN sudo apt-get upgrade -y

RUN pip install --upgrade setuptools pip
RUN pip install pipenv==2023.10.24
RUN pip install pipenv==2026.0.2
ENV PIPENV_IGNORE_VIRTUALENVS=1

RUN useradd -rm -d /home/skipper -s /bin/bash -g root -G sudo -u 9999 skipper
Expand Down
4 changes: 2 additions & 2 deletions skipper/Dockerfile-base-arm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
# [2019] - [2024] © NeuroForge GmbH & Co. KG


FROM python:3.11
FROM python:3.14

RUN apt-get update && apt-get install -y sudo vim python3-virtualenv python3-setuptools
RUN sudo apt-get upgrade -y

RUN pip install --upgrade pip==23.3.1
RUN pip install pipenv==2023.10.24
RUN pip install pipenv==2026.0.2
ENV PIPENV_IGNORE_VIRTUALENVS=1

RUN useradd -rm -d /home/skipper -s /bin/bash -g root -G sudo -u 9999 skipper
Expand Down
4 changes: 2 additions & 2 deletions skipper/Dockerfile-base-dev
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# This file is part of NF Compose
# [2019] - [2024] © NeuroForge GmbH & Co. KG

FROM python:3.11
FROM python:3.14

# so celery immediately quits and does not wait around to get killed by docker
# this way it puts jobs back that were set to acks_late=True
Expand All @@ -24,7 +24,7 @@ RUN apt-get update && apt-get install -y \

RUN pip install setuptools==68.2.2
RUN pip install --upgrade pip==23.3.1
RUN pip install pipenv==2023.10.24
RUN pip install pipenv==2026.0.2
ENV PIPENV_IGNORE_VIRTUALENVS=1
ENV PIPENV_VENV_IN_PROJECT=1

Expand Down
28 changes: 14 additions & 14 deletions skipper/Pipfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,29 +5,29 @@ name = "pypi"

[packages]
setuptools = "==70.0.0"
djangorestframework = "==3.15.2"
djangorestframework-simplejwt = { version = "==5.3.1" }
djangorestframework = "==3.16.1"
djangorestframework-simplejwt = { version = "==5.5.1" }
# at least required for simplejwt crypto
cryptography = "==43.0.1"
cryptography = "==46.0.3"
django-extensions = "==3.2.3"
psycopg = {version = "==3.2.3", extras = ["binary", "pool"]}
pytz = "==2024.1"
psycopg = {version = "==3.3.2", extras = ["binary", "pool"]}
pytz = "==2025.2"
django-enumchoicefield = "==1.1.0"
requests = "==2.32.2"
django-filter = "==23.5"
requests = "==2.32.5"
django-filter = "==24.3"
gunicorn = {version = "==23.0.0", extras = ["gevent"]}
django-storages = "==1.12.3"
boto3 = "==1.34.49"
celery = "==5.3.6"
django-celery-results = "==2.5.1"
django-guardian = "==2.4.0"
django-multitenant = "==3.0.0"
django-multitenant = "4.1.1"
django-cors-headers = "==4.3.1"
pip-licenses = "==4.3.4"
tblib = "==3.0.0"
jsonschema = {version = "==4.21.0"}
gevent = "==24.2.1"
greenlet = "==3.0.3"
gevent = "==25.9.1"
greenlet = "==3.3.0"
"zope.event" = "==5.0"
"zope.interface" = "==6.2"
mypy = "==1.0.1"
Expand Down Expand Up @@ -55,9 +55,9 @@ opentelemetry-instrumentation-botocore = "==0.48b0"
opentelemetry-instrumentation-psycopg = "==0.48b0"
opentelemetry-instrumentation-redis = "==0.48b0"
sqlparse = "==0.5.0"
Django = "==5.1.5"
Pillow = "==10.3.0"
FormEncode = "==2.0.1"
Django = "==6.0"
Pillow = "==12.0.0"
FormEncode = "==2.1.1"
SQLAlchemy = "==1.4.51"
Deprecated = "==1.2.14"
protobuf = "==3.20.3"
Expand All @@ -74,4 +74,4 @@ coverage = "*"
runProduction = "bash runProduction.sh"

[requires]
python_version = "3.11"
python_version = "3.14"
Loading
Loading