Skip to content

Commit 6067936

Browse files
committed
Merge branch 'release/v0.3.15'
2 parents 50d5639 + 6de4c33 commit 6067936

File tree

424 files changed

+5539
-1914
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

424 files changed

+5539
-1914
lines changed

.github/FUNDING.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# These are supported funding model platforms
2+
3+
github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
4+
patreon: # Replace with a single Patreon username
5+
open_collective: colour-science # Replace with a single Open Collective username
6+
ko_fi: # Replace with a single Ko-fi username
7+
tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
8+
community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
9+
liberapay: # Replace with a single Liberapay username
10+
issuehunt: # Replace with a single IssueHunt username
11+
otechie: # Replace with a single Otechie username
12+
custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

.github/workflows/continuous-integration.yml

Lines changed: 28 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ jobs:
77
name: Unix Build
88
strategy:
99
matrix:
10-
os: [ubuntu-18.04, macOS-10.14]
11-
python-version: [2.7, 3.6, 3.7]
10+
os: [ubuntu-18.04, macOS-latest]
11+
python-version: [2.7, 3.5, 3.6, 3.7, 3.8]
1212
runs-on: ${{ matrix.os }}
1313
steps:
1414
- uses: actions/checkout@v1
@@ -21,6 +21,8 @@ jobs:
2121
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\"}"
2222
CI_SLACK_FAILURE_NOTIFICATION="${CI_SLACK_SUCCESS_NOTIFICATION/4CAF50/F44336}"
2323
CI_SLACK_FAILURE_NOTIFICATION="${CI_SLACK_FAILURE_NOTIFICATION/succeeded/failed}"
24+
CI_OPENIMAGEIO_ARTIFACT=https://github.com/colour-science/artifacts/suites/407105362/artifacts/1192372
25+
CI_OPENIMAGEIO_VERSION=2.1.10.1
2426
COVERALLS_REPO_TOKEN=${{ secrets.COVERALLS_REPO_TOKEN }}
2527
MPLBACKEND=AGG
2628
echo ::set-env name=CI_PYTHON_VERSION::$CI_PYTHON_VERSION
@@ -30,6 +32,8 @@ jobs:
3032
echo ::set-env name=CI_SLACK_SUCCESS_NOTIFICATION::$CI_SLACK_SUCCESS_NOTIFICATION
3133
echo ::set-env name=CI_SLACK_FAILURE_NOTIFICATION::$CI_SLACK_FAILURE_NOTIFICATION
3234
echo ::set-env name=COVERALLS_REPO_TOKEN::$COVERALLS_REPO_TOKEN
35+
echo ::set-env name=CI_OPENIMAGEIO_ARTIFACT::$CI_OPENIMAGEIO_ARTIFACT
36+
echo ::set-env name=CI_OPENIMAGEIO_VERSION::$CI_OPENIMAGEIO_VERSION
3337
echo ::set-env name=MPLBACKEND::$MPLBACKEND
3438
- name: Set up Python ${{ matrix.python-version }}
3539
uses: actions/setup-python@v1
@@ -38,29 +42,32 @@ jobs:
3842
- name: Ubuntu - Update OS & Install APT Dependencies
3943
if: matrix.os == 'ubuntu-18.04'
4044
run: |
41-
sudo apt-get update
4245
sudo apt-get --yes install libboost-all-dev libilmbase-dev libopenexr-dev libpng-dev libtiff5-dev
4346
- name: Install Poetry
4447
run: |
4548
curl -L https://raw.githubusercontent.com/sdispater/poetry/master/get-poetry.py -o get-poetry.py
46-
python get-poetry.py --preview
49+
python get-poetry.py --preview --version 1.0.0b3
4750
PATH=$HOME/.poetry/bin:$PATH
4851
echo ::set-env name=PATH::$PATH
52+
- name: Python 3.8 - Matplotlib
53+
if: matrix.python-version == '3.8'
54+
run: |
55+
sed -i.bak 's/python = "~2.7 || ^3.5"/python = "^3.6"/g' pyproject.toml
56+
sed -i.bak 's/matplotlib = { version = "\*"/matplotlib = { version = "^3.1"/g' pyproject.toml
4957
- name: Install Package Dependencies
5058
run: |
5159
poetry install --extras "optional plotting"
52-
poetry env use $CI_PYTHON_VERSION
5360
source $(poetry env info -p)/bin/activate
5461
python -c "import imageio;imageio.plugins.freeimage.download()"
5562
- name: Ubuntu - Install OpenImageIO
5663
if: matrix.os == 'ubuntu-18.04' && matrix.python-version == '3.6'
5764
run: |
58-
curl -L https://github.com/colour-science/artifacts/suites/233020849/artifacts/44967 -o OpenImageIO-Release-2.0.10.zip
59-
unzip OpenImageIO-Release-2.0.10.zip
60-
sudo cp OpenImageIO-Release-2.0.10/linux64/bin/* /usr/bin/
61-
sudo cp -r OpenImageIO-Release-2.0.10/linux64/lib/* /usr/lib/
62-
sudo rm -rf /usr/lib/python3.6
63-
cp OpenImageIO-Release-2.0.10/linux64/lib/python3.6/site-packages/OpenImageIO.so $(poetry env info -p)/lib/python3.6/site-packages/
65+
curl -L $CI_OPENIMAGEIO_ARTIFACT -o OpenImageIO-Release-$CI_OPENIMAGEIO_VERSION.zip
66+
unzip OpenImageIO-Release-$CI_OPENIMAGEIO_VERSION.zip -d OpenImageIO-Release-$CI_OPENIMAGEIO_VERSION
67+
sudo cp OpenImageIO-Release-$CI_OPENIMAGEIO_VERSION/linux64/bin/* /usr/bin/
68+
sudo cp -r OpenImageIO-Release-$CI_OPENIMAGEIO_VERSION/linux64/lib/* /usr/lib/
69+
sudo rm -rf /usr/lib/python$CI_PYTHON_VERSION
70+
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/
6471
- name: Lint with flake8
6572
run: |
6673
source $(poetry env info -p)/bin/activate
@@ -70,7 +77,7 @@ jobs:
7077
source $(poetry env info -p)/bin/activate
7178
python -W ignore -m nose -v --nocapture --with-doctest --doctest-options=+ELLIPSIS --with-coverage --cover-package=$CI_PACKAGE $CI_PACKAGE
7279
- name: Upload Coverage to coveralls.io
73-
if: matrix.python-version == '3.6' || matrix.python-version == '3.7'
80+
if: matrix.python-version == '3.6' || matrix.python-version == '3.7' || matrix.python-version == '3.8'
7481
run: |
7582
source $(poetry env info -p)/bin/activate
7683
if [ -z "$COVERALLS_REPO_TOKEN" ]; then echo \"COVERALLS_REPO_TOKEN\" secret is undefined!; else coveralls; fi
@@ -84,7 +91,7 @@ jobs:
8491
strategy:
8592
matrix:
8693
os: [windows-2019]
87-
python-version: [2.7, 3.6, 3.7]
94+
python-version: [2.7, 3.5, 3.6, 3.7]
8895
runs-on: ${{ matrix.os }}
8996
steps:
9097
- uses: actions/checkout@v1
@@ -107,38 +114,45 @@ jobs:
107114
echo ::set-env name=CI_SLACK_FAILURE_NOTIFICATION::%CI_SLACK_FAILURE_NOTIFICATION%
108115
echo ::set-env name=COVERALLS_REPO_TOKEN::%COVERALLS_REPO_TOKEN%
109116
echo ::set-env name=MPLBACKEND::%MPLBACKEND%
117+
shell: cmd
110118
- name: Set up Python ${{ matrix.python-version }}
111119
uses: actions/setup-python@v1
112120
with:
113121
python-version: ${{ matrix.python-version }}
114122
- name: Install Poetry
115123
run: |
116124
curl -L https://raw.githubusercontent.com/sdispater/poetry/master/get-poetry.py -o get-poetry.py
117-
python get-poetry.py --preview
125+
python get-poetry.py --preview --version 1.0.0b3
118126
set PATH=%USERPROFILE%\.poetry\bin;%PATH%
119127
echo ::set-env name=PATH::%PATH%
128+
shell: cmd
120129
- name: Install Package Dependencies
121130
run: |
122131
call poetry install --extras "optional plotting"
123132
FOR /F %%a IN ('poetry env info -p') DO SET CI_VIRTUAL_ENVIRONMENT=%%a
124133
echo ::set-env name=CI_VIRTUAL_ENVIRONMENT::%CI_VIRTUAL_ENVIRONMENT%
125134
call %CI_VIRTUAL_ENVIRONMENT%\scripts\activate
126135
python -c "import imageio;imageio.plugins.freeimage.download()"
136+
shell: cmd
127137
- name: Lint with flake8
128138
run: |
129139
call %CI_VIRTUAL_ENVIRONMENT%\scripts\activate
130140
flake8 %CI_PACKAGE% --count --show-source --statistics
141+
shell: cmd
131142
- name: Test with nosetests
132143
run: |
133144
call %CI_VIRTUAL_ENVIRONMENT%\scripts\activate
134145
python -W ignore -m nose -v --nocapture --with-doctest --doctest-options=+ELLIPSIS --with-coverage --cover-package=%CI_PACKAGE% %CI_PACKAGE%
146+
shell: cmd
135147
- name: Upload Coverage to coveralls.io
136148
if: matrix.python-version == '3.6' || matrix.python-version == '3.7'
137149
run: |
138150
call %CI_VIRTUAL_ENVIRONMENT%\scripts\activate
139151
IF "%COVERALLS_REPO_TOKEN%"=="" (echo "COVERALLS_REPO_TOKEN" secret is undefined!) ELSE (coveralls)
152+
shell: cmd
140153
- name: Notify Slack
141154
if: always()
142155
run: |
143156
IF "${{ job.status }}"=="Success" (set CI_SLACK_NOTIFICATION=%CI_SLACK_SUCCESS_NOTIFICATION%) ELSE (set CI_SLACK_NOTIFICATION=%CI_SLACK_FAILURE_NOTIFICATION%)
144157
IF "%CI_SLACK_WEBHOOK%"=="" (echo "SLACK_WEBHOOK" secret is undefined!) ELSE (curl -k -d %CI_SLACK_NOTIFICATION% -X POST %CI_SLACK_WEBHOOK%)
158+
shell: cmd

.pre-commit-config.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@ repos:
33
rev: 3.7.8
44
hooks:
55
- id: flake8
6-
exclude: examples
6+
exclude: examples|setup\.py
77
- repo: https://github.com/pre-commit/mirrors-yapf
88
rev: v0.23.0
99
hooks:
1010
- id: yapf
11+
exclude: setup\.py

0 commit comments

Comments
 (0)