Fix code style

custom/Dockerfile

@@ -17,7 +17,7 @@ RUN --mount=type=cache,target=/var/lib/apt/lists \
 
 ENV PATH=/venv/bin:$PATH
 
-FROM base-all as poetry
+FROM base-all AS poetry
 
 WORKDIR /tmp
 COPY requirements.txt ./

custom/custom/__init__.py

@@ -1,6 +1,6 @@
 import c2cwsgiutils.db
 import c2cwsgiutils.health_check
-from pyramid.config import Configurator
+from pyramid.config import Configurator  # type: ignore[import-untyped]
 
 
 def main(global_config, **settings):

custom/custom/alembic/env.py

@@ -1,7 +1,7 @@
 """Pyramid bootstrap environment. """
 
 from alembic import context
-from pyramid.paster import get_appsettings, setup_logging
+from pyramid.paster import get_appsettings, setup_logging  # type: ignore[import-untyped]
 from sqlalchemy import engine_from_config
 
 from custom.models.meta import Base

custom/custom/scripts/initialize_db.py

@@ -1,7 +1,7 @@
 import argparse
 import sys
 
-from pyramid.paster import bootstrap, setup_logging
+from pyramid.paster import bootstrap, setup_logging  # type: ignore[import-untyped]
 from sqlalchemy.exc import OperationalError
 
 from custom.models.meta import Base

custom/custom/views/__init__.py

@@ -1,8 +1,8 @@
 import os
 
-import pyramid.request
-import pyramid.response
-from cornice import Service
+import pyramid.request  # type: ignore[import-untyped]
+import pyramid.response  # type: ignore[import-untyped]
+from cornice import Service  # type: ignore[import-untyped]
 
 index = Service(
     name="index",

custom/custom/views/cog.py

@@ -1,12 +1,12 @@
 import logging
 import os
 
-import pyramid.request
-import pyramid.response
+import pyramid.request  # type: ignore[import-untyped]
+import pyramid.response  # type: ignore[import-untyped]
 from azure.identity import DefaultAzureCredential
 from azure.storage.blob import BlobServiceClient, ContainerClient
-from cornice import Service
-from pyramid.httpexceptions import HTTPBadRequest
+from cornice import Service  # type: ignore[import-untyped]
+from pyramid.httpexceptions import HTTPBadRequest  # type: ignore[import-untyped]
 
 _LOGGING = logging.getLogger(__name__)
 _CLIENT = None
@@ -38,7 +38,7 @@ def _get_azure_container_client(container: str) -> ContainerClient:
 @feedback.get()
 def swissalti3d(request: pyramid.request.Request) -> pyramid.response.Response:
     # Just to demonstrate that we can fet the user information
-    global _CLIENT
+    global _CLIENT  # pylint: disable=global-statement
     if _CLIENT is None:
         _CLIENT = _get_azure_container_client(os.environ["AZURE_CONTAINER_NAME"])
     blob = _CLIENT.get_blob_client(blob="swissalti3d_2m_archeo.tif")

custom/custom/views/feedback.py

@@ -2,10 +2,10 @@
 import os
 from typing import Any
 
-import pyramid.request
+import pyramid.request  # type: ignore[import-untyped]
 import requests
-from cornice import Service
-from pyramid.httpexceptions import HTTPBadRequest
+from cornice import Service  # type: ignore[import-untyped]
+from pyramid.httpexceptions import HTTPBadRequest  # type: ignore[import-untyped]
 
 from custom.models.feedback import Feedback
 from custom.util.send_mail import send_mail
@@ -32,7 +32,7 @@ def feedback_post(request: pyramid.request.Request) -> Any:
                 headers={"Cookie": request.headers.get("Cookie"), "Referer": request.referrer},
             ).json()
         )
-    except Exception:
+    except Exception:  # pylint: disable=broad-exception-caught
         LOG.exception("Error on get user information")
 
     if (
@@ -64,12 +64,12 @@ def feedback_post(request: pyramid.request.Request) -> Any:
     text = "\n\n".join(
         [
             "Ceci est un email automatique. Un nouveau feedback a été inséré dans la BD.",
-            "Cela concerne l'instance : " + instance,
-            "Son identifiant est le : " + str(new_feedback.id_feedback),
-            "User agent : " + new_feedback.ua,
-            "Permalink : " + new_feedback.permalink,
-            "User email : " + new_feedback.email,
-            "User text : " + new_feedback.text,
+            "Cela concerne l'instance: " + instance,
+            "Son identifiant est le: " + str(new_feedback.id_feedback),
+            "User agent: " + new_feedback.ua,  # type: ignore[list-item]
+            "Permalink: " + new_feedback.permalink,  # type: ignore[list-item]
+            "User email: " + new_feedback.email,  # type: ignore[list-item]
+            "User text: " + new_feedback.text,  # type: ignore[list-item]
         ]
     )
     subject = "Feedback - Guichet cartographique"

custom/custom/views/notfound.py

@@ -1,4 +1,4 @@
-from pyramid.view import notfound_view_config
+from pyramid.view import notfound_view_config  # type: ignore[import-untyped]
 
 
 @notfound_view_config(renderer="custom:templates/404.mako")

custom/gunicorn.conf.py

@@ -7,15 +7,15 @@
 
 from c2cwsgiutils import get_config_defaults
 
-bind = ":8080"
+bind = ":8080"  # pylint: disable=invalid-name
 
-worker_class = "gthread"
+worker_class = "gthread"  # pylint: disable=invalid-name
 workers = os.environ.get("GUNICORN_WORKERS", 2)
 threads = os.environ.get("GUNICORN_THREADS", 10)
 
-preload = "true"
+preload = "true"  # pylint: disable=invalid-name
 
-accesslog = "-"
+accesslog = "-"  # pylint: disable=invalid-name
 access_log_format = os.environ.get(
     "GUNICORN_ACCESS_LOG_FORMAT",
     '%(H)s %({Host}i)s %(m)s %(U)s?%(q)s "%(f)s" "%(a)s" %(s)s %(B)s %(D)s %(p)s',

custom/pyproject.toml

@@ -41,3 +41,4 @@ cryptography = "43.0.1"
 prospector = { version = "1.12.0", extras = ["with_bandit", "with_mypy", "with_pyroma"] }
 prospector-profile-utils = "1.9.1"
 prospector-profile-duplicated = "1.6.0"
+types-requests = "2.32.0.20240914"