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
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ jobs:
uses: maykinmedia/setup-django-backend@v1.3
with:
apt-packages: 'libxml2-dev libxmlsec1-dev libxmlsec1-openssl gettext postgresql-client libgdal-dev gdal-bin'
python-version: '3.11'
python-version: '3.12'
optimize-postgres: 'yes'
pg-service: 'postgres'
setup-node: 'yes'
Expand Down Expand Up @@ -117,7 +117,7 @@ jobs:
- name: Set up Python
uses: actions/setup-python@v5
with:
python-version: '3.11'
python-version: '3.12'
- name: Install coverage.py
# We only need coverage, but we need to match the version that was used
# to generate the coverage files. Grab it from the dependencies.
Expand Down Expand Up @@ -179,7 +179,7 @@ jobs:
uses: maykinmedia/setup-django-backend@v1.3
with:
apt-packages: 'libxml2-dev libxmlsec1-dev libxmlsec1-openssl gettext postgresql-client libgdal-dev gdal-bin'
python-version: '3.11'
python-version: '3.12'
optimize-postgres: 'yes'
pg-service: 'postgres'
setup-node: 'yes'
Expand Down Expand Up @@ -214,7 +214,7 @@ jobs:
uses: maykinmedia/setup-django-backend@v1.3
with:
apt-packages: 'libxml2-dev libxmlsec1-dev libxmlsec1-openssl gettext libgdal-dev gdal-bin graphviz'
python-version: '3.11'
python-version: '3.12'
setup-node: 'no'

- name: Build and test docs
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/code-quality.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
with:
python-version: '3.11'
python-version: '3.12'
- name: Install system packages
run: |
sudo apt-get update \
Expand Down Expand Up @@ -75,7 +75,7 @@ jobs:
- name: Install Python
uses: actions/setup-python@v5
with:
python-version: '3.11'
python-version: '3.12'
- name: Install dependencies
run: |
pip install uv
Expand All @@ -92,7 +92,7 @@ jobs:
- name: Install Python
uses: actions/setup-python@v5
with:
python-version: '3.11'
python-version: '3.12'
- name: Install dependencies
run: |
pip install uv
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/dependencies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
with:
python-version: '3.11'
python-version: '3.12'

- name: Install uv
uses: astral-sh/setup-uv@v5
Expand All @@ -48,7 +48,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
with:
python-version: '3.11'
python-version: '3.12'

- name: Install OS-level deps
run: brew install postgresql
Expand Down
2 changes: 1 addition & 1 deletion .python-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.11
3.12
2 changes: 1 addition & 1 deletion .readthedocs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ build:
- wget
- graphviz
tools:
python: '3.11'
python: '3.12'

python:
install:
Expand Down
3 changes: 2 additions & 1 deletion CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ Bugfixes
Onderhoud
---------

* ...
* [:taiga-us:`3461`, :taiga-ta:`3472`, :pr:`1834`]: Python versie bijgewerkt naar
``v3.12``.

1.35.0 (2025-09-18)
===================
Expand Down
9 changes: 3 additions & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,13 @@

# Stage 1 - Backend build environment
# includes compilers and build tooling to create the environment
FROM python:3.11-slim-bookworm AS backend-build
FROM python:3.12-slim-bookworm AS backend-build

RUN apt-get update && apt-get upgrade -y && apt-get install -y --no-install-recommends \
pkg-config \
build-essential \
git \
libpq-dev \
libxml2-dev \
libxmlsec1-dev \
libxmlsec1-openssl \
libgdk-pixbuf2.0-0 \
libffi-dev \
Expand Down Expand Up @@ -57,7 +55,7 @@ COPY ./src /app/src
RUN npm run build

# Stage 3 - Build docker image suitable for production
FROM python:3.11-slim-bookworm
FROM python:3.12-slim-bookworm

