Merge pull request #164 from UIUCLibrary/dev

henryborchers · web-flow · commit a5f610fcb488 · 2025-12-16T12:20:13.000-06:00
Dev
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -3,6 +3,7 @@ project(OpenJpegWrapper)
 cmake_policy(SET CMP0135 OLD)
 include(FetchContent)
 find_package(Python3 REQUIRED COMPONENTS Development)
+find_package(Catch2 QUIET)
 
 if(NOT CONAN_OPENJPEG_ROOT)
     find_package(OpenJPEG)
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -331,7 +331,12 @@ def linux_wheels(pythonVersions, testPackages, params, wheelStashes, sharedPipCa
                                                     archiveArtifacts artifacts: 'dist/*.whl'
                                                 } finally{
                                                     sh "${tool(name: 'Default', type: 'git')} clean -dfx"
-                                                    sh "docker rmi --no-prune ${dockerImageName}"
+                                                    sh(label:'untagging image',
+                                                       script: """if [[ ! -z \$(docker images -q ${dockerImageName}) ]]; then
+                                                                     docker rmi ${dockerImageName}
+                                                                  fi
+                                                               """
+                                                       )
                                                 }
                                             }
                                         }
@@ -589,7 +594,7 @@ pipeline {
                                                        ]
                                                    )
                                                    sh '''. ./venv/bin/activate
-                                                         mkdir -p reports && gcovr --filter src/uiucprescon/imagevalidate --print-summary  --xml -o reports/coverage_cpp.xml
+                                                         mkdir -p reports && gcovr --filter src/uiucprescon/imagevalidate --exclude-directories build/cpp/_deps/ --print-summary  --xml -o reports/coverage_cpp.xml
                                                       '''
                                                    stash(includes: 'reports/coverage_cpp.xml', name: 'CPP_COVERAGE_REPORT')
                                                 }
@@ -730,7 +735,7 @@ pipeline {
                                             sh(label: 'combining coverage data',
                                                script: '''./venv/bin/uv run coverage combine
                                                           ./venv/bin/uv run coverage xml -o ./reports/coverage-python.xml
-                                                          ./venv/bin/uv run gcovr --filter src/uiucprescon/imagevalidate --print-summary --xml -o reports/coverage-c-extension.xml
+                                                          ./venv/bin/uv run gcovr --filter src/uiucprescon/imagevalidate --exclude-directories build/cpp/_deps/ --print-summary --xml -o reports/coverage-c-extension.xml
                                                           '''
                                             )
                                             recordCoverage(tools: [[parser: 'COBERTURA', pattern: 'reports/coverage*.xml']])
diff --git a/ci/docker/linux/jenkins/Dockerfile b/ci/docker/linux/jenkins/Dockerfile
@@ -143,4 +143,7 @@ ENV CONAN_USER_HOME=${CONAN_USER_HOME}
 ARG CONAN_HOME
 ENV CONAN_HOME=${CONAN_HOME}
 COPY --from=conan_builder --chmod=777 ${CONAN_HOME} ${CONAN_HOME}
-ENV TZ=UTC
+ENV TZ=UTC
+
+# To help mark the image as a CI image so it can be cleaned up more easily
+LABEL purpose=ci
diff --git a/ci/docker/linux/jenkins/conan/profile.ini b/ci/docker/linux/jenkins/conan/profile.ini
@@ -4,6 +4,7 @@ os=Linux
 arch=x86_64
 compiler=gcc
 compiler.version={{version.major}}.{{version.minor}}
+compiler.cppstd=gnu17
 compiler.libcxx=libstdc++
 build_type=Release
 [options]
diff --git a/ci/docker/linux/tox/Dockerfile b/ci/docker/linux/tox/Dockerfile
@@ -55,7 +55,7 @@ RUN --mount=type=cache,target=${UV_CACHE_DIR} \
         cp ${CONAN_HOME}/remotes.json /tmp/remotes.json && \
         uv run --only-group=conan conan remote update conan-center --url ${CONAN_CENTER_PROXY_V2_URL}; \
     fi && \
-    uv run --only-group=conan conan install /tmp --build missing --build=openjpeg && \
+    uv run --only-group=conan conan install /tmp --build missing -c tools.graph:skip_test=True && \
     uv run --only-group=conan conan cache clean "*" -b --source --build --temp && \
     rm -rf venv && \
     if [ "$(jq -r '.remotes[0].url' ${CONAN_HOME}/remotes.json )" != "${CONAN_CENTER_PROXY_V2_URL}" ]; then \
@@ -79,3 +79,5 @@ RUN mkdir -p ${PIP_DOWNLOAD_CACHE} && \
     mkdir -p ${UV_CACHE_DIR} && \
     chmod -R 777 ${UV_CACHE_DIR}
 
+# To help mark the image as a CI image so it can be cleaned up more easily
+LABEL purpose=ci
diff --git a/conan.lock b/conan.lock
@@ -1,9 +1,12 @@
 {
     "version": "0.5",
     "requires": [
-        "openjpeg/2.3.1#ada21840f723c5410056aa68f0b23c61%1765835638.220325"
+        "openjpeg/2.3.1#ada21840f723c5410056aa68f0b23c61%1765835638.220325",
+        "catch2/3.11.0#a560b55882ff2deb1f4bafad832a1b98%1763673919.270116"
+    ],
+    "build_requires": [
+        "cmake/3.31.9#f9b9bb4bdfa37937619a33e9218703a6%1761647880.115"
     ],
-    "build_requires": [],
     "python_requires": [],
     "config_requires": []
-}
+}
diff --git a/conanfile.py b/conanfile.py
@@ -12,7 +12,10 @@ class ImageValidate(ConanFile):
     default_options = {
         # "openjpeg:shared": True
     }
