From 11ef6dad89d2d2151d76826917a458806fbcafb1 Mon Sep 17 00:00:00 2001 From: jarlhengstmengel Date: Thu, 30 Jul 2026 13:05:25 +0000 Subject: [PATCH 1/4] Update Documentation and Devcontainer to python 3.13 --- .devcontainer/Dockerfile | 2 +- .devcontainer/devcontainer.json | 2 +- README.md | 2 +- docs/src/installation.rst | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index ff21399b81..543636188a 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/vscode/devcontainers/python:3.11-bookworm +FROM mcr.microsoft.com/vscode/devcontainers/python:3.13-bookworm RUN rm -f /etc/apt/sources.list.d/yarn.list RUN apt-get update && \ diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 5fa9308674..b7c50a0f82 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -30,7 +30,7 @@ } } }, - "postCreateCommand": "./tools/install.sh --python python3.11 && ./tools/migrate.sh && ./tools/loadtestdata.sh", + "postCreateCommand": "./tools/install.sh --python python3.13 && ./tools/migrate.sh && ./tools/loadtestdata.sh", "postStartCommand": "git config --global --add safe.directory ${containerWorkspaceFolder} && redis-server --daemonize yes --unixsocket /workspace/redis-server.sock --unixsocketperm 770", "remoteEnv": { "DJANGO_SETTINGS_MODULE": "integreat_cms.core.settings", diff --git a/README.md b/README.md index 859e017140..374efca664 100644 --- a/README.md +++ b/README.md @@ -40,7 +40,7 @@ To configure your development environment on your system, please follow these st 1. Ensure that the following packages are installed alongside your preferred IDE: - `npm` version 7 or later - `nodejs` version 22 or later - - `python3` version 3.11 or later + - `python3` version 3.13 or later - `python3-pip` (Debian-based distributions) / `python-pip` (Arch-based distributions) - `python3-venv` (only on Debian-based distributions) - `gettext` for translation features diff --git a/docs/src/installation.rst b/docs/src/installation.rst index f83152827e..8771577690 100644 --- a/docs/src/installation.rst +++ b/docs/src/installation.rst @@ -61,7 +61,7 @@ In the following, we provide the commands to install all these prerequisites on # Add PPA repository for Python3.9 and above sudo add-apt-repository -y ppa:deadsnakes/ppa # Install basic requirements - sudo apt install -y apt-transport-https curl gettext git pcregrep python3-pip python3.11 python3.11-venv libcairo2 + sudo apt install -y apt-transport-https curl gettext git pcregrep python3-pip python3.13 python3.13-venv libcairo2 # Add PPA repository for NodeJS curl -fsSL https://deb.nodesource.com/setup_22.x | sudo -E bash - # Add PPA repository for Docker @@ -131,5 +131,5 @@ And install it using our developer tool :github-source:`tools/install.sh`:: - This script checks whether the required system-dependencies are installed and installs the project-dependencies via npm and pip. If only one of both dependency-managers should be invoked, run ``npm ci`` or ``pip install -e .[dev-pinned,pinned]`` directly. - - If your system uses Python 3.12 as the default (e.g., Ubuntu 24.04 or similar), you need to install Python 3.11 alongside it, without changing the default python3 symlink. - Then, to ensure the CMS uses Python 3.11, run the installation script with the appropriate interpreter: ``./tools/install.sh --python python3.11`` + - If your system uses Python 3.12 as the default (e.g., Ubuntu 24.04 or similar), you need to install Python 3.13 alongside it, without changing the default python3 symlink. + Then, to ensure the CMS uses Python 3.13, run the installation script with the appropriate interpreter: ``./tools/install.sh --python python3.13`` From cbeaab3a58d46a7cc5e558b4ee3b7ad7baeb0040 Mon Sep 17 00:00:00 2001 From: jarlhengstmengel Date: Thu, 30 Jul 2026 13:46:48 +0000 Subject: [PATCH 2/4] Some Devcontainer tweeks --- .devcontainer/devcontainer.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index b7c50a0f82..a4e78d4f02 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -30,7 +30,7 @@ } } }, - "postCreateCommand": "./tools/install.sh --python python3.13 && ./tools/migrate.sh && ./tools/loadtestdata.sh", + "postCreateCommand": "./tools/install.sh --python python3.13 && ./tools/migrate.sh", "postStartCommand": "git config --global --add safe.directory ${containerWorkspaceFolder} && redis-server --daemonize yes --unixsocket /workspace/redis-server.sock --unixsocketperm 770", "remoteEnv": { "DJANGO_SETTINGS_MODULE": "integreat_cms.core.settings", @@ -39,6 +39,7 @@ "INTEGREAT_CMS_FCM_KEY": "dummy", "INTEGREAT_CMS_SECRET_KEY": "dummy", "INTEGREAT_CMS_BACKGROUND_TASKS_ENABLED": "0", - "INTEGREAT_CMS_LINKCHECK_DISABLE_LISTENERS": "1" + "INTEGREAT_CMS_SUMM_AI_API_KEY": "dummy", + "INTEGREAT_CMS_LINKCHECK_DISABLE_LISTENERS": "0" } } From 8f4cde1c112e8829dad1a76cd7b71fd99b033cc1 Mon Sep 17 00:00:00 2001 From: jarlhengstmengel Date: Tue, 11 Aug 2026 13:03:08 +0000 Subject: [PATCH 3/4] Apply suggestions --- .devcontainer/Dockerfile | 2 +- README.md | 4 ++-- docs/src/installation.rst | 7 +------ tools/install.sh | 2 +- 4 files changed, 5 insertions(+), 10 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 543636188a..3e89f0a822 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/vscode/devcontainers/python:3.13-bookworm +FROM mcr.microsoft.com/devcontainers/python:3.13-bookworm RUN rm -f /etc/apt/sources.list.d/yarn.list RUN apt-get update && \ diff --git a/README.md b/README.md index 374efca664..3fdc84f2ed 100644 --- a/README.md +++ b/README.md @@ -40,7 +40,7 @@ To configure your development environment on your system, please follow these st 1. Ensure that the following packages are installed alongside your preferred IDE: - `npm` version 7 or later - `nodejs` version 22 or later - - `python3` version 3.13 or later + - `python3` version 3.13 - `python3-pip` (Debian-based distributions) / `python-pip` (Arch-based distributions) - `python3-venv` (only on Debian-based distributions) - `gettext` for translation features @@ -58,7 +58,7 @@ To configure your development container, please follow these steps carefully. 2. Open the project in VSCode. 3. If you're opening VSCode for the first time, you'll be prompted to install the ["Dev Containers" extension](https://marketplace.visualstudio.com/items?itemName=ms-vscode-remote.remote-containers). Click "Install" to proceed. 4. Open the command palette (Ctrl + Shift + P or Cmd + Shift + P on macOS) and search for "> Remote-Containers: Open Folder in Container". -5. VSCode will open the project in a new container, install all further required tools and load the testdata. +5. VSCode will open the project in a new container, install all further required tools. #### Known Limitations diff --git a/docs/src/installation.rst b/docs/src/installation.rst index 8771577690..48ec2f967a 100644 --- a/docs/src/installation.rst +++ b/docs/src/installation.rst @@ -15,17 +15,12 @@ Following packages are required before installing the project (install them with * `git `_ * `npm `_ version 7 or later * `nodejs `_ version 22 or later -* `python3 `_ version 3.9 to 3.11 (for above 3.11 see below) +* `python3 `_ version 3.13 * `python3-pip `_ (`Debian-based distributions `_, e.g. `Ubuntu `__) / `python-pip `_ (`Arch-based distributions `_) * `python3-venv `_ (Only `Debian-based distributions `_, e.g. `Ubuntu `__) * Either `postgresql `_ **or** `docker `_ to run a local database server * `gettext `_ and `pcregrep `_ to use the translation features -.. Note:: - - If your distro does not contain python3.9 or later, you first have to add a ppa repository, e.g. ``sudo add-apt-repository ppa:deadsnakes/ppa``. - - Prerequisites on common distributions ------------------------------------- diff --git a/tools/install.sh b/tools/install.sh index 720ac238c7..dd5248e912 100755 --- a/tools/install.sh +++ b/tools/install.sh @@ -73,7 +73,7 @@ if [[ $(major "$npm_version") -lt "$required_npm_version" ]]; then exit 1 fi # Define the required npm version -required_node_version="18" +required_node_version="22" # Check if nodejs is installed if [[ ! -x "$(command -v node)" ]]; then echo "The package nodejs is not installed. Please install nodejs version ${required_node_version} or higher manually and run this script again." | print_error From 11058793b32b0923c6ecad01f583771f16fa25e8 Mon Sep 17 00:00:00 2001 From: jarlhengstmengel Date: Tue, 11 Aug 2026 13:09:31 +0000 Subject: [PATCH 4/4] Apply suggestion publicode.yml --- publiccode.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/publiccode.yml b/publiccode.yml index eb5c43cfc6..7a03def877 100644 --- a/publiccode.yml +++ b/publiccode.yml @@ -56,7 +56,7 @@ dependsOn: version: "15" optional: false - name: "Python" - version: "3.11" + version: "3.13" optional: false - name: "Redis" optional: true