# Stage 3.1 - Set up the needed production dependencies
# Note: mime-support becomes media-types in Debian Bullseye (required for correctly serving mime-types for images)
Expand All @@ -71,7 +69,6 @@ RUN apt-get update && apt-get upgrade -y && apt-get install -y --no-install-reco
libgdal32 \
libgeos-c1v5 \
libproj25 \
libxmlsec1-dev \
libxmlsec1-openssl \
libgdk-pixbuf2.0-0 \
libffi-dev \
Expand All @@ -97,7 +94,7 @@ COPY ./bin/check_celery_worker_liveness.py ./bin/
VOLUME ["/app/log", "/app/media", "/app/private_media"]

# copy backend build deps
COPY --from=backend-build /usr/local/lib/python3.11 /usr/local/lib/python3.11
COPY --from=backend-build /usr/local/lib/python3.12 /usr/local/lib/python3.12
COPY --from=backend-build /usr/local/bin/uwsgi /usr/local/bin/uwsgi
COPY --from=backend-build /usr/local/bin/celery /usr/local/bin/celery

Expand Down
2 changes: 1 addition & 1 deletion INSTALL.rst
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Prerequisites

You need the following libraries and/or programs:

* `Python`_ 3.11 or above
* `Python`_ 3.12 or above
* Python `Virtualenv`_ and `Pip`_
* `PostgreSQL`_ 10 or above with PostGIS extension
* `Node.js`_
Expand Down
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Open Inwoner
:Demo: https://openinwoner.nl
:Source: https://github.com/maykinmedia/open-inwoner
:Documentation: https://docs.openinwoner.nl
:PythonVersion: 3.11
:PythonVersion: 3.12

|build-status| |docker| |black| |python-versions|

Expand Down
6 changes: 3 additions & 3 deletions bin/compile_dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@ cd $toplevel
export CUSTOM_COMPILE_COMMAND="./bin/compile_dependencies.sh"

# Base (& prod) deps
uv pip compile --no-strip-extras --python 3.11 \
uv pip compile --no-strip-extras --python 3.12 \
--no-emit-index-url \
--output-file requirements/base.txt \
"$@" \
requirements/base.in

# Dependencies for testing
uv pip compile --no-strip-extras --python 3.11 \
uv pip compile --no-strip-extras --python 3.12 \
--no-emit-index-url \
--output-file requirements/ci.txt \
"$@" \
Expand All @@ -37,7 +37,7 @@ uv pip compile --no-strip-extras --python 3.11 \
requirements/docs.in

# Dev dependencies - exact same set as CI + some extra tooling
uv pip compile --no-strip-extras --python 3.11 \
uv pip compile --no-strip-extras --python 3.12 \
--no-emit-index-url \
--output-file requirements/dev.txt \
"$@" \
Expand Down
2 changes: 1 addition & 1 deletion docs/installation/development.rst
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Prerequisites

You need the following libraries and/or programs:

