Merge branch 'feature/v0.4.5' into develop

colour-science · Apr 29, 2024 · cb21216 · cb21216
2 parents c888cfe + 734827d
commit cb21216
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 13 deletions.
diff --git a/.github/workflows/continuous-integration-documentation.yml b/.github/workflows/continuous-integration-documentation.yml
@@ -7,7 +7,7 @@ jobs:
     name: ${{ matrix.os }} - Python ${{ matrix.python-version }}
     strategy:
       matrix:
-        os: [ubuntu-22.04]
+        os: [ubuntu-latest]
         python-version: [3.11]
       fail-fast: false
     runs-on: ${{ matrix.os }}

diff --git a/.github/workflows/continuous-integration-quality-unit-tests.yml b/.github/workflows/continuous-integration-quality-unit-tests.yml
@@ -7,7 +7,7 @@ jobs:
     name: ${{ matrix.os }} - Python ${{ matrix.python-version }}
     strategy:
       matrix:
-        os: [macOS-latest, ubuntu-22.04, windows-latest]
+        os: [macOS-latest, ubuntu-latest, windows-latest]
         python-version: [3.9, "3.10", 3.11, 3.12]
       fail-fast: false
     runs-on: ${{ matrix.os }}
@@ -29,8 +29,14 @@ jobs:
         uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
+      - name: Install Dependencies (macOS)
+        if: matrix.os == 'macOS-latest'
+        run: |
+          brew install freeimage
+          # TODO: Drop when https://github.com/imageio/imageio/issues/628 is addressed
+          echo "IMAGEIO_FREEIMAGE_LIB=/opt/homebrew/Cellar/freeimage/3.18.0/lib/libfreeimage.3.18.0.dylib" >> $GITHUB_ENV
       - name: Install Dependencies (Ubuntu)
-        if: matrix.os == 'ubuntu-22.04'
+        if: matrix.os == 'ubuntu-latest'
         run: |
           sudo apt-get update
           sudo apt-get --yes install graphviz graphviz-dev
@@ -39,15 +45,20 @@ jobs:
           curl -sSL https://install.python-poetry.org | POETRY_HOME=$HOME/.poetry python3 -
           echo "$HOME/.poetry/bin" >> $GITHUB_PATH
         shell: bash
+      - name: Install Package Dependencies (macOs)
+        if: matrix.os == 'macOS-latest'
+        run: |
+          poetry run python -m pip install --upgrade pip
+          poetry install --without graphviz
       - name: Install Package Dependencies (Ubuntu)
-        if: matrix.os == 'ubuntu-22.04'
+        if: matrix.os == 'ubuntu-latest'
         run: |
           poetry run python -m pip install --upgrade pip
           poetry install
           poetry run python -c "import imageio;imageio.plugins.freeimage.download()"
         shell: bash
-      - name: Install Package Dependencies (macOS & Windows)
-        if: matrix.os == 'macOS-latest' || matrix.os == 'windows-latest'
+      - name: Install Package Dependencies (Windows)
+        if: matrix.os == 'windows-latest'
         run: |
           poetry run python -m pip install --upgrade pip
           poetry install --without graphviz
@@ -57,8 +68,8 @@ jobs:
         if: matrix.os == 'macOS-latest' && matrix.python-version == '3.11'
         run: |
           brew install openimageio
-          ls /usr/local/Cellar/openimageio/*/lib/python*/site-packages/OpenImageIO/
-          ln -s /usr/local/Cellar/openimageio/*/lib/python*/site-packages/OpenImageIO/OpenImageIO*.so /Library/Frameworks/Python.framework/Versions/${{ matrix.python-version }}/lib/python${{ matrix.python-version }}/site-packages/OpenImageIO.so
+          ls /opt/homebrew/Cellar/openimageio/*/lib/python*/site-packages/OpenImageIO/
+          ln -s /opt/homebrew/Cellar/openimageio/*/lib/python*/site-packages/OpenImageIO/OpenImageIO*.so /Library/Frameworks/Python.framework/Versions/${{ matrix.python-version }}/lib/python${{ matrix.python-version }}/site-packages/OpenImageIO.so
         shell: bash
       - name: Pre-Commit (All Files)
         run: |

diff --git a/.github/workflows/continuous-integration-static-type-checking.yml b/.github/workflows/continuous-integration-static-type-checking.yml
@@ -24,9 +24,10 @@ jobs:
       - name: Install Dependencies (macOS)
         if: matrix.os == 'macOS-latest'
         run: |
-          brew install graphviz
-          export GRAPHVIZ_DIR="/usr/local/Cellar/graphviz/<VERSION>"
-          pip install pygraphviz --global-option=build_ext --global-option="-I$GRAPHVIZ_DIR/include" --global-option="-L$GRAPHVIZ_DIR/lib"
+          brew install freeimage graphviz
+          pip install --no-cache-dir --config-settings="--global-option=build_ext" --config-settings="--global-option=-I$(brew --prefix graphviz)/include/" --config-settings="--global-option=-L$(brew --prefix graphviz)/lib/" pygraphviz
+          # TODO: Drop when https://github.com/imageio/imageio/issues/628 is addressed
+          echo "IMAGEIO_FREEIMAGE_LIB=/opt/homebrew/Cellar/freeimage/3.18.0/lib/libfreeimage.3.18.0.dylib" >> $GITHUB_ENV
       - name: Install Package Dependencies
         run: |
           pip install -r requirements.txt

diff --git a/colour/io/image.py b/colour/io/image.py
@@ -347,7 +347,7 @@ def read_image_Imageio(
     dtype('float32')
     """
 
-    from imageio import imread
+    from imageio.v2 import imread
 
     path = str(path)
 
@@ -646,7 +646,7 @@ def write_image_Imageio(
     True
     """
 
-    from imageio import imwrite
+    from imageio.v2 import imwrite
 
     path = str(path)