Merge remote-tracking branch 'origin/main' into silx_view_imageaggreg…

…ated

.github/workflows/ci.yml

@@ -22,38 +22,47 @@ jobs:
           - os: ubuntu-20.04
             python-version: "3.8"
             QT_API: PyQt5
+            with_opencl: false
           - os: ubuntu-latest
             python-version: "3.11"
             QT_API: PyQt6
+            with_opencl: true
           - os: ubuntu-latest
             python-version: "3.12"
             QT_API: PySide6
+            with_opencl: true
 
           - os: macos-13
             python-version: "3.10"
             QT_API: PyQt5
+            with_opencl: true
           - os: macos-13
             python-version: "3.12"
             QT_API: PyQt6
+            with_opencl: true
           - os: macos-13
             python-version: "3.9"
             QT_API: PySide6
+            with_opencl: true
 
           - os: windows-latest
             python-version: "3.9"
             QT_API: PyQt5
+            with_opencl: false
           - os: windows-latest
             python-version: "3.12"
             QT_API: PyQt6
+            with_opencl: false
           - os: windows-latest
             python-version: "3.10"
             QT_API: PySide6
+            with_opencl: false
 
     steps:
       - uses: actions/checkout@v4
 
         # Install packages:
-        # OpenCL lib and icd
+        # OpenCL lib
         # xvfb to run the GUI test headless
         # libegl1-mesa: Required by Qt xcb platform plugin
         # libgl1-mesa-glx: For OpenGL
@@ -63,13 +72,24 @@ jobs:
         if: runner.os == 'Linux'
         run: |
           sudo apt-get update
-          sudo apt-get install ocl-icd-opencl-dev intel-opencl-icd xvfb libegl1-mesa libgl1-mesa-glx xserver-xorg-video-dummy libxkbcommon-x11-0 libxkbcommon0 libxkbcommon-dev libxcb-icccm4 libxcb-image0 libxcb-shm0 libxcb-keysyms1 libxcb-randr0 libxcb-render-util0 libxcb-render0 libxcb-shape0 libxcb-sync1 libxcb-xfixes0 libxcb-xinerama0 libxcb-xkb1 libxcb-cursor0 libxcb1
+          sudo apt-get install ocl-icd-opencl-dev xvfb libegl1-mesa libgl1-mesa-glx xserver-xorg-video-dummy libxkbcommon-x11-0 libxkbcommon0 libxkbcommon-dev libxcb-icccm4 libxcb-image0 libxcb-shm0 libxcb-keysyms1 libxcb-randr0 libxcb-render-util0 libxcb-render0 libxcb-shape0 libxcb-sync1 libxcb-xfixes0 libxcb-xinerama0 libxcb-xkb1 libxcb-cursor0 libxcb1
+
+      - name: Setup Intel OpenCL ICD
+        if: runner.os == 'Linux'
+        run: |
+          wget -nv http://www.silx.org/pub/OpenCL/intel_opencl_icd-6.4.0.38.tar.gz -O - | tar -xzvf -
+          echo $(pwd)/intel_opencl_icd/icd/libintelocl.so > intel_opencl_icd/vendors/intel64.icd
 
       - uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
           cache: "pip"
 
+      - name: Setup OpenGL
+        if: runner.os == 'Windows'
+        run: |
+          C:\\msys64\\usr\\bin\\wget.exe -nv -O $(python -c 'import sys, os.path; print(os.path.dirname(sys.executable))')\\opengl32.dll http://www.silx.org/pub/silx/continuous_integration/opengl32_mingw-mesa-x86_64.dll
+
       - name: Install build dependencies
         run: |
           pip install --upgrade --pre build cython setuptools wheel
@@ -87,15 +107,19 @@ jobs:
           pip install -r ci/requirements-pinned.txt
           pip install --pre "${{ matrix.QT_API }}"
           pip install --pre "$(ls dist/silx*.whl)[full,test]"
+          if [ ${{ runner.os }} == 'Linux' ]; then
+              export OCL_ICD_VENDORS=$(pwd)/intel_opencl_icd/vendors
+          fi
           python ./ci/info_platform.py
           pip list
 
       - name: Test
         env:
           QT_API: ${{ matrix.QT_API }}
           SILX_TEST_LOW_MEM: "False"
+          SILX_OPENCL: ${{ matrix.with_opencl && 'True' || 'False' }}
         run: |
-          if [ ${{ runner.os }} == 'Windows' ]; then
-              export WITH_GL_TEST=False
+          if [ ${{ runner.os }} == 'Linux' ]; then
+              export OCL_ICD_VENDORS=$(pwd)/intel_opencl_icd/vendors
           fi
           python -c "import silx.test, sys; sys.exit(silx.test.run_tests(verbosity=1, args=['--qt-binding=${{ matrix.QT_API }}']));"

README.rst

@@ -82,8 +82,7 @@ Testing
 *silx* features a comprehensive test-suite used in continuous integration for
 all major operating systems:
 
-- Github Actions CI status: |Github Actions Status|
-- Appveyor CI status: |Appveyor Status|
+|Github Actions Status|
 
 Please refer to the `documentation on testing <http://www.silx.org/doc/silx/latest/install.html#testing>`_
 for details.
@@ -109,7 +108,5 @@ Citation
 
 .. |Github Actions Status| image:: https://github.com/silx-kit/silx/workflows/CI/badge.svg
    :target: https://github.com/silx-kit/silx/actions
-.. |Appveyor Status| image:: https://ci.appveyor.com/api/projects/status/qgox9ei0wxwfagrb/branch/master?svg=true
-   :target: https://ci.appveyor.com/project/ESRF/silx?branch=master
 .. |zenodo DOI| image:: https://zenodo.org/badge/DOI/10.5281/zenodo.591709.svg
    :target: https://doi.org/10.5281/zenodo.591709