Release 5.6.0

.github/CODEOWNERS

@@ -0,0 +1,15 @@
+# This file allows setting automatically reviewers for pull requests.
+# Each line is a file pattern followed by one or more owners.
+# The last match takes precedence over previous ones.
+# Do not edit unless specifically mandated to do so.
+
+# Experts on specific backends
+src/hdf5     @fleuryl-ai
+src/mdsplus  @GabrieleManduchi
+src/uda	     @deepakmaroo
+
+# Global/fallback and technical modifications.
+*            @prasad-sawantdesai @olivhoenen
+
+# Modifications to CODEOWNERS and action workflows 
+.github/     @SimonPinches @olivhoenen

.github/workflows/wheels.yml

@@ -65,10 +65,74 @@ jobs:
             UDA_REF: "2.9.3"
             FMT_REF: "11.1.4"
 
-          # # - os: macos-13
-          # #   python: 311
-          # #   platform_id: macosx_x86_64
+          - os: ubuntu-24.04
+            triplet: x64-linux
+            python: 314
+            cibw_platform: linux
+            cibw_archs: x86_64
+            platform_id: manylinux_x86_64
+            manylinux_image: quay.io/pypa/manylinux_2_28_x86_64
+            AL_BACKEND_HDF5: AL_BACKEND_HDF5=ON
+            AL_BACKEND_MDSPLUS: AL_BACKEND_MDSPLUS=OFF
+            AL_BACKEND_UDA: AL_BACKEND_UDA=ON
+            UDA_REF: "2.9.3"
+            FMT_REF: "11.1.4"
+
+          - os: macos-14
+            triplet: arm64-osx
+            python: 310
+            platform_id: macosx_arm64
+            cibw_platform: macos
+            cibw_archs: arm64
+            AL_BACKEND_HDF5: AL_BACKEND_HDF5=ON
+            AL_BACKEND_MDSPLUS: AL_BACKEND_MDSPLUS=OFF
+            AL_BACKEND_UDA: AL_BACKEND_UDA=OFF
+            UDA_REF: "2.9.3"
 
+          - os: macos-14
+            triplet: arm64-osx
+            python: 311
+            platform_id: macosx_arm64
+            cibw_platform: macos
+            cibw_archs: arm64
+            AL_BACKEND_HDF5: AL_BACKEND_HDF5=ON
+            AL_BACKEND_MDSPLUS: AL_BACKEND_MDSPLUS=OFF
+            AL_BACKEND_UDA: AL_BACKEND_UDA=OFF
+            UDA_REF: "2.9.3"
+
+          - os: macos-14
+            triplet: arm64-osx
+            python: 312
+            platform_id: macosx_arm64
+            cibw_platform: macos
+            cibw_archs: arm64
+            AL_BACKEND_HDF5: AL_BACKEND_HDF5=ON
+            AL_BACKEND_MDSPLUS: AL_BACKEND_MDSPLUS=OFF
+            AL_BACKEND_UDA: AL_BACKEND_UDA=OFF
+            UDA_REF: "2.9.3"
+
+          - os: macos-14
+            triplet: arm64-osx
+            python: 313
+            platform_id: macosx_arm64
+            cibw_platform: macos
+            cibw_archs: arm64
+            AL_BACKEND_HDF5: AL_BACKEND_HDF5=ON
+            AL_BACKEND_MDSPLUS: AL_BACKEND_MDSPLUS=OFF
+            AL_BACKEND_UDA: AL_BACKEND_UDA=OFF
+            UDA_REF: "2.9.3"
+
+          - os: macos-14
+            triplet: arm64-osx
+            python: 314
+            platform_id: macosx_arm64
+            cibw_platform: macos
+            cibw_archs: arm64
+            AL_BACKEND_HDF5: AL_BACKEND_HDF5=ON
+            AL_BACKEND_MDSPLUS: AL_BACKEND_MDSPLUS=OFF
+            AL_BACKEND_UDA: AL_BACKEND_UDA=OFF
+            UDA_REF: "2.9.3"
+
           - os: windows-2022
             triplet: x64-windows
             python: 310
@@ -121,6 +185,19 @@ jobs:
             UDA_REF: "2.9.3"
             FMT_REF: "11.1.4"
 
+          - os: windows-2022
+            triplet: x64-windows
+            python: 314
+            platform_id: win_amd64
+            cibw_platform: windows
+            cibw_archs: AMD64
+            manylinux_image: windows
+            AL_BACKEND_HDF5: AL_BACKEND_HDF5=ON
+            AL_BACKEND_MDSPLUS: AL_BACKEND_MDSPLUS=OFF
+            AL_BACKEND_UDA: AL_BACKEND_UDA=OFF
+            UDA_REF: "2.9.3"
+            FMT_REF: "11.1.4"
+
     steps:
       - uses: actions/checkout@v4
         with:
