diff --git a/CHANGES.rst b/CHANGES.rst index bdd71396..0902110e 100755 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,8 +1,8 @@ 3Di Results Analysis changelog ======================== -3.12 (unreleased) ------------------ +3.11.1 (2024-12-06) +------------------- - Compatibility with Python 3.12 (#1061) - Bumped h5py to 3.10.0 and scipy to 1.13.0 for python 3.12 compatibility (#1061) diff --git a/Dockerfile b/Dockerfile index 832cb5b0..6a928fb9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ -from qgis/qgis:final-3_28_4 +FROM qgis/qgis:3.40 RUN apt-get update && apt-get install -y python3-pyqt5.qtwebsockets wget python3-scipy python3-h5py zip && apt-get clean # RUN mkdir -p /tests_directory COPY requirements-dev.txt /root # coverage is already installed globally, so we need to force-install it explicitly -RUN pip3 install 'coverage>6.1.1,<7.0' --force -RUN pip3 install -r /root/requirements-dev.txt -RUN qgis_setup.sh +RUN pip3 install 'coverage>6.1.1,<7.0' --force --break-system-packages +RUN pip3 install -r /root/requirements-dev.txt --break-system-packages +# RUN qgis_setup.sh # Copied the original PYTHONPATH and added the profile's python dir to # imitate qgis' behaviour. -ENV PYTHONPATH /usr/share/qgis/python/:/usr/share/qgis/python/plugins:/usr/lib/python3/dist-packages/qgis:/usr/share/qgis/python/qgis:/root/.local/share/QGIS/QGIS3/profiles/default/python +ENV PYTHONPATH=/usr/share/qgis/python/:/usr/share/qgis/python/plugins:/usr/lib/python3/dist-packages/qgis:/usr/share/qgis/python/qgis:/root/.local/share/QGIS/QGIS3/profiles/default/python # Note: we'll mount the current dir into this WORKDIR WORKDIR /root/.local/share/QGIS/QGIS3/profiles/default/python/plugins/threedi_results_analysis diff --git a/version.rst b/version.rst index db7923e2..371cfe35 100644 --- a/version.rst +++ b/version.rst @@ -1 +1 @@ -3.12.dev0 +3.11.1