Use "macOs" for coverage results.

colour-science · Mar 10, 2023 · 653aded · 653aded
1 parent 5fb1454
commit 653aded
Showing 1 changed file with 6 additions and 14 deletions.
diff --git a/.github/workflows/continuous-integration-quality-unit-tests.yml b/.github/workflows/continuous-integration-quality-unit-tests.yml
@@ -9,9 +9,6 @@ jobs:
       matrix:
         os: [macOS-latest, ubuntu-22.04, windows-latest]
         python-version: [3.9, '3.10', 3.11]
-        exclude:
-          - os: windows-latest
-            python-version: 3.8
       fail-fast: false
     runs-on: ${{ matrix.os }}
     steps:
@@ -21,8 +18,6 @@ jobs:
         echo "CI_PYTHON_VERSION=${{ matrix.python-version }}" >> $GITHUB_ENV
         echo "CI_PACKAGE=colour" >> $GITHUB_ENV
         echo "CI_SHA=${{ github.sha }}" >> $GITHUB_ENV
-        echo "CI_OPENIMAGEIO_VERSION=2.4.5.0" >> $GITHUB_ENV
-        echo "CI_OPENIMAGEIO_ARTIFACT=https://github.com/colour-science/artifacts/releases/download/OpenImageIO-Release-2.4.5.0/OpenImageIO-Release-2.4.5.0.zip" >> $GITHUB_ENV
         echo "COVERALLS_REPO_TOKEN=${{ secrets.COVERALLS_REPO_TOKEN }}" >> $GITHUB_ENV
         echo "MPLBACKEND=AGG" >> $GITHUB_ENV
       shell: bash
@@ -58,15 +53,12 @@ jobs:
         poetry install --extras "meshing optional plotting"
         poetry run python -c "import imageio;imageio.plugins.freeimage.download()"
       shell: bash
-    - name: Install OpenImageIO (Ubuntu)
-      if: matrix.os == 'ubuntu-22.04' && matrix.python-version == '3.10'
+    - name: Install OpenImageIO (macOs)
+      if: matrix.os == 'macOS-latest' && matrix.python-version == '3.11'
       run: |
-        curl -L $CI_OPENIMAGEIO_ARTIFACT -o OpenImageIO-Release-$CI_OPENIMAGEIO_VERSION.zip
-        unzip OpenImageIO-Release-$CI_OPENIMAGEIO_VERSION.zip -d OpenImageIO-Release-$CI_OPENIMAGEIO_VERSION
-        sudo cp OpenImageIO-Release-$CI_OPENIMAGEIO_VERSION/bin/* /usr/bin/
-        sudo cp -r OpenImageIO-Release-$CI_OPENIMAGEIO_VERSION/lib/* /usr/lib/
-        sudo rm -rf /usr/lib/python$CI_PYTHON_VERSION
-        cp -r OpenImageIO-Release-$CI_OPENIMAGEIO_VERSION/lib/python$CI_PYTHON_VERSION/site-packages/OpenImageIO $(poetry env info -p)/lib/python$CI_PYTHON_VERSION/site-packages/
+        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
       shell: bash
     - name: Pre-Commit (All Files)
       run: |
@@ -81,7 +73,7 @@ jobs:
         poetry run python -W ignore -m pytest --doctest-modules --ignore=$CI_PACKAGE/examples --cov=$CI_PACKAGE $CI_PACKAGE
       shell: bash
     - name: Upload Coverage to coveralls.io
-      if: matrix.os == 'ubuntu-22.04' && matrix.python-version == '3.10'
+      if: matrix.os == 'macOS-latest' && matrix.python-version == '3.11'
       run: |
         if [ -z "$COVERALLS_REPO_TOKEN" ]; then echo \"COVERALLS_REPO_TOKEN\" secret is undefined!; else poetry run coveralls; fi
       shell: bash