From 6ebf048383f20951368e1ea21c2f23267025114f Mon Sep 17 00:00:00 2001 From: Joachim Metz Date: Thu, 20 Nov 2025 11:03:38 +0100 Subject: [PATCH] Changes for CI tests --- appveyor.yml | 24 ++++++++++++------------ dfimagetools/recursive_hasher.py | 5 +++-- setup.cfg | 2 +- 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index b8883ac..fbd737d 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,31 +1,31 @@ environment: matrix: - - DESCRIPTION: "Run tests on Windows with 32-bit Python 3.12" + - DESCRIPTION: "Run tests on Windows with 32-bit Python 3.14" MACHINE_TYPE: "x86" APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022 - PYTHON: "C:\\Python312" - PYTHON_VERSION: "3.12" + PYTHON: "C:\\Python314" + PYTHON_VERSION: "3.14" L2TBINARIES_TRACK: "dev" TARGET: tests - - DESCRIPTION: "Run tests on Windows with 64-bit Python 3.12" + - DESCRIPTION: "Run tests on Windows with 64-bit Python 3.14" MACHINE_TYPE: "amd64" APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022 - PYTHON: "C:\\Python312-x64" - PYTHON_VERSION: "3.12" + PYTHON: "C:\\Python314-x64" + PYTHON_VERSION: "3.14" L2TBINARIES_TRACK: "dev" TARGET: tests - - DESCRIPTION: "Build wheel on Windows with 32-bit Python 3.12" + - DESCRIPTION: "Build wheel on Windows with 32-bit Python 3.14" MACHINE_TYPE: "amd64" APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022 - PYTHON: "C:\\Python312-x64" - PYTHON_VERSION: "3.12" + PYTHON: "C:\\Python314-x64" + PYTHON_VERSION: "3.14" L2TBINARIES_TRACK: "dev" TARGET: wheel - - DESCRIPTION: "Build wheel on Windows with 64-bit Python 3.12" + - DESCRIPTION: "Build wheel on Windows with 64-bit Python 3.14" MACHINE_TYPE: "amd64" APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022 - PYTHON: "C:\\Python312-x64" - PYTHON_VERSION: "3.12" + PYTHON: "C:\\Python314-x64" + PYTHON_VERSION: "3.14" L2TBINARIES_TRACK: "dev" TARGET: wheel - DESCRIPTION: "Run tests on Mac OS with Python 3.14" diff --git a/dfimagetools/recursive_hasher.py b/dfimagetools/recursive_hasher.py index aa18c6f..2027aac 100644 --- a/dfimagetools/recursive_hasher.py +++ b/dfimagetools/recursive_hasher.py @@ -112,8 +112,9 @@ def CalculateHashesFileEntry(self, file_entry, path_segments): lookup_path = tuple(path_segments[1:]) for data_stream in file_entry.data_streams: - hash_value = None - if (lookup_path, data_stream.name) not in self._PATHS_TO_IGNORE: + if (lookup_path, data_stream.name) in self._PATHS_TO_IGNORE: + hash_value = 'N/A (skipped)' + else: hash_value = self._CalculateHashDataStream(file_entry, data_stream.name) display_path = self._GetDisplayPath(path_segments, data_stream.name) diff --git a/setup.cfg b/setup.cfg index 2ce5cde..b5fcced 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = dfimagetools -version = 20251119 +version = 20251120 description = Storage media image tools long_description = Collection of tools to process storage media images. long_description_content_type = text/plain