Merge remote-tracking branch 'origin/master' into release-3.0

ci/general.yml

-image: registry.edugit.org/teckids/team-sysadmin/docker-images/python-pimped:master@sha256:f0185bd50b45973fed48dee2ffcd11e2a95bd89e53d482e227005e69d298f70c
+image: registry.edugit.org/teckids/team-sysadmin/docker-images/python-pimped:master@sha256:99fb58a4c7fbfa86ccc155585a782528aa5511032231d11907b5df797f47f697
 
 stages:
   - prepare

ci/prepare/lock.yml

@@ -15,7 +15,7 @@ lock:
       else
        poetry version $(poetry version | cut -d" " -f2)+$(date --date=${CI_COMMIT_TIMESTAMP} +%Y%m%d%H%M%S).${CI_COMMIT_SHORT_SHA} ;
       fi
-    - poetry lock
+    - poetry lock -vvvv
   artifacts:
     paths:
       - poetry.lock

ci/publish/pypi.yml

@@ -15,7 +15,7 @@ deploy_gitlab:
       else
        poetry version $(poetry version | cut -d" " -f2)+$(date --date=${CI_COMMIT_TIMESTAMP} +%Y%m%d%H%M%S).${CI_COMMIT_SHORT_SHA} ;
       fi
-    - poetry publish -r gitlab
+    - POETRY_REQUESTS_TIMEOUT=60 poetry publish -r gitlab
 
 deploy_pypi:
   interruptible: true

meta/aleksis-builddeps/pyproject.toml

@@ -18,11 +18,11 @@ classifiers = [
 
 [tool.poetry.dependencies]
 python = "^3.9"
-sphinx = "^6.1"
+sphinx = "^7.0"
 sphinxcontrib-django = "^0.5.0"
 sphinxcontrib-svg2pdfconverter = "^1.1.1"
 sphinx-autodoc-typehints = "^1.7"
-django-stubs = "^1.1"
+django-stubs = "^4.2"
 pytest = "^7.2"
 pytest-django = "^4.1"
 pytest-django-testing-postgresql = "^0.2"