-    #
+
+    def build_requirements(self):
+        self.test_requires('catch2/3.11.0')
+
     def imports(self):
         self.copy("*.dll", dst=".", src="bin")  # From bin to bin
         self.copy("*.dylib", dst=".", src="lib")  # From bin to bin
diff --git a/pyproject.toml b/pyproject.toml
@@ -3,8 +3,7 @@ requires = [
     "setuptools>=77.0",
     "wheel",
     "cmake<4.0",
-    'uiucprescon.build @ https://github.com/UIUCLibrary/uiucprescon_build/releases/download/v0.4.0/uiucprescon_build-0.4.0-py3-none-any.whl',
-#    "conan>=1.50.0,<2.0",
+    'uiucprescon.build @ https://github.com/UIUCLibrary/uiucprescon_build/releases/download/v0.5.0/uiucprescon_build-0.5.0-py3-none-any.whl',
     "conan>=2.7",
 
 ]
@@ -118,7 +117,7 @@ before-all = [
     'echo Conan user home: %CONAN_USER_HOME%',
     'echo Conan home: %CONAN_HOME%',
     'uv run --only-group=conan --with ninja --isolated conan profile detect --exist-ok',
-    'uv run --only-group=conan --with ninja --isolated conan install conanfile.py --build missing --conf=tools.cmake.cmaketoolchain:generator=Ninja',
+    'uv run --only-group=conan --with ninja --isolated conan install conanfile.py --build missing --conf=tools.cmake.cmaketoolchain:generator=Ninja -c tools.graph:skip_test=True',
 ]
 [tool.cibuildwheel.windows.environment]
 CONAN_USER_HOME="$TEMP/conan"
