Skip to content

Commit 743f8ba

Browse files
KelSolaarKelSolaar
committed
Merge branch 'release/v0.2.3'
2 parents 3f506c7 + 1c7d8bf commit 743f8ba

Some content is hidden

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

56 files changed

+794
-743
lines changed

‎.github/ISSUE_TEMPLATE/bug-report.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: Bug Report
22
description: Report an issue or a bug.
33
title: "[BUG]: << Please use a comprehensive title... >>"
4-
labels: [ Defect ]
4+
labels: [Defect]
55

66
body:
77
- type: markdown

‎.github/ISSUE_TEMPLATE/documentation-improvement.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: Documentation Improvement
22
description: Report a documentation improvement.
33
title: "[DOCUMENTATION]: << Please use a comprehensive title... >>"
4-
labels: [ Documentation ]
4+
labels: [Documentation]
55

66
body:
77
- type: markdown

‎.github/ISSUE_TEMPLATE/feature-request.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: Feature Request
22
description: Suggest a new feature to implement.
33
title: "[FEATURE]: << Please use a comprehensive title... >>"
4-
labels: [ Feature ]
4+
labels: [Feature]
55

66
body:
77
- type: markdown

‎.github/ISSUE_TEMPLATE/question.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: Question
22
description: Ask a question.
33
title: "[DISCUSSION]: << Please use a comprehensive title... >>"
4-
labels: [ Discussion ]
4+
labels: [Discussion]
55

66
body:
77
- type: markdown

‎.github/workflows/continuous-integration-documentation.yml

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -8,41 +8,41 @@ jobs:
88
strategy:
99
matrix:
1010
os: [ubuntu-22.04]
11-
python-version: [3.11]
11+
python-version: [3.12]
1212
fail-fast: false
1313
runs-on: ${{ matrix.os }}
1414
steps:
15-
- uses: actions/checkout@v1
16-
- name: Environment Variables
17-
run: |
18-
echo "CI_PYTHON_VERSION=${{ matrix.python-version }}" >> $GITHUB_ENV
19-
echo "CI_PACKAGE=colour_hdri" >> $GITHUB_ENV
20-
echo "CI_SHA=${{ github.sha }}" >> $GITHUB_ENV
21-
echo "MPLBACKEND=AGG" >> $GITHUB_ENV
22-
echo "COLOUR_SCIENCE__DOCUMENTATION_BUILD=True" >> $GITHUB_ENV
23-
shell: bash
24-
- name: Set up Python ${{ matrix.python-version }}
25-
uses: actions/setup-python@v1
26-
with:
27-
python-version: ${{ matrix.python-version }}
28-
- name: Install Dependencies
29-
run: |
30-
sudo apt-get update
31-
sudo apt-get --yes install latexmk texlive-full
32-
- name: Install Poetry
33-
env:
34-
POETRY_VERSION: 1.4.0
35-
run: |
36-
curl -sSL https://install.python-poetry.org | POETRY_HOME=$HOME/.poetry python3 -
37-
echo "$HOME/.poetry/bin" >> $GITHUB_PATH
38-
shell: bash
39-
- name: Install Package Dependencies
40-
run: |
41-
poetry run python -m pip install --upgrade pip
42-
poetry install
43-
poetry run python -c "import imageio;imageio.plugins.freeimage.download()"
44-
shell: bash
45-
- name: Build Documentation
46-
run: |
47-
poetry run invoke docs
48-
shell: bash
15+
- uses: actions/checkout@v1
16+
- name: Environment Variables
17+
run: |
18+
echo "CI_PYTHON_VERSION=${{ matrix.python-version }}" >> $GITHUB_ENV
19+
echo "CI_PACKAGE=colour_hdri" >> $GITHUB_ENV
20+
echo "CI_SHA=${{ github.sha }}" >> $GITHUB_ENV
21+
echo "MPLBACKEND=AGG" >> $GITHUB_ENV
22+
echo "COLOUR_SCIENCE__DOCUMENTATION_BUILD=True" >> $GITHUB_ENV
23+
shell: bash
24+
- name: Set up Python ${{ matrix.python-version }}
25+
uses: actions/setup-python@v4
26+
with:
27+
python-version: ${{ matrix.python-version }}
28+
- name: Install Dependencies
29+
run: |
30+
sudo apt-get update
31+
sudo apt-get --yes install latexmk texlive-full
32+
- name: Install Poetry
33+
env:
34+
POETRY_VERSION: 1.4.0
35+
run: |
36+
curl -sSL https://install.python-poetry.org | POETRY_HOME=$HOME/.poetry python3 -
37+
echo "$HOME/.poetry/bin" >> $GITHUB_PATH
38+
shell: bash
39+
- name: Install Package Dependencies
40+
run: |
41+
poetry run python -m pip install --upgrade pip
42+
poetry install
43+
poetry run python -c "import imageio;imageio.plugins.freeimage.download()"
44+
shell: bash
45+
- name: Build Documentation
46+
run: |
47+
poetry run invoke docs
48+
shell: bash