* `Python`_ 3.11 or above
* `Python`_ 3.12 or above
* Python `Virtualenv`_ and `Pip`_
* `PostgreSQL`_ 10 or above with PostGIS extension
* `Node.js`_
Expand Down
18 changes: 9 additions & 9 deletions requirements/base.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# This file was autogenerated by uv via the following command:
# uv pip compile --no-strip-extras --python 3.11 --no-emit-index-url --output-file requirements/base.txt requirements/base.in
# uv pip compile --no-strip-extras --python 3.12 --no-emit-index-url --output-file requirements/base.txt requirements/base.in
aldryn-apphooks-config==0.7.0
# via -r requirements/base.in
amqp==5.1.1
Expand All @@ -14,8 +14,6 @@ asgiref==3.7.2
# django-htmx
asn1crypto==1.5.1
# via webauthn
async-timeout==4.0.3
# via redis
attrs==21.2.0
# via
# glom
Expand Down Expand Up @@ -53,7 +51,9 @@ cffi==1.15.0
# cryptography
# weasyprint
charset-normalizer==2.0.6
# via requests
# via
# reportlab
# requests
click==8.1.3
# via
# celery
Expand Down Expand Up @@ -239,7 +239,7 @@ django-phonenumber-field==5.2.0
# via django-two-factor-auth
django-polymorphic==3.0.0
# via django-filer
django-privates==1.5.0
django-privates==3.1.1
# via
# -r requirements/base.in
# django-simple-certmanager
Expand All @@ -251,7 +251,7 @@ django-relativedelta==2.0.0
# via zgw-consumers
django-sekizai==4.0.0
# via django-cms
django-sendfile2==0.7.0
django-sendfile2==0.7.2
# via django-privates
django-sessionprofile==1.0
# via
Expand Down Expand Up @@ -384,7 +384,7 @@ jsonschema==4.1.0
# via drf-spectacular
kombu==5.5.4
# via celery
lxml==4.9.1
lxml==6.0.0
# via
# django-digid-eherkenning
# mail-editor
Expand Down Expand Up @@ -511,7 +511,7 @@ redis==5.0.3
# via
# celery-once
# django-redis
reportlab==3.6.13
reportlab==4.4.2
# via
# easy-thumbnails
# svglib
Expand Down Expand Up @@ -607,7 +607,7 @@ xlrd==2.0.1
# via tablib
xlwt==1.3.0
# via tablib
xmlsec==1.3.12
xmlsec==1.3.16
# via maykin-python3-saml
xsdata==23.8
# via -r requirements/base.in
Expand Down
18 changes: 7 additions & 11 deletions requirements/ci.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# This file was autogenerated by uv via the following command:
# uv pip compile --no-strip-extras --python 3.11 --no-emit-index-url --output-file requirements/ci.txt requirements/base.txt requirements/test-tools.in requirements/docs.in
# uv pip compile --no-strip-extras --python 3.12 --no-emit-index-url --output-file requirements/ci.txt requirements/base.txt requirements/test-tools.in requirements/docs.in
alabaster==0.7.16
# via sphinx
aldryn-apphooks-config==0.7.0
Expand Down Expand Up @@ -32,11 +32,6 @@ asn1crypto==1.5.1
# -c requirements/base.txt
# -r requirements/base.txt
# webauthn
async-timeout==4.0.3
# via
# -c requirements/base.txt
# -r requirements/base.txt
# redis
attrs==21.2.0
# via
# -c requirements/base.txt
Expand Down Expand Up @@ -102,6 +97,7 @@ charset-normalizer==2.0.6
# via
# -c requirements/base.txt
# -r requirements/base.txt
# reportlab
# requests
click==8.1.3
# via
Expand Down Expand Up @@ -398,7 +394,7 @@ django-polymorphic==3.0.0
# -c requirements/base.txt
# -r requirements/base.txt
# django-filer
django-privates==1.5.0
django-privates==3.1.1
# via
# -c requirements/base.txt
# -r requirements/base.txt
Expand All @@ -421,7 +417,7 @@ django-sekizai==4.0.0
# -c requirements/base.txt
# -r requirements/base.txt
# django-cms
django-sendfile2==0.7.0
django-sendfile2==0.7.2
# via
# -c requirements/base.txt
# -r requirements/base.txt
Expand Down Expand Up @@ -683,7 +679,7 @@ kombu==5.5.4
# -c requirements/base.txt
# -r requirements/base.txt
# celery
lxml==4.9.1
lxml==6.0.0
# via
# -c requirements/base.txt
# -r requirements/base.txt
Expand Down Expand Up @@ -934,7 +930,7 @@ redis==5.0.3
# -r requirements/base.txt
# celery-once
# django-redis
reportlab==3.6.13
reportlab==4.4.2
# via
# -c requirements/base.txt
# -r requirements/base.txt
Expand Down Expand Up @@ -1141,7 +1137,7 @@ xlwt==1.3.0
# -c requirements/base.txt
# -r requirements/base.txt
# tablib
xmlsec==1.3.12
xmlsec==1.3.16
# via
# -c requirements/base.txt
# -r requirements/base.txt
Expand Down
Loading
Loading