@@ -128,7 +127,7 @@ before-all = [
     'echo "Conan user home: $CONAN_USER_HOME"',
     'echo "Conan home: $CONAN_HOME"',
     'uv run --only-group=conan --with ninja --isolated conan profile detect --exist-ok',
-    "uv run --only-group=conan --with ninja --isolated conan install conanfile.py -pr:h {package}/ci/cibuildwheel/conan_profiles/Macos/mac_host_profile.ini --build missing -of=/tmp/ciwheelbuilder/uiucprescon_imagevalidate/tmp --conf=tools.cmake.cmaketoolchain:generator=Ninja"
+    "uv run --only-group=conan --with ninja --isolated conan install conanfile.py -pr:h {package}/ci/cibuildwheel/conan_profiles/Macos/mac_host_profile.ini --build missing -of=/tmp/ciwheelbuilder/uiucprescon_imagevalidate/tmp --conf=tools.cmake.cmaketoolchain:generator=Ninja -c tools.graph:skip_test=True"
 ]
 environment-pass = ["CONAN_COMPILER_VERSION", "CONAN_USER_HOME"]
 repair-wheel-command = [
diff --git a/scripts/resources/package_for_linux/Dockerfile b/scripts/resources/package_for_linux/Dockerfile
@@ -26,7 +26,7 @@ FROM ${manylinux_image} AS base
 RUN --mount=type=cache,target=/var/cache/yum \
     yum install -y lndir
 
-# This needed to use uvx with --constraint option
+# This needed to use uv run with --only-group option
 RUN --mount=type=cache,target=/path/to/pipx/cache \
     pipx install "uv>=0.6.5" --force
 
@@ -76,7 +76,7 @@ RUN --mount=type=cache,target=${PIP_DOWNLOAD_CACHE} \
       cp ${CONAN_HOME}/remotes.json /tmp/remotes.json && \
       uv run --only-group conan --with ninja conan remote update conan-center --url ${CONAN_CENTER_PROXY_V2_URL}; \
     fi && \
-    uv run --only-group conan --with ninja conan install /tmp --build missing --conf=tools.cmake.cmaketoolchain:generator=Ninja && \
+    uv run --only-group conan --with ninja conan install /tmp --build missing --conf=tools.cmake.cmaketoolchain:generator=Ninja -c tools.graph:skip_test=True && \
     uv run --only-group conan --with ninja conan cache clean "*" -b --source --build --temp && \
     uv cache prune && \
     if [ "$(jq -r '.remotes[0].url' ${CONAN_HOME}/remotes.json )" != "${CONAN_CENTER_PROXY_V2_URL}" ]; then \
@@ -98,4 +98,8 @@ RUN chmod -R 777 ${CONAN_HOME} && \
     chmod -R 777 ${PIP_DOWNLOAD_CACHE} && \
     mkdir -p ${UV_CACHE_DIR} && \
     chmod -R 777 ${UV_CACHE_DIR}
-LABEL type="jenkins"
+
+LABEL type="jenkins"
+
+# To help mark the image as a CI image so it can be cleaned up more easily
+LABEL purpose=ci
diff --git a/scripts/resources/windows/Dockerfile b/scripts/resources/windows/Dockerfile
@@ -65,13 +65,11 @@ RUN New-ItemProperty -Path "HKLM:\SYSTEM\CurrentControlSet\Control\FileSystem" `
 FROM chocolatey_base AS conan_builder
 ARG CONAN_HOME
 
-ARG PIP_INDEX_URL
-ARG PIP_EXTRA_INDEX_URL
 ARG UV_INDEX_URL
 ARG UV_EXTRA_INDEX_URL
 ENV UV_PROJECT=c:/temp/uv
-COPY conanfile.py c:/temp/conanfile.py
-COPY pyproject.toml uv.lock conan.lock ${UV_PROJECT}/
+ENV UV_PROJECT_ENVIRONMENT=c:\temp\uv\.venv
+COPY pyproject.toml uv.lock conan.lock conanfile.py ${UV_PROJECT}/
 COPY scripts/resources/windows/conan/profile.ini ${CONAN_HOME}/profiles/default
 COPY ci/docker/shared/conan/remotes.json ${CONAN_HOME}/remotes.json
 
@@ -82,12 +80,12 @@ RUN uv run --only-group conan --with ninja conan profile detect --exist-ok ; `
           Copy-Item -Path "${Env:CONAN_HOME}\remotes.json" -Destination "c:\remotes.json" ; `
           uv run --only-group conan --with ninja conan remote update conan-center --url ${env:CONAN_CENTER_PROXY_V2_URL}; `
     }; `
-    uv run --only-group conan --with ninja conan install c:/temp/ --build missing -pr:b=default --conf=tools.cmake.cmaketoolchain:generator=Ninja ; `
+    uv run --only-group conan --with ninja conan install ${env:UV_PROJECT}/conanfile.py --build missing -pr:b=default --conf=tools.cmake.cmaketoolchain:generator=Ninja -c tools.build:skip_test=True -c tools.graph:skip_test=True ; `
     if ($LASTEXITCODE -ne 0) { `
           throw \"Command 'conan install' failed with exit code: $LASTEXITCODE\"`
     } ;`
     uv run --only-group conan --with ninja conan cache clean "*" -b --source --build --temp ; `
