Overhaul continuous integration setup.

Author: KelSolaar

.github/workflows/continuous-integration.yml

@@ -3,27 +3,24 @@ 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: [3.6, 3.7]
+        os: [macOS-latest, ubuntu-18.04, windows-2019]
+        python-version: [3.6, 3.7, 3.8]
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v1
       with:
         submodules: true
     - name: Environment Variables
       run: |
-        CI_PYTHON_VERSION=${{ matrix.python-version }}
-        CI_PACKAGE=colour_checker_detection
-        CI_SHA=${{ github.sha }}
-        COVERALLS_REPO_TOKEN=${{ secrets.COVERALLS_REPO_TOKEN }}
-        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=COVERALLS_REPO_TOKEN::$COVERALLS_REPO_TOKEN
+        echo "CI_PYTHON_VERSION=${{ matrix.python-version }}" >> $GITHUB_ENV
+        echo "CI_PACKAGE=colour_checker_detection" >> $GITHUB_ENV
+        echo "CI_SHA=${{ github.sha }}" >> $GITHUB_ENV
+        echo "COVERALLS_REPO_TOKEN=${{ secrets.COVERALLS_REPO_TOKEN }}" >> $GITHUB_ENV
+      shell: bash
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v1
       with:
@@ -32,80 +29,24 @@ jobs:
       run: |
         curl -L https://raw.githubusercontent.com/sdispater/poetry/master/get-poetry.py -o get-poetry.py
         python get-poetry.py
-        PATH=$HOME/.poetry/bin:$PATH
-        echo ::set-env name=PATH::$PATH
+        python get-poetry.py --version 1.0.10
+        echo "$HOME/.poetry/bin" >> $GITHUB_PATH
+      shell: bash
     - name: Install Package Dependencies
       run: |
-        poetry install
-        source $(poetry env info -p)/bin/activate
-        python -c "import imageio;imageio.plugins.freeimage.download()"
+        poetry install --extras "optional plotting"
+        poetry run python -c "import imageio;imageio.plugins.freeimage.download()"
+      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 -q -v --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'
       run: |
-        source $(poetry env info -p)/bin/activate
-        if [ -z "$COVERALLS_REPO_TOKEN" ]; then echo \"COVERALLS_REPO_TOKEN\" secret is undefined!; else coveralls; fi
-  windows-build:
-    name: Windows Build
-    strategy:
-      matrix:
-        os: [windows-2019]
-        python-version: [3.6, 3.7]
-    runs-on: ${{ matrix.os }}
-    steps:
-    - uses: actions/checkout@v1
-      with:
-        submodules: true
-    - name: Environment Variables
-      run: |
-        set CI_PYTHON_VERSION=${{ matrix.python-version }}
-        set CI_PACKAGE=colour_checker_detection
-        set CI_SHA=${{ github.sha }}
-        set COVERALLS_REPO_TOKEN=${{ secrets.COVERALLS_REPO_TOKEN }}
-        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=COVERALLS_REPO_TOKEN::%COVERALLS_REPO_TOKEN%
-      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
-        set PATH=%USERPROFILE%\.poetry\bin;%PATH%
-        echo ::set-env name=PATH::%PATH%
-      shell: cmd
-    - name: Install Package Dependencies
-      run: |
-        call poetry install
-        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 -q -v --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
+        if [ -z "$COVERALLS_REPO_TOKEN" ]; then echo \"COVERALLS_REPO_TOKEN\" secret is undefined!; else poetry run coveralls; fi
+      shell: bash

pyproject.toml

@@ -45,7 +45,7 @@ exclude = [
 ]
 
 [tool.poetry.dependencies]
-python = "^3.5"
+python = "^3.6"
 colour-science = "^0.3.14"
 opencv-python = "^4"