@@ -145,7 +222,7 @@ jobs:
       - name: Install cibuildwheel for windows
         if: startsWith(matrix.os, 'windows')
         run: |
-          python -m pip install cibuildwheel==3.0.0
+          python -m pip install cibuildwheel==3.1.0
 
       - name: Restore cibuildwheel cache
         id: cache
@@ -181,6 +258,7 @@ jobs:
           CIBW_PLATFORM: ${{ matrix.cibw_platform }}
           CIBW_ARCHS: ${{ matrix.cibw_archs }}
           CIBW_BUILD_VERBOSITY: 1
+          CIBW_SKIP: "cp31?t-*"  # Skip free-threading builds (not supported yet)
           CIBW_CONFIG_SETTINGS: >
             cmake.define.${{ matrix.AL_BACKEND_HDF5 }}
             cmake.define.${{ matrix.AL_BACKEND_MDSPLUS }}
@@ -203,13 +281,14 @@ jobs:
           path: C:\vcpkg\installed
           key: ${{ matrix.os }}-${{ env.cache-name }}-a
 
-      - uses: pypa/cibuildwheel@v3.0.0
+      - uses: pypa/cibuildwheel@v3.1.0
         if: startsWith(matrix.os, 'ubuntu-')
         env:
           CIBW_BUILD: cp${{ matrix.python }}-${{ matrix.platform_id }}
           CIBW_PLATFORM: ${{ matrix.cibw_platform }}
           CIBW_ARCHS: ${{ matrix.cibw_archs }}
           CIBW_MANYLINUX_X86_64_IMAGE: ${{ matrix.manylinux_image }}
+          CIBW_SKIP: "cp31?t-*"  # Skip free-threading builds (not supported yet)
 
           # Install system libraries
           # NOTE: manylinux_2_28 is AlmaLinux 8 based, e.g. use yum/dnf
@@ -255,6 +334,45 @@ jobs:
           output-dir: wheelhouse
           config-file: "{package}/pyproject.toml"
 
+      - uses: pypa/cibuildwheel@v3.1.0
+        if: startsWith(matrix.os, 'macos-')
+        env:
+          CIBW_BUILD: cp${{ matrix.python }}-${{ matrix.platform_id }}
+          CIBW_PLATFORM: macos
+          CIBW_ARCHS: ${{ matrix.cibw_archs }}
+          CIBW_SKIP: "cp31?t-*"  # Skip free-threading builds (not supported yet)
+
+          CIBW_CONFIG_SETTINGS: >
+            cmake.define.${{ matrix.AL_BACKEND_HDF5 }}
+            cmake.define.${{ matrix.AL_BACKEND_MDSPLUS }}
+            cmake.define.${{ matrix.AL_BACKEND_UDA }}
+
+          # Dependency installationinto /tmp
+          CIBW_BEFORE_ALL_MACOS: >
+            brew update >&2;
+            brew install cmake pkg-config boost hdf5 libomp ninja fmt spdlog libxml2 openssl capnp libmemcached >&2;
+            git clone --depth 1 --branch ${{ matrix.UDA_REF }} https://github.com/ukaea/UDA.git >&2 &&
+            cd UDA >&2;
+            cmake -G Ninja -B build . \
+                -DBUILD_SHARED_LIBS=ON \
+                -DSSLAUTHENTICATION=ON \
+                -DCLIENT_ONLY=ON \
+                -DENABLE_CAPNP=ON \
+                -DMACOSX_DEPLOYMENT_TARGET=14.0 \
+                -DCMAKE_INSTALL_PREFIX=/tmp/uda-install >&2 &&
+            cmake --build build --target install -j >&2;
+
+          # Where to find the dependencies
+          CIBW_ENVIRONMENT_MACOS: >
+            MACOSX_DEPLOYMENT_TARGET=14.0
+            CMAKE_PREFIX_PATH="/tmp/uda-install:/opt/homebrew:/usr/local"
+            PKG_CONFIG_PATH="/tmp/uda-install/lib/pkgconfig:/opt/homebrew/lib/pkgconfig:/usr/local/lib/pkgconfig"
+
+        with:
+          package-dir: .
+          output-dir: wheelhouse
+          config-file: "{package}/pyproject.toml"
+
       - uses: actions/upload-artifact@v4
         with:
           name: cibw-wheels-cp${{ matrix.python }}-${{ matrix.platform_id }}

CMakeLists.txt

@@ -1,6 +1,10 @@
 # CMake build configuration for Access Layer core
 cmake_minimum_required(VERSION 3.21)
 