‎.github/workflows/continuous-integration-quality-unit-tests.yml

Lines changed: 83 additions & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -8,89 +8,89 @@ jobs:
88
strategy:
99
matrix:
1010
os: [macOS-latest, ubuntu-22.04, windows-latest]
11-
python-version: [3.9, '3.10', 3.11]
11+
python-version: [3.9, "3.10", 3.11, 3.12]
1212
fail-fast: false
1313
runs-on: ${{ matrix.os }}
1414
steps:
15-
- uses: actions/checkout@v1
16-
with:
17-
submodules: true
18-
- name: Environment Variables
19-
run: |
20-
echo "CI_PYTHON_VERSION=${{ matrix.python-version }}" >> $GITHUB_ENV
21-
echo "CI_PACKAGE=colour_hdri" >> $GITHUB_ENV
22-
echo "CI_SHA=${{ github.sha }}" >> $GITHUB_ENV
23-
echo "COVERALLS_REPO_TOKEN=${{ secrets.COVERALLS_REPO_TOKEN }}" >> $GITHUB_ENV
24-
echo "MPLBACKEND=AGG" >> $GITHUB_ENV
25-
shell: bash
26-
- name: Set up Python 3.9 for Pre-Commit
27-
uses: actions/setup-python@v1
28-
with:
29-
python-version: 3.9
30-
- name: Set up Python ${{ matrix.python-version }}
31-
uses: actions/setup-python@v1
32-
with:
33-
python-version: ${{ matrix.python-version }}
34-
- name: Install Dependencies (macOS)
35-
if: matrix.os == 'macOS-latest'
36-
run: |
37-
brew install dcraw exiftool
38-
brew install --cask adobe-dng-converter
39-
shell: bash
40-
- name: Install Dependencies (Ubuntu)
41-
if: matrix.os == 'ubuntu-22.04'
42-
run: |
43-
sudo apt-get update
44-
sudo apt-get --yes install dcraw exiftool
45-
shell: bash
46-
- name: Install Dependencies (Windows)
47-
if: matrix.os == 'windows-latest'
48-
run: |
49-
curl -L https://exiftool.org/exiftool-12.51.zip -o exiftool-12.51.zip
50-
unzip -d exiftool exiftool-12.51.zip
51-
cp exiftool/exiftool\(-k\).exe exiftool/exiftool.exe
52-
echo "$PWD/exiftool" | sed -e 's/^\///' -e 's/\//\\/g' -e 's/^./\0:/' >> $GITHUB_PATH
53-
curl -L https://cdn.fastpictureviewer.com/bin/dcraw.zip?v=201605100 -o dcraw.zip
54-
unzip -d dcraw dcraw.zip
55-
echo "$PWD/dcraw" | sed -e 's/^\///' -e 's/\//\\/g' -e 's/^./\0:/' >> $GITHUB_PATH
56-
shell: bash
57-
- name: Install Adobe DNG Converter (Windows)
58-
if: matrix.os == 'windows-latest'
59-
run: |
60-
curl -L https://download.adobe.com/pub/adobe/dng/win/DNGConverter_11_4.exe -o DNGConverter_11_4.exe
61-
DNGConverter_11_4.exe /S
62-
shell: cmd
63-
- name: Add Adobe DNG Converter to %PATH% (Windows)
64-
if: matrix.os == 'windows-latest'
65-
run: |
66-
echo "C:\Program Files\Adobe\Adobe DNG Converter" >> $GITHUB_PATH
67-
shell: bash
68-
- name: Install Poetry
69-
env:
70-
POETRY_VERSION: 1.4.0
71-
run: |
72-
curl -sSL https://install.python-poetry.org | POETRY_HOME=$HOME/.poetry python3 -
73-
echo "$HOME/.poetry/bin" >> $GITHUB_PATH
74-
shell: bash
75-
- name: Install Package Dependencies
76-
run: |
77-
poetry run python -m pip install --upgrade pip
78-
poetry install
79-
poetry run python -c "import imageio;imageio.plugins.freeimage.download()"
80-
shell: bash
81-
- name: Pre-Commit (All Files)
82-
run: |
83-
poetry run pre-commit run --all-files
84-
shell: bash
85-
- name: Test Optimised Python Execution
86-
run: |
87-
poetry run python -OO -c "import $CI_PACKAGE"
88-
shell: bash
89-
- name: Test with Pytest
90-
run: |
91-
poetry run python -W ignore -m pytest --doctest-modules --ignore=$CI_PACKAGE/examples --cov=$CI_PACKAGE $CI_PACKAGE
92-
shell: bash
93-
- name: Upload Coverage to coveralls.io
94-
run: |
95-
if [ -z "$COVERALLS_REPO_TOKEN" ]; then echo \"COVERALLS_REPO_TOKEN\" secret is undefined!; else poetry run coveralls; fi
96-
shell: bash
15+
- uses: actions/checkout@v1
16+
with:
17+
submodules: true
18+
- name: Environment Variables
19+
run: |
20+
echo "CI_PYTHON_VERSION=${{ matrix.python-version }}" >> $GITHUB_ENV
21+
echo "CI_PACKAGE=colour_hdri" >> $GITHUB_ENV
22+
echo "CI_SHA=${{ github.sha }}" >> $GITHUB_ENV
23+
echo "COVERALLS_REPO_TOKEN=${{ secrets.COVERALLS_REPO_TOKEN }}" >> $GITHUB_ENV
24+
echo "MPLBACKEND=AGG" >> $GITHUB_ENV
25+
shell: bash
26+
- name: Set up Python 3.9 for Pre-Commit
27+
uses: actions/setup-python@v4
28+
with:
29+
python-version: 3.9
30+
- name: Set up Python ${{ matrix.python-version }}
31+
uses: actions/setup-python@v4
32+
with:
33+
python-version: ${{ matrix.python-version }}
34+
- name: Install Dependencies (macOS)
35+
if: matrix.os == 'macOS-latest'
36+
run: |
37+
brew install dcraw exiftool
38+
brew install --cask adobe-dng-converter
39+
shell: bash
40+
- name: Install Dependencies (Ubuntu)
41+
if: matrix.os == 'ubuntu-22.04'
42+
run: |
43+
sudo apt-get update
44+
sudo apt-get --yes install dcraw exiftool
45+
shell: bash
46+
- name: Install Dependencies (Windows)
47+
if: matrix.os == 'windows-latest'
48+
run: |
49+
curl -L https://exiftool.org/exiftool-12.51.zip -o exiftool-12.51.zip
50+
unzip -d exiftool exiftool-12.51.zip
51+
cp exiftool/exiftool\(-k\).exe exiftool/exiftool.exe
52+
echo "$PWD/exiftool" | sed -e 's/^\///' -e 's/\//\\/g' -e 's/^./\0:/' >> $GITHUB_PATH
53+
curl -L https://cdn.fastpictureviewer.com/bin/dcraw.zip?v=201605100 -o dcraw.zip
54+
unzip -d dcraw dcraw.zip
55+
echo "$PWD/dcraw" | sed -e 's/^\///' -e 's/\//\\/g' -e 's/^./\0:/' >> $GITHUB_PATH
56+
shell: bash
57+
- name: Install Adobe DNG Converter (Windows)
58+
if: matrix.os == 'windows-latest'
59+
run: |
60+
curl -L https://download.adobe.com/pub/adobe/dng/win/DNGConverter_11_4.exe -o DNGConverter_11_4.exe
61+
DNGConverter_11_4.exe /S
62+
shell: cmd
63+
- name: Add Adobe DNG Converter to %PATH% (Windows)
64+
if: matrix.os == 'windows-latest'
65+
run: |
66+
echo "C:\Program Files\Adobe\Adobe DNG Converter" >> $GITHUB_PATH
67+
shell: bash
68+
- name: Install Poetry
69+
env:
70+
POETRY_VERSION: 1.4.0
71+
run: |
72+
curl -sSL https://install.python-poetry.org | POETRY_HOME=$HOME/.poetry python3 -
73+
echo "$HOME/.poetry/bin" >> $GITHUB_PATH
74+
shell: bash
75+
- name: Install Package Dependencies
76+
run: |
77+
poetry run python -m pip install --upgrade pip
78+
poetry install
79+
poetry run python -c "import imageio;imageio.plugins.freeimage.download()"
80+
shell: bash
81+
- name: Pre-Commit (All Files)
82+
run: |
83+
poetry run pre-commit run --all-files
84+
shell: bash
85+
- name: Test Optimised Python Execution
86+
run: |
87+
poetry run python -OO -c "import $CI_PACKAGE"
88+
shell: bash
89+
- name: Test with Pytest
90+
run: |
91+
poetry run python -W ignore -m pytest --doctest-modules --ignore=$CI_PACKAGE/examples --cov=$CI_PACKAGE $CI_PACKAGE
92+
shell: bash
93+
- name: Upload Coverage to coveralls.io
94+
run: |
95+
if [ -z "$COVERALLS_REPO_TOKEN" ]; then echo \"COVERALLS_REPO_TOKEN\" secret is undefined!; else poetry run coveralls; fi
96+
shell: bash

‎.github/workflows/continuous-integration-static-type-checking.yml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,22 +8,22 @@ jobs:
88
strategy:
99
matrix:
1010
os: [macOS-latest]
11-
python-version: [3.11]
11+
python-version: [3.12]
1212
fail-fast: false
1313
runs-on: ${{ matrix.os }}
1414
steps:
15-
- uses: actions/checkout@v1
16-
- name: Environment Variables
17-
run: |
18-
echo "CI_PACKAGE=colour_hdri" >> $GITHUB_ENV
19-
shell: bash
20-
- name: Set up Python ${{ matrix.python-version }}
21-
uses: actions/setup-python@v1
22-
with:
23-
python-version: ${{ matrix.python-version }}
24-
- name: Install Package Dependencies
25-
run: |
26-
pip install -r requirements.txt
27-
- name: Static Type Checking
28-
run: |
29-
pyright --skipunannotated
15+
- uses: actions/checkout@v1
16+
- name: Environment Variables
17+
run: |
18+
echo "CI_PACKAGE=colour_hdri" >> $GITHUB_ENV
19+
shell: bash
20+
- name: Set up Python ${{ matrix.python-version }}
21+
uses: actions/setup-python@v4
22+
with:
23+
python-version: ${{ matrix.python-version }}
24+
- name: Install Package Dependencies
25+
run: |
26+
pip install -r requirements.txt
27+
- name: Static Type Checking
28+
run: |
29+
pyright --skipunannotated

‎.pre-commit-config.yaml

Lines changed: 50 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,55 @@
11
repos:
2-
- repo: https://github.com/ikamensh/flynt/
3-
rev: '1.0.1'
2+
- repo: https://github.com/pre-commit/pre-commit-hooks
3+
rev: "v4.5.0"
44
hooks:
5-
- id: flynt
6-
- repo: https://github.com/charliermarsh/ruff-pre-commit
7-
rev: 'v0.0.285'
5+
- id: check-added-large-files
6+
- id: check-case-conflict
7+
- id: check-merge-conflict
8+
- id: check-symlinks
9+
- id: check-yaml
10+
- id: debug-statements
11+
- id: end-of-file-fixer
12+
- id: mixed-line-ending
13+
- id: name-tests-test
14+
args: ["--pytest-test-first"]
15+
- id: requirements-txt-fixer
16+
- id: trailing-whitespace
17+
- repo: https://github.com/codespell-project/codespell
18+
rev: v2.2.6
819
hooks:
9-
- id: ruff
10-
- repo: https://github.com/psf/black
11-
rev: 23.7.0
20+
- id: codespell
21+
exclude: "BIBLIOGRAPHY.bib|CONTRIBUTORS.rst|.*.ipynb"
22+
- repo: https://github.com/ikamensh/flynt
23+
rev: "1.0.1"
1224
hooks:
13-
- id: black
14-
language_version: python3.9
15-
- repo: https://github.com/keewis/blackdoc
16-
rev: v0.3.8
25+
- id: flynt
26+
args: [--verbose]
27+
- repo: https://github.com/PyCQA/isort
28+
rev: "5.12.0"
1729
hooks:
18-
- id: blackdoc
19-
language_version: python3.9
30+
- id: isort
31+
- repo: https://github.com/astral-sh/ruff-pre-commit
32+
rev: "v0.1.6"
33+
hooks:
34+
- id: ruff
35+
- repo: https://github.com/psf/black-pre-commit-mirror
36+
rev: 23.11.0
37+
hooks:
38+
- id: black
39+
language_version: python3.9
40+
- repo: https://github.com/adamchainz/blacken-docs
41+
rev: 1.16.0
42+
hooks:
43+
- id: blacken-docs
44+
language_version: python3.9
45+
- repo: https://github.com/pre-commit/mirrors-prettier
46+
rev: "v3.1.0"
47+
hooks:
48+
- id: prettier
49+
exclude: config-aces-reference.ocio.yaml
50+
- repo: https://github.com/pre-commit/pygrep-hooks
51+
rev: "v1.10.0"
52+
hooks:
53+
- id: rst-backticks
54+
- id: rst-directive-colons
55+
- id: rst-inline-touching-normal

0 commit comments

Comments
 (0)