Skip to content

Commit 5524b5b

Browse files
committed
Merge branch 'release/v0.2.1'
2 parents 28e204f + a08c95b commit 5524b5b

File tree

73 files changed

+5691
-1666
lines changed

Some content is hidden

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

73 files changed

+5691
-1666
lines changed

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ jobs:
77
name: ${{ matrix.os }} - Python ${{ matrix.python-version }}
88
strategy:
99
matrix:
10-
os: [ubuntu-20.04]
11-
python-version: [3.8]
10+
os: [ubuntu-22.04]
11+
python-version: [3.11]
1212
fail-fast: false
1313
runs-on: ${{ matrix.os }}
1414
steps:
@@ -31,8 +31,7 @@ jobs:
3131
sudo apt-get --yes install latexmk texlive-full
3232
- name: Install Poetry
3333
run: |
34-
curl -L https://raw.githubusercontent.com/sdispater/poetry/master/get-poetry.py -o get-poetry.py
35-
python get-poetry.py
34+
curl -sSL https://install.python-poetry.org | POETRY_HOME=$HOME/.poetry python3 -
3635
echo "$HOME/.poetry/bin" >> $GITHUB_PATH
3736
shell: bash
3837
- name: Install Package Dependencies

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

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ name: Continuous Integration - Quality & Unit Tests
33
on: [push, pull_request]
44

55
jobs:
6-
continuous-integration-package:
6+
continuous-integration-quality-unit-tests:
77
name: ${{ matrix.os }} - Python ${{ matrix.python-version }}
88
strategy:
99
matrix:
10-
os: [macOS-latest, ubuntu-20.04, windows-latest]
11-
python-version: [3.8, 3.9, '3.10']
10+
os: [macOS-latest, ubuntu-22.04, windows-latest]
11+
python-version: [3.9, '3.10', 3.11]
1212
fail-fast: false
1313
runs-on: ${{ matrix.os }}
1414
steps:
@@ -23,6 +23,10 @@ jobs:
2323
echo "COVERALLS_REPO_TOKEN=${{ secrets.COVERALLS_REPO_TOKEN }}" >> $GITHUB_ENV
2424
echo "MPLBACKEND=AGG" >> $GITHUB_ENV
2525
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
2630
- name: Set up Python ${{ matrix.python-version }}
2731
uses: actions/setup-python@v1
2832
with:
@@ -34,28 +38,27 @@ jobs:
3438
brew install --cask adobe-dng-converter
3539
shell: bash
3640
- name: Install Dependencies (Ubuntu)
37-
if: matrix.os == 'ubuntu-20.04'
41+
if: matrix.os == 'ubuntu-22.04'
3842
run: |
3943
sudo apt-get update
4044
sudo apt-get --yes install dcraw exiftool
4145
shell: bash
4246
- name: Install Dependencies (Windows)
4347
if: matrix.os == 'windows-latest'
4448
run: |
45-
curl -L https://exiftool.org/exiftool-12.40.zip -o exiftool-12.40.zip
46-
unzip -d exiftool exiftool-12.40.zip
49+
curl -L https://exiftool.org/exiftool-12.51.zip -o exiftool-12.51.zip
50+
unzip -d exiftool exiftool-12.51.zip
4751
cp exiftool/exiftool\(-k\).exe exiftool/exiftool.exe
48-
echo "$PWD/exiftool" >> $GITHUB_PATH
52+
echo "$PWD/exiftool" | sed -e 's/^\///' -e 's/\//\\/g' -e 's/^./\0:/' >> $GITHUB_PATH
4953
curl -L https://cdn.fastpictureviewer.com/bin/dcraw.zip?v=201605100 -o dcraw.zip
5054
unzip -d dcraw dcraw.zip
51-
echo "$PWD/dcraw" >> $GITHUB_PATH
55+
echo "$PWD/dcraw" | sed -e 's/^\///' -e 's/\//\\/g' -e 's/^./\0:/' >> $GITHUB_PATH
5256
shell: bash
5357
- name: Install Adobe DNG Converter (Windows)
5458
if: matrix.os == 'windows-latest'
5559
run: |
5660
curl -L https://download.adobe.com/pub/adobe/dng/win/DNGConverter_11_4.exe -o DNGConverter_11_4.exe
5761
DNGConverter_11_4.exe /S
58-
echo "C:\Program Files\Adobe\Adobe DNG Converter" >> $GITHUB_PATH
5962
shell: cmd
6063
- name: Add Adobe DNG Converter to %PATH% (Windows)
6164
if: matrix.os == 'windows-latest'
@@ -64,8 +67,7 @@ jobs:
6467
shell: bash
6568
- name: Install Poetry
6669
run: |
67-
curl -L https://raw.githubusercontent.com/sdispater/poetry/master/get-poetry.py -o get-poetry.py
68-
python get-poetry.py --version 1.1.12
70+
curl -sSL https://install.python-poetry.org | POETRY_HOME=$HOME/.poetry python3 -
6971
echo "$HOME/.poetry/bin" >> $GITHUB_PATH
7072
shell: bash
7173
- name: Install Package Dependencies
@@ -84,7 +86,7 @@ jobs:
8486
shell: bash
8587
- name: Test with Pytest
8688
run: |
87-
poetry run python -W ignore -m py.test --disable-warnings --doctest-modules --ignore=$CI_PACKAGE/examples --cov=$CI_PACKAGE $CI_PACKAGE
89+
poetry run python -W ignore -m pytest --disable-warnings --doctest-modules --ignore=$CI_PACKAGE/examples --cov=$CI_PACKAGE $CI_PACKAGE
8890
shell: bash
8991
- name: Upload Coverage to coveralls.io
9092
run: |

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

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,30 +3,27 @@ name: Continuous Integration - Static Type Checking
33
on: [push, pull_request]
44

