Merge pull request #681 from geoadmin/develop-2025-08-27

New Release 2025-08-27-rc1

Author: ltclm

.pylintrc

@@ -62,8 +62,6 @@ confidence=
 # --disable=W".
 disable=missing-docstring,
     missing-module-docstring,
-    bad-continuation,   # bad-continuation doesn't comply with yapf, so lets
-                        # yapf correct indentation continuation issue
     useless-object-inheritance,
     C0103,
 
@@ -199,13 +197,6 @@ max-line-length=100
 # Maximum number of lines in a module.
 max-module-lines=1000
 
-# List of optional constructs for which whitespace checking is disabled. `dict-
-# separator` is used to allow tabulation in dicts, etc.: {1  : 1,\n222: 2}.
-# `trailing-comma` allows a space between comma and closing bracket: (a, ).
-# `empty-line` allows space-only lines.
-no-space-check=trailing-comma,
-               dict-separator
-
 # Allow the body of a class to be on the same line as the declaration if body
 # contains single statement.
 single-line-class-stmt=no
@@ -520,6 +511,5 @@ min-public-methods=2
 
 # Exceptions that will emit a warning when being caught. Defaults to
 # "BaseException, Exception".
-overgeneral-exceptions=BaseException,
-                       Exception,
-                       StandardError
+overgeneral-exceptions=builtins.BaseException,
+                       builtins.Exception,

Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.9.9-slim-buster as sphinxsearch_base
+FROM python:3.13-slim-bookworm as sphinxsearch_base
 
 RUN apt-get update && \
     apt-get install -y \
@@ -35,8 +35,9 @@ RUN groupadd -r geodata -g 2500 && \
     chown -R geodata:geodata /var/run/sphinxsearch/ && \
     chown -R geodata:geodata /var/log/sphinxsearch/ && \
     chown -R geodata:geodata /etc/sphinxsearch && \
-    # install pip3 psycopg2, python3.9 does not (yet) support python3-psycopg2 package
-    gosu geodata pip3 install psycopg2-binary==2.9.2
+    # install psycopg2 via pip, because the apt package (python3-psycopg2) is built for Debian's
+    # default python3.11, not the python version used in this image (3.13).
+    gosu geodata pip3 install psycopg2-binary==2.9.10
 
 FROM sphinxsearch_geodata
 

Pipfile

@@ -5,7 +5,7 @@ name = "pypi"
 
 [packages]
 # added for pylint on scripts/pg2sphinx_trigger.py import-error
-psycopg2-binary = "~=2.9.2"
+psycopg2-binary = "~=2.9.10"
 
 [dev-packages]
 six = "*"
@@ -14,4 +14,4 @@ pylint = "*"
 shellcheck-py = "*"
 
 [requires]
-python_version = "3.9"
+python_version = "3.13"