+if(POLICY CMP0144)
+  cmake_policy(SET CMP0144 NEW)
+endif()
+
 if(${CMAKE_VERSION} VERSION_GREATER_EQUAL 3.30)
   cmake_policy(SET CMP0167 NEW) # Use system BoostConfig instead of cmake FindBoost
 endif()
@@ -69,12 +73,56 @@ if(NOT PROJECT_VERSION_TWEAK EQUAL 0)
   message("Building a development version of the Access Layer core")
 endif()
 
+if(APPLE)
+  # Disable MDSPlus:
+  message(STATUS "Disabling MDSPlus backend on macOS")
+  set(AL_BACKEND_MDSPLUS OFF CACHE BOOL "MDSPlus backend" FORCE)    
+  # Disable UDA:
+  message(STATUS "Disabling UDA backend on macOS")
+  set(AL_BACKEND_UDA OFF CACHE BOOL "UDA backend" FORCE)    
+endif()
+
 
 # Dependencies
 # ##############################################################################
 
 if(WIN32)
-  find_package(PThreads4W CONFIG REQUIRED)
+  # Ensure vcpkg paths are in CMAKE_PREFIX_PATH for finding packages
+  if(DEFINED VCPKG_INSTALLED_DIR AND DEFINED VCPKG_TARGET_TRIPLET)
+    list(APPEND CMAKE_PREFIX_PATH "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}")
+    message(STATUS "al-core: Added CMAKE_PREFIX_PATH: ${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}")
+  else()
+    # Try to auto-detect vcpkg installed directory from build path
+    if(CMAKE_CURRENT_BINARY_DIR MATCHES "(.*/build)/")
+      set(_BUILD_DIR "${CMAKE_MATCH_1}")
+      set(_VCPKG_PATH "${_BUILD_DIR}/vcpkg_installed/x64-windows")
+      if(EXISTS "${_VCPKG_PATH}")
+        list(APPEND CMAKE_PREFIX_PATH "${_VCPKG_PATH}")
+        message(STATUS "al-core: Auto-detected vcpkg path: ${_VCPKG_PATH}")
+
+        # Set PKG_CONFIG_EXECUTABLE for vcpkg's pkgconf
+        if(EXISTS "${_VCPKG_PATH}/tools/pkgconf/pkgconf.exe")
+          set(PKG_CONFIG_EXECUTABLE "${_VCPKG_PATH}/tools/pkgconf/pkgconf.exe" CACHE FILEPATH "pkg-config executable")
+          message(STATUS "al-core: Set PKG_CONFIG_EXECUTABLE to ${PKG_CONFIG_EXECUTABLE}")
+        endif()
+      endif()
+    endif()
+  endif()
+
+  message(STATUS "al-core: CMAKE_PREFIX_PATH = ${CMAKE_PREFIX_PATH}")
+
+  # Add cmake module path for FindPThreads4W.cmake fallback
+  list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/common/cmake")
+
+  # Try CONFIG mode first, fall back to MODULE mode
+  find_package(PThreads4W CONFIG QUIET)
+  if(NOT PThreads4W_FOUND)
+    message(STATUS "PThreads4W CONFIG not found, trying MODULE mode")
+    find_package(PThreads4W MODULE REQUIRED)
+  else()
+    message(STATUS "Found PThreads4W via CONFIG mode")
+  endif()
+
   find_package(dlfcn-win32 CONFIG REQUIRED)
 endif()
 
@@ -108,6 +156,7 @@ set(PUBLIC_HEADER_FILES
     include/readback_plugin_feature.h
     include/uri_parser.h
     include/data_interpolation.h
+    include/fix_include_windows.h
     # al_defs.h is generated in the binary folder with configure_file:
     ${CMAKE_CURRENT_BINARY_DIR}/include/al_defs.h)
 

common/al_env.sh.in

@@ -13,7 +13,7 @@ if [ -d "${CMAKE_INSTALL_PREFIX}/lib/python${PYVER}/site-packages" ]; then
     export PYTHONPATH="${CMAKE_INSTALL_PREFIX}/lib/python${PYVER}/site-packages:$PYTHONPATH"
 fi
 if [ -d "${CMAKE_INSTALL_PREFIX}/models/mdsplus" ]; then
-    export ids_path="${CMAKE_INSTALL_PREFIX}/models/mdsplus"
+    export MDSPLUS_MODELS_PATH="${CMAKE_INSTALL_PREFIX}/models/mdsplus"
 fi
 if [ -f "${CMAKE_INSTALL_PREFIX}/include/IDSDef.xml" ]; then
     export IDSDEF_PATH="${CMAKE_INSTALL_PREFIX}/include/IDSDef.xml"