55
jobs:
6-
continuous-integration-package:
6+
continuous-integration-static-type-checking:
77
name: ${{ matrix.os }} - Python ${{ matrix.python-version }}
88
strategy:
99
matrix:
1010
os: [macOS-latest]
11-
python-version: [3.9]
11+
python-version: [3.11]
1212
fail-fast: false
1313
runs-on: ${{ matrix.os }}
1414
steps:
1515
- uses: actions/checkout@v1
1616
- name: Environment Variables
1717
run: |
18-
echo "CI_PACKAGE=colour" >> $GITHUB_ENV
18+
echo "CI_PACKAGE=colour_hdri" >> $GITHUB_ENV
1919
shell: bash
2020
- name: Set up Python ${{ matrix.python-version }}
2121
uses: actions/setup-python@v1
2222
with:
2323
python-version: ${{ matrix.python-version }}
24-
- name: Install Dependencies (macOS)
24+
- name: Install Package Dependencies
2525
run: |
26-
brew install gnu-sed graphviz
27-
ln -s /usr/local/bin/gsed /usr/local/bin/sed
28-
shell: bash
26+
pip install -r requirements.txt
2927
- name: Static Type Checking
3028
run: |
31-
pip install -r requirements.txt
32-
mypy --install-types --non-interactive --show-error-codes --warn-unused-ignores --warn-redundant-casts -p $CI_PACKAGE
29+
mypy --install-types --non-interactive --show-error-codes --warn-unused-ignores --warn-redundant-casts $CI_PACKAGE

.gitignore

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,19 @@
1+
*.egg-info
12
*.pyc
3+
*.pyo
24
.DS_Store
35
.coverage
46
.dmypy.json
7+
.fleet
58
.idea
6-
.ipynb_checkpoints/
9+
.ipynb_checkpoints
710
.mypy_cache
11+
.sandbox
12+
.vs
13+
.vscode
14+
815
__pycache__
16+
917
build
1018
colour_hdri.egg-info
1119
dist

.pre-commit-config.yaml

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,25 @@
11
repos:
22
- repo: https://github.com/asottile/pyupgrade
3-
rev: v2.31.0
3+
rev: v3.2.2
44
hooks:
55
- id: pyupgrade
6-
args: [--py38-plus]
6+
args: [--py39-plus]
77
- repo: https://github.com/ikamensh/flynt/
8-
rev: '0.76'
8+
rev: '0.77'
99
hooks:
1010
- id: flynt
1111
- repo: https://github.com/psf/black
12-
rev: 22.1.0
12+
rev: 22.10.0
1313
hooks:
1414
- id: black
15-
language_version: python3.8
15+
language_version: python3.9
16+
- repo: https://github.com/keewis/blackdoc
17+
rev: v0.3.8
18+
hooks:
19+
- id: blackdoc
20+
language_version: python3.9
1621
- repo: https://github.com/PyCQA/flake8
17-
rev: 4.0.1
22+
rev: 6.0.0
1823
hooks:
1924
- id: flake8
2025
- repo: https://github.com/pycqa/pydocstyle

.readthedocs.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ version: 2
33
build:
44
os: ubuntu-20.04
55
tools:
6-
python: "3.8"
6+
python: "3.11"
77

88
sphinx:
99
configuration: docs/conf.py

0 commit comments

Comments
 (0)