.gitlab-ci.yml

@@ -18,6 +18,7 @@ include:
       - "/ci/dependency-track.yml"
       - "/ci/pre-commit-v1.yml"
       - "/ci/sonarqube.yml"
+      - "/ci/package-py.yml"
 
 # Change pip's cache directory to be inside the project directory since we can
 # only cache local items.
@@ -150,27 +151,6 @@ build:documentation:
     when: always
 
 # -- DEPLOYMENT JOBS -------------------------------------------------------------------
-gitlab:pypi:
-  stage: deploy
-  image: ${IMAGE_REGISTRY}/library/python:${PYTHON_VERSION_MIN}-slim-bullseye
-  variables:
-    GIT_STRATEGY: none
-    TWINE_PASSWORD: "${CI_JOB_TOKEN}"
-    TWINE_USERNAME: "gitlab-ci-token"
-    TWINE_REPOSITORY_URL: "https://gitlab.gpf-tech.ign.fr/api/v4/projects/${CI_PROJECT_ID}/packages/pypi"
-  needs:
-    - job: build:pip-wheel
-      artifacts: true
-  only:
-    - tags
-  before_script:
-    - ls -lavh dist/
-    - python -m pip install --upgrade pip setuptools wheel
-  script:
-    - python -m pip install -U "twine<5"
-    - python -m twine check dist/*
-    - python -m twine upload --verbose dist/*
-
 release:prepare:
   stage: deploy
   allow_failure: true

CHANGELOG.md

@@ -15,6 +15,13 @@ Unreleased
 ### Removed
 
 -->
+
+## 2.6.2 - 2024-08-28
+
+### Changed
+
+- IGNGPF-3088 : update some logs
+
 ## 2.6.1 - 2024-05-29
 
 ### Changed

gpf_check_md5/__about__.py

@@ -40,7 +40,7 @@ __uri_repository__ = (
 __uri_tracker__ = f"{__uri_repository__}issues/"
 __uri__ = __uri_repository__
 
-__version__ = "2.6.1"
+__version__ = "2.6.2"
 __version_info__ = tuple(
     [
         int(num) if num.isdigit() else num

gpf_check_md5/core.py

@@ -104,17 +104,18 @@ def check_md5_file(filename: Path, chunksize: int = 8192) -> int:
 
                 checksum = line[:32]
                 basename = Path(filename).parent
-                sourceFilename = str(basename / line[32:].lstrip())
+                check_filename = line[32:].lstrip()
+                sourceFilename = str(basename / check_filename)
                 ret = validate(
                     filename=sourceFilename, md5digest=checksum, chunksize=chunksize
                 )
                 if ret != Status.SUCCESS:
                     logger.user_error(
-                        f"Fichier {filename.name} - vérification ligne {no_line} : {ret.name}"
+                        f"Fichier {filename.name} - vérification ligne {no_line} ({check_filename}): {ret.name}"
                     )
                 else:
                     logger.user_info(
-                        f"Fichier {filename.name} - vérification ligne {no_line} : {ret.name}"
+                        f"Fichier {filename.name} - vérification ligne {no_line} ({check_filename}): {ret.name}"
                     )
 
                 result |= ret.value