Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM mcr.microsoft.com/vscode/devcontainers/python:3.11-bookworm
FROM mcr.microsoft.com/devcontainers/python:3.13-bookworm

RUN rm -f /etc/apt/sources.list.d/yarn.list
RUN apt-get update && \
Expand Down
5 changes: 3 additions & 2 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Comment thread
jarlhengstmengel marked this conversation as resolved.
"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",
Expand All @@ -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"
Comment thread
jarlhengstmengel marked this conversation as resolved.
}
}
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
- `python3-pip` (Debian-based distributions) / `python-pip` (Arch-based distributions)
- `python3-venv` (only on Debian-based distributions)
- `gettext` for translation features
Expand All @@ -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
Expand Down
13 changes: 4 additions & 9 deletions docs/src/installation.rst
Comment thread
timobrembeck marked this conversation as resolved.
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,12 @@ Following packages are required before installing the project (install them with
* `git <https://git-scm.com/>`_
* `npm <https://www.npmjs.com/>`_ version 7 or later
* `nodejs <https://nodejs.org/>`_ version 22 or later
* `python3 <https://www.python.org/>`_ version 3.9 to 3.11 (for above 3.11 see below)
* `python3 <https://www.python.org/>`_ version 3.13
* `python3-pip <https://packages.ubuntu.com/search?keywords=python3-pip>`_ (`Debian-based distributions <https://en.wikipedia.org/wiki/Category:Debian-based_distributions>`_, e.g. `Ubuntu <https://ubuntu.com>`__) / `python-pip <https://www.archlinux.de/packages/extra/x86_64/python-pip>`_ (`Arch-based distributions <https://wiki.archlinux.org/index.php/Arch-based_distributions>`_)
* `python3-venv <https://packages.ubuntu.com/search?keywords=python3+venv>`_ (Only `Debian-based distributions <https://en.wikipedia.org/wiki/Category:Debian-based_distributions>`_, e.g. `Ubuntu <https://ubuntu.com>`__)
* Either `postgresql <https://www.postgresql.org/>`_ **or** `docker <https://www.docker.com/>`_ to run a local database server
* `gettext <https://www.gnu.org/software/gettext/>`_ and `pcregrep <https://pcre.org/original/doc/html/pcregrep.html>`_ 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
-------------------------------------

Expand Down Expand Up @@ -61,7 +56,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
Expand Down Expand Up @@ -131,5 +126,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``
2 changes: 1 addition & 1 deletion publiccode.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ dependsOn:
version: "15"
optional: false
- name: "Python"
version: "3.11"
version: "3.13"
optional: false
- name: "Redis"
optional: true
2 changes: 1 addition & 1 deletion tools/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading