Merge branch 'release/v0.3.16'

Author: KelSolaar

.github/FUNDING.yml .github/funding.yml.github/FUNDING.yml renamed to .github/funding.yml

@@ -3,63 +3,68 @@ name: Continuous Integration
 on: [push, pull_request]
 
 jobs:
-  unix-build:
-    name: Unix Build
+  continuous-integration:
+    name: ${{ matrix.os }} - Python ${{ matrix.python-version }}
     strategy:
       matrix:
-        os: [ubuntu-18.04, macOS-latest]
-        python-version: [2.7, 3.5, 3.6, 3.7, 3.8]
+        os: [macOS-latest, ubuntu-18.04, windows-latest]
+        python-version: [2.7, 3.6, 3.7, 3.8]
+      fail-fast: false
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v1
     - name: Environment Variables
       run: |
-        CI_PYTHON_VERSION=${{ matrix.python-version }}
-        CI_PACKAGE=colour
-        CI_SHA=${{ github.sha }}
-        CI_SLACK_WEBHOOK=${{ secrets.SLACK_WEBHOOK }}
-        CI_SLACK_SUCCESS_NOTIFICATION="payload={\"attachments\": [{\"color\": \"#4CAF50\", \"author_name\": \"Python ${{ matrix.python-version }} build on ${{ matrix.os }}\", \"text\": \"Build for commit *${CI_SHA:0:7}* succeeded!\", \"title\": \"${{ github.repository }}@${{ github.ref }}\", \"title_link\": \"https://github.com/${{ github.repository }}/commit/${{ github.sha }}/checks\", \"footer\": \"Triggered by ${{ github.actor }}\"}], \"username\":\"Github Actions @ ${{ github.repository }}\", \"channel\":\"#continuous-integration\", \"icon_url\":\"https://github.githubassets.com/images/modules/logos_page/GitHub-Mark.png\"}"
-        CI_SLACK_FAILURE_NOTIFICATION="${CI_SLACK_SUCCESS_NOTIFICATION/4CAF50/F44336}"
-        CI_SLACK_FAILURE_NOTIFICATION="${CI_SLACK_FAILURE_NOTIFICATION/succeeded/failed}"
-        CI_OPENIMAGEIO_ARTIFACT=https://github.com/colour-science/artifacts/suites/407105362/artifacts/1192372
-        CI_OPENIMAGEIO_VERSION=2.1.10.1
-        COVERALLS_REPO_TOKEN=${{ secrets.COVERALLS_REPO_TOKEN }}
-        MPLBACKEND=AGG
-        echo ::set-env name=CI_PYTHON_VERSION::$CI_PYTHON_VERSION
-        echo ::set-env name=CI_PACKAGE::$CI_PACKAGE
-        echo ::set-env name=CI_SHA::$CI_SHA
-        echo ::set-env name=CI_SLACK_WEBHOOK::$CI_SLACK_WEBHOOK
-        echo ::set-env name=CI_SLACK_SUCCESS_NOTIFICATION::$CI_SLACK_SUCCESS_NOTIFICATION
-        echo ::set-env name=CI_SLACK_FAILURE_NOTIFICATION::$CI_SLACK_FAILURE_NOTIFICATION
-        echo ::set-env name=COVERALLS_REPO_TOKEN::$COVERALLS_REPO_TOKEN
-        echo ::set-env name=CI_OPENIMAGEIO_ARTIFACT::$CI_OPENIMAGEIO_ARTIFACT
-        echo ::set-env name=CI_OPENIMAGEIO_VERSION::$CI_OPENIMAGEIO_VERSION
-        echo ::set-env name=MPLBACKEND::$MPLBACKEND
+        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.1.10.1" >> $GITHUB_ENV
+        echo "CI_OPENIMAGEIO_ARTIFACT=https://github.com/colour-science/artifacts/releases/download/OpenImageIO-Release-2.1.10.1/OpenImageIO-Release-2.1.10.1.zip" >> $GITHUB_ENV
+        echo "COVERALLS_REPO_TOKEN=${{ secrets.COVERALLS_REPO_TOKEN }}" >> $GITHUB_ENV
+        echo "MPLBACKEND=AGG" >> $GITHUB_ENV
+      shell: bash
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v1
       with:
         python-version: ${{ matrix.python-version }}
-    - name: Ubuntu - Update OS & Install APT Dependencies
+    - name: Update OS & Install APT Dependencies (Ubuntu)
       if: matrix.os == 'ubuntu-18.04'
       run: |
         sudo apt-get --yes install libboost-all-dev libilmbase-dev libopenexr-dev libpng-dev libtiff5-dev
+    - name: Update OS & Install APT Dependencies (macOs)
+      if: matrix.os == 'macOS-latest'
+      run: |
+        brew install gnu-sed
+        ln -s /usr/local/bin/gsed /usr/local/bin/sed
+      shell: bash
     - name: Install Poetry
       run: |
         curl -L https://raw.githubusercontent.com/sdispater/poetry/master/get-poetry.py -o get-poetry.py
-        python get-poetry.py --preview --version 1.0.0b3
-        PATH=$HOME/.poetry/bin:$PATH
-        echo ::set-env name=PATH::$PATH
-    - name: Python 3.8 - Matplotlib
-      if: matrix.python-version == '3.8'
-      run: |
-        sed -i.bak 's/python = "~2.7 || ^3.5"/python = "^3.6"/g' pyproject.toml
-        sed -i.bak 's/matplotlib = { version = "\*"/matplotlib = { version = "^3.1"/g' pyproject.toml
+        python get-poetry.py --version 1.0.10
+        echo "$HOME/.poetry/bin" >> $GITHUB_PATH
+      shell: bash
+    - name: Update pyproject.toml file (Python 2.7)
+      if: matrix.python-version == '2.7'
+      run: |
+        sed -i.bak 's/python = "~2.7 || ^3.6"/python = "~2.7"/g' pyproject.toml
+        sed -i.bak '/scipy = "\^1\.1\.0"/ a qtconsole = "4.7.7"' pyproject.toml
+      shell: bash
+    - name: Update pyproject.toml file (Windows, Python 2.7)
+      if: matrix.os == 'windows-latest' && matrix.python-version == '2.7'
+      run: |
+        sed -i.bak '/scipy = "\^1\.1\.0"/ a pywin32 = "228"' pyproject.toml
+      shell: bash
+    - name: Update pyproject.toml file (Python 3.x)
+      if: matrix.python-version != '2.7'
+      run: |
+        sed -i.bak 's/python = "~2.7 || ^3.6"/python = "^3.6"/g' pyproject.toml
+      shell: bash
     - name: Install Package Dependencies
       run: |
         poetry install --extras "optional plotting"
-        source $(poetry env info -p)/bin/activate
-        python -c "import imageio;imageio.plugins.freeimage.download()"
-    - name: Ubuntu - Install OpenImageIO
+        poetry run python -c "import imageio;imageio.plugins.freeimage.download()"
+      shell: bash
+    - name: Install OpenImageIO (Ubuntu)
       if: matrix.os == 'ubuntu-18.04' && matrix.python-version == '3.6'
       run: |
         curl -L $CI_OPENIMAGEIO_ARTIFACT -o OpenImageIO-Release-$CI_OPENIMAGEIO_VERSION.zip
@@ -68,91 +73,17 @@ jobs:
         sudo cp -r OpenImageIO-Release-$CI_OPENIMAGEIO_VERSION/linux64/lib/* /usr/lib/
         sudo rm -rf /usr/lib/python$CI_PYTHON_VERSION
         cp OpenImageIO-Release-$CI_OPENIMAGEIO_VERSION/linux64/lib/python$CI_PYTHON_VERSION/site-packages/OpenImageIO.so $(poetry env info -p)/lib/python$CI_PYTHON_VERSION/site-packages/
+      shell: bash
     - name: Lint with flake8
       run: |
-        source $(poetry env info -p)/bin/activate
-        flake8 $CI_PACKAGE --count --show-source --statistics
+        poetry run flake8 $CI_PACKAGE --count --show-source --statistics
+      shell: bash
     - name: Test with nosetests
       run: |
-        source $(poetry env info -p)/bin/activate
-        python -W ignore -m nose -v --nocapture --with-doctest --doctest-options=+ELLIPSIS --with-coverage --cover-package=$CI_PACKAGE $CI_PACKAGE
+        poetry run python -W ignore -m nose -q -v --with-doctest --doctest-options=+ELLIPSIS --with-coverage --cover-package=$CI_PACKAGE $CI_PACKAGE
+      shell: bash
     - name: Upload Coverage to coveralls.io
       if: matrix.python-version == '3.6' || matrix.python-version == '3.7' || matrix.python-version == '3.8'
       run: |
-        source $(poetry env info -p)/bin/activate
-        if [ -z "$COVERALLS_REPO_TOKEN" ]; then echo \"COVERALLS_REPO_TOKEN\" secret is undefined!; else coveralls; fi
-    - name: Notify Slack
-      if: always()
-      run: |
-        if [ "${{ job.status }}" == "Success" ]; then CI_SLACK_NOTIFICATION="$CI_SLACK_SUCCESS_NOTIFICATION"; else CI_SLACK_NOTIFICATION="$CI_SLACK_FAILURE_NOTIFICATION"; fi
-        if [ -z "$CI_SLACK_WEBHOOK" ]; then echo \"SLACK_WEBHOOK\" secret is undefined!; else curl -k -d "$CI_SLACK_NOTIFICATION" -X POST $CI_SLACK_WEBHOOK; fi
-  windows-build:
-    name: Windows Build
-    strategy:
-      matrix:
-        os: [windows-2019]
-        python-version: [2.7, 3.5, 3.6, 3.7]
-    runs-on: ${{ matrix.os }}
-    steps:
-    - uses: actions/checkout@v1
-    - name: Environment Variables
-      run: |
-        set CI_PYTHON_VERSION=${{ matrix.python-version }}
-        set CI_PACKAGE=colour
-        set CI_SHA=${{ github.sha }}
-        set CI_SLACK_WEBHOOK=${{ secrets.SLACK_WEBHOOK }}
-        set CI_SLACK_SUCCESS_NOTIFICATION="payload={\"attachments\": [{\"color\": \"#4CAF50\", \"author_name\": \"Python ${{ matrix.python-version }} build on ${{ matrix.os }}\", \"text\": \"Build for commit *"%CI_SHA:~0,7%"* succeeded!\", \"title\": \"${{ github.repository }}@${{ github.ref }}\", \"title_link\": \"https://github.com/${{ github.repository }}/commit/${{ github.sha }}/checks\", \"footer\": \"Triggered by ${{ github.actor }}\"}], \"username\":\"Github Actions @ ${{ github.repository }}\", \"channel\":\"#continuous-integration\", \"icon_url\":\"https://github.githubassets.com/images/modules/logos_page/GitHub-Mark.png\"}"
-        set CI_SLACK_FAILURE_NOTIFICATION=%CI_SLACK_SUCCESS_NOTIFICATION:4CAF50=F44336%
-        set CI_SLACK_FAILURE_NOTIFICATION=%CI_SLACK_FAILURE_NOTIFICATION:succeeded=failed%
-        set COVERALLS_REPO_TOKEN=${{ secrets.COVERALLS_REPO_TOKEN }}
-        set MPLBACKEND=AGG
-        echo ::set-env name=CI_PYTHON_VERSION::%CI_PYTHON_VERSION%
-        echo ::set-env name=CI_PACKAGE::%CI_PACKAGE%
-        echo ::set-env name=CI_SHA::%CI_SHA%
-        echo ::set-env name=CI_SLACK_WEBHOOK::%CI_SLACK_WEBHOOK%
-        echo ::set-env name=CI_SLACK_SUCCESS_NOTIFICATION::%CI_SLACK_SUCCESS_NOTIFICATION%
-        echo ::set-env name=CI_SLACK_FAILURE_NOTIFICATION::%CI_SLACK_FAILURE_NOTIFICATION%
-        echo ::set-env name=COVERALLS_REPO_TOKEN::%COVERALLS_REPO_TOKEN%
-        echo ::set-env name=MPLBACKEND::%MPLBACKEND%
-      shell: cmd
-    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v1
-      with:
-        python-version: ${{ matrix.python-version }}
-    - name: Install Poetry
-      run: |
-        curl -L https://raw.githubusercontent.com/sdispater/poetry/master/get-poetry.py -o get-poetry.py
-        python get-poetry.py --preview --version 1.0.0b3
-        set PATH=%USERPROFILE%\.poetry\bin;%PATH%
-        echo ::set-env name=PATH::%PATH%
-      shell: cmd
-    - name: Install Package Dependencies
-      run: |
-        call poetry install --extras "optional plotting"
-        FOR /F %%a IN ('poetry env info -p') DO SET CI_VIRTUAL_ENVIRONMENT=%%a
-        echo ::set-env name=CI_VIRTUAL_ENVIRONMENT::%CI_VIRTUAL_ENVIRONMENT%
-        call %CI_VIRTUAL_ENVIRONMENT%\scripts\activate
-        python -c "import imageio;imageio.plugins.freeimage.download()"
-      shell: cmd
-    - name: Lint with flake8
-      run: |
-        call %CI_VIRTUAL_ENVIRONMENT%\scripts\activate
-        flake8 %CI_PACKAGE% --count --show-source --statistics
-      shell: cmd
-    - name: Test with nosetests
-      run: |
-        call %CI_VIRTUAL_ENVIRONMENT%\scripts\activate
-        python -W ignore -m nose -v --nocapture --with-doctest --doctest-options=+ELLIPSIS --with-coverage --cover-package=%CI_PACKAGE% %CI_PACKAGE%
-      shell: cmd
-    - name: Upload Coverage to coveralls.io
-      if: matrix.python-version == '3.6' || matrix.python-version == '3.7'
-      run: |
-        call %CI_VIRTUAL_ENVIRONMENT%\scripts\activate
-        IF "%COVERALLS_REPO_TOKEN%"=="" (echo "COVERALLS_REPO_TOKEN" secret is undefined!) ELSE (coveralls)
-      shell: cmd
-    - name: Notify Slack
-      if: always()
-      run: |
-        IF "${{ job.status }}"=="Success" (set CI_SLACK_NOTIFICATION=%CI_SLACK_SUCCESS_NOTIFICATION%) ELSE (set CI_SLACK_NOTIFICATION=%CI_SLACK_FAILURE_NOTIFICATION%)
-        IF "%CI_SLACK_WEBHOOK%"=="" (echo "SLACK_WEBHOOK" secret is undefined!) ELSE (curl -k -d %CI_SLACK_NOTIFICATION% -X POST %CI_SLACK_WEBHOOK%)
-      shell: cmd
+        if [ -z "$COVERALLS_REPO_TOKEN" ]; then echo \"COVERALLS_REPO_TOKEN\" secret is undefined!; else poetry run coveralls; fi
+      shell: bash

.github/workflows/continuous-integration.yml

@@ -2,7 +2,7 @@ build:
     image: latest
 
 python:
-    version: 3.6
+    version: 3.7
     pip_install: true
     extra_requirements:
         - read-the-docs