-    Remove-Item -Path \"${Env:UV_PROJECT}\\.venv\" -Recurse -Force ; `
+    Remove-Item -Path \"${Env:UV_PROJECT_ENVIRONMENT}\" -Recurse -Force ; `
     uv cache clean --no-progress ; `
     if (${env:CONAN_CENTER_PROXY_V2_URL} -ne $(Get-Content -Raw -Path ${Env:CONAN_HOME}\remotes.json)) { `
       Move-Item -Path "c:\remotes.json" -Destination "${Env:CONAN_HOME}\remotes.json" -Force ;`
@@ -114,3 +112,5 @@ ENV CONAN_USER_HOME=${CONAN_USER_HOME}`
     UV_CACHE_DIR=${UV_CACHE_DIR}`
     PIP_DOWNLOAD_CACHE=${PIP_DOWNLOAD_CACHE}
 
+# To help mark the image as a CI image so it can be cleaned up more easily
+LABEL purpose=ci
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -1,19 +1,8 @@
-if(BUILD_TESTING)
+if (BUILD_TESTING AND Catch2_FOUND)
     include(FetchContent)
-
-    FetchContent_Declare(
-        libcatch2
-        URL https://github.com/catchorg/Catch2/archive/v2.13.6.tar.gz
-#        GIT_REPOSITORY https://github.com/catchorg/Catch2.git
-#        GIT_TAG 15cf3ca
-    )
-
-    FetchContent_MakeAvailable(libcatch2)
-    list(APPEND CMAKE_MODULE_PATH ${libcatch2_SOURCE_DIR}/contrib/)
-
-    target_include_directories(Catch2 INTERFACE ${libcatch2_SOURCE_DIR}/single_include)
     include(Catch)
-# Get sample images
+
+    # Get sample images
     if(NOT EXISTS ${PROJECT_BINARY_DIR}/metadata_test_images.tar.gz)
         file(DOWNLOAD https://nexus.library.illinois.edu/repository/sample-data/images/metadata_test_images.tar.gz ${PROJECT_BINARY_DIR}/metadata_test_images.tar.gz SHOW_PROGRESS)
     endif()
@@ -22,44 +11,25 @@ if(BUILD_TESTING)
             URL ${PROJECT_BINARY_DIR}/metadata_test_images.tar.gz
     )
     FetchContent_MakeAvailable(test_images)
-    add_executable(tester test-main.cpp test-basic.cpp test_exceptions.cpp)
+    add_executable(tester test-basic.cpp test_exceptions.cpp)
     target_include_directories(tester PRIVATE ${PROJECT_SOURCE_DIR}/uiucprescon/imagevalidate)
 
     target_compile_definitions(tester PRIVATE TEST_IMAGE_PATH="${test_images_SOURCE_DIR}")
-    if(CMAKE_CXX_CPPCHECK)
-        set_property(TARGET tester PROPERTY
-                CXX_CPPCHECK ${CMAKE_CXX_CPPCHECK};--suppress=*:${libcatch2_SOURCE_DIR}/single_include/catch2/catch.hpp
-            )
-    endif()
-    set_target_properties(tester PROPERTIES
-            CXX_STANDARD 11
-            RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-            )
-
-    target_link_libraries(tester PRIVATE Catch2 imagevalidate::glue)
+    target_link_libraries(tester PRIVATE Catch2::Catch2WithMain imagevalidate::glue)
     catch_discover_tests(tester
             TEST_PREFIX imagevalidate.
             )
 
     #############
 
-    add_executable(tester-internal test-main.cpp tester-internal.cpp)
-    if(CMAKE_CXX_CPPCHECK)
-        set_property(TARGET tester-internal PROPERTY
-                CXX_CPPCHECK ${CMAKE_CXX_CPPCHECK};--suppress=*:${libcatch2_SOURCE_DIR}/single_include/catch2/catch.hpp
-                )
-    endif()
+    add_executable(tester-internal tester-internal.cpp)
     target_compile_definitions(tester-internal
             PRIVATE TEST_IMAGE_PATH="${test_images_SOURCE_DIR}")
 
-    set_target_properties(tester-internal PROPERTIES
-            CXX_STANDARD 11
-            RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-            )
 
     target_link_libraries(tester-internal
             PRIVATE
-                Catch2
+                Catch2::Catch2WithMain
                 glue
             )
     catch_discover_tests(tester-internal
diff --git a/tests/test-basic.cpp b/tests/test-basic.cpp
@@ -1,6 +1,6 @@
 #include "glue.h"
 #include "exceptions.h"
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 
 TEST_CASE("utils"){
diff --git a/tests/test-main.cpp b/tests/test-main.cpp
diff --git a/tests/test_exceptions.cpp b/tests/test_exceptions.cpp
@@ -2,12 +2,15 @@
 // Created by Borchers, Henry Samuel on 5/25/21.
 //
 
-#include "catch2/catch.hpp"
 #include "exceptions.h"
 
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/matchers/catch_matchers_string.hpp>
+#include <catch2/matchers/catch_matchers_exception.hpp>
+
 TEST_CASE("InvalidFileException filename only"){
-    REQUIRE_THROWS_WITH(throw InvalidFileException("myfile.txt"), Catch::Equals( "myfile.txt" ));
+    REQUIRE_THROWS_WITH(throw InvalidFileException("myfile.txt"), Catch::Matchers::Equals( "myfile.txt" ));
 }
 TEST_CASE("InvalidFileException filename with message"){
-    REQUIRE_THROWS_WITH(throw InvalidFileException("myfile.txt", "did something stupid"), Catch::Equals( "myfile.txt: did something stupid" ));
+    REQUIRE_THROWS_WITH(throw InvalidFileException("myfile.txt", "did something stupid"), Catch::Matchers::Equals( "myfile.txt: did something stupid" ));
 }
diff --git a/tests/tester-internal.cpp b/tests/tester-internal.cpp
@@ -2,7 +2,7 @@
 // Created by Borchers, Henry Samuel on 9/13/18.
 //
 
-#include "catch2/catch.hpp"
+#include "catch2/catch_test_macros.hpp"
 #include "opj_colorspace_checker.h"
 
 

Original file line number	Diff line number	Diff line change
`@@ -331,7 +331,12 @@ def linux_wheels(pythonVersions, testPackages, params, wheelStashes, sharedPipCa`
`331`	`331`	`archiveArtifacts artifacts: 'dist/*.whl'`
`332`	`332`	`} finally{`
`333`	`333`	`sh "${tool(name: 'Default', type: 'git')} clean -dfx"`
`334`		`- sh "docker rmi --no-prune ${dockerImageName}"`
	`334`	`+ sh(label:'untagging image',`
	`335`	`+ script: """if [[ ! -z \$(docker images -q ${dockerImageName}) ]]; then`
	`336`	`+ docker rmi ${dockerImageName}`
	`337`	`+ fi`
	`338`	`+ """`
	`339`	`+ )`
`335`	`340`	`}`
`336`	`341`	`}`
`337`	`342`	`}`
`@@ -589,7 +594,7 @@ pipeline {`
`589`	`594`	`]`
`590`	`595`	`)`
`591`	`596`	`sh '''. ./venv/bin/activate`
`592`		`- mkdir -p reports && gcovr --filter src/uiucprescon/imagevalidate --print-summary --xml -o reports/coverage_cpp.xml`
	`597`	`+ mkdir -p reports && gcovr --filter src/uiucprescon/imagevalidate --exclude-directories build/cpp/_deps/ --print-summary --xml -o reports/coverage_cpp.xml`
`593`	`598`	`'''`
`594`	`599`	`stash(includes: 'reports/coverage_cpp.xml', name: 'CPP_COVERAGE_REPORT')`
`595`	`600`	`}`
`@@ -730,7 +735,7 @@ pipeline {`
`730`	`735`	`sh(label: 'combining coverage data',`
`731`	`736`	`script: '''./venv/bin/uv run coverage combine`
`732`	`737`	`./venv/bin/uv run coverage xml -o ./reports/coverage-python.xml`
`733`		`- ./venv/bin/uv run gcovr --filter src/uiucprescon/imagevalidate --print-summary --xml -o reports/coverage-c-extension.xml`
	`738`	`+ ./venv/bin/uv run gcovr --filter src/uiucprescon/imagevalidate --exclude-directories build/cpp/_deps/ --print-summary --xml -o reports/coverage-c-extension.xml`
`734`	`739`	`'''`
`735`	`740`	`)`
`736`	`741`	`recordCoverage(tools: [[parser: 'COBERTURA', pattern: 'reports/coverage*.xml']])`