Skip to content

Commit 1ef6fb1

Browse files
committed
Merge branch 'release/v0.2.2'
2 parents 2892401 + 0a77148 commit 1ef6fb1

Some content is hidden

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

42 files changed

+5869
-1676
lines changed

.coveragerc

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ source = colour_checker_detection
33
sigterm = True
44
[report]
55
exclude_lines =
6-
pragma: no cover
6+
if TYPE_CHECKING:
77
if __name__ == .__main__.:
8+
if typing.TYPE_CHECKING:
89
pass
10+
pragma: no cover

.github/ISSUE_TEMPLATE/feature-request.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ body:
77
- type: markdown
88
attributes:
99
value: >
10-
Thank you for taking the time to file a feature request. Before continuing, please take some time to check the existing [issues](https://github.com/colour-science/colour-checker-detection/issues) and also the [draft release notes](https://gist.github.com/KelSolaar/4a6ebe9ec3d389f0934b154fec8df51d).
10+
Thank you for taking the time to file a feature request. Before continuing, please take some time to check the existing [issues](https://github.com/colour-science/colour-checker-detection/issues).
1111
1212
- type: textarea
1313
attributes:

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ is available to guide the process: https://www.colour-science.org/contributing/.
1919
- [ ] Pre-commit hooks have been run and passed.
2020

2121
<!-- The unit tests can be invoked with `uv run invoke tests` -->
22-
<!-- Pyright can be started with `pyright --threads --skipunannotated` -->
22+
<!-- Pyright can be started with `uv run pyright --threads --skipunannotated` -->
2323

2424
**Documentation**
2525

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,19 @@ jobs:
2525
uses: actions/setup-python@v5
2626
with:
2727
python-version: ${{ matrix.python-version }}
28+
- name: Clean Up Disk Space
29+
run: |
30+
df -h /
31+
32+
sudo rm -rf /usr/lib/jvm
33+
sudo rm -rf /usr/local/.ghcup
34+
sudo rm -rf /usr/local/lib/android
35+
sudo rm -rf /usr/local/share/powershell
36+
sudo rm -rf /usr/share/dotnet
37+
sudo rm -rf /usr/share/swift
38+
sudo rm -rf "$AGENT_TOOLSDIRECTORY"
39+
40+
df -h /
2841
- name: Install Dependencies
2942
run: |
3043
sudo apt-get update

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

Lines changed: 6 additions & 9 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: [macOS-latest, ubuntu-latest, windows-2019]
11-
python-version: ["3.10", 3.11, 3.12, 3.13]
10+
os: [macOS-latest, ubuntu-latest, windows-latest]
11+
python-version: [3.11, 3.12, 3.13, 3.14]
1212
fail-fast: false
1313
runs-on: ${{ matrix.os }}
1414
steps:
@@ -22,10 +22,6 @@ jobs:
2222
echo "CI_SHA=${{ github.sha }}" >> $GITHUB_ENV
2323
echo "COVERALLS_REPO_TOKEN=${{ secrets.COVERALLS_REPO_TOKEN }}" >> $GITHUB_ENV
2424
shell: bash
25-
- name: Set up Python 3.10 for Pre-Commit
26-
uses: actions/setup-python@v5
27-
with:
28-
python-version: "3.10"
2925
- name: Set up Python ${{ matrix.python-version }}
3026
uses: actions/setup-python@v5
3127
with:
@@ -42,12 +38,13 @@ jobs:
4238
shell: bash
4339
- name: Install Package Dependencies
4440
run: |
45-
uv sync --all-extras --no-dev
41+
uv sync --all-extras
4642
uv run python -c "import imageio;imageio.plugins.freeimage.download()"
4743
shell: bash
48-
- name: Pre-Commit (All Files)
44+
- name: Prek (All Files)
45+
if: matrix.os == 'macOS-latest'
4946
run: |
50-
uv run pre-commit run --all-files
47+
uv run prek run --all-files
5148
shell: bash
5249
- name: Test Optimised Python Execution
5350
run: |

.gitignore

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,25 @@
1+
# Common Files
12
*.egg-info
23
*.pyc
34
*.pyo
45
.DS_Store
56
.coverage*
6-
.fleet
7-
.idea
8-
.ipynb_checkpoints
7+
uv.lock
8+
9+
# Common Directories
10+
.claude/
11+
.fleet/
12+
.idea/
13+
.ipynb_checkpoints/
914
.python-version
10-
.sandbox
11-
.vs
12-
.vscode
15+
.vs/
16+
.vscode/
17+
.sandbox/
18+
build/
19+
dist/
20+
docs/_build/
21+
docs/generated/
22+
node_modules/
23+
references/
1324

1425
__pycache__
15-
16-
build
17-
colour_checker_detection.egg-info
18-
dist
19-
docs/_build
20-
docs/generated
21-
uv.lock

.pre-commit-config.yaml

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
repos:
22
- repo: https://github.com/pre-commit/pre-commit-hooks
3-
rev: "v4.5.0"
3+
rev: "v5.0.0"
44
hooks:
55
- id: check-added-large-files
66
- id: check-case-conflict
@@ -15,31 +15,28 @@ repos:
1515
- id: requirements-txt-fixer
1616
- id: trailing-whitespace
1717
- repo: https://github.com/codespell-project/codespell
18-
rev: v2.2.6
18+
rev: v2.4.1
1919
hooks:
2020
- id: codespell
21+
args: ["--ignore-words-list=socio-economic"]
2122
exclude: "BIBLIOGRAPHY.bib|CONTRIBUTORS.rst|.*.ipynb"
22-
- repo: https://github.com/ikamensh/flynt
23-
rev: "1.0.1"
24-
hooks:
25-
- id: flynt
26-
args: [--verbose]
2723
- repo: https://github.com/PyCQA/isort
28-
rev: "5.13.2"
24+
rev: "6.0.1"
2925
hooks:
3026
- id: isort
3127
- repo: https://github.com/astral-sh/ruff-pre-commit
32-
rev: "v0.1.14"
28+
rev: "v0.12.4"
3329
hooks:
3430
- id: ruff-format
3531
- id: ruff
32+
args: [--fix]
3633
- repo: https://github.com/adamchainz/blacken-docs
37-
rev: 1.16.0
34+
rev: 1.19.1
3835
hooks:
3936
- id: blacken-docs
40-
language_version: python3.10
37+
language_version: python3.11
4138
- repo: https://github.com/pre-commit/mirrors-prettier
42-
rev: "v3.1.0"
39+
rev: "v4.0.0-alpha.8"
4340
hooks:
4441
- id: prettier
4542
- repo: https://github.com/pre-commit/pygrep-hooks

MANIFEST.in

Lines changed: 0 additions & 10 deletions
This file was deleted.

README.rst

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ Features
4040
The following colour checker detection algorithms are implemented:
4141

4242
- Segmentation
43+
- Templated
4344
- Machine learning inference via `Ultralytics YOLOv8 <https://github.com/ultralytics/ultralytics>`__
4445

4546
- The model is published on `HuggingFace <https://huggingface.co/colour-science/colour-checker-detection-models>`__,
@@ -136,7 +137,8 @@ The *Colour Developers* can be reached via different means:
136137
- `Facebook <https://www.facebook.com/python.colour.science>`__
137138
- `Github Discussions <https://github.com/colour-science/colour-checker-detection/discussions>`__
138139
- `Gitter <https://gitter.im/colour-science/colour>`__
139-
- `Twitter <https://twitter.com/colour_science>`__
140+
- `X <https://x.com/colour_science>`__
141+
- `Bluesky <https://bsky.app/profile/colour-science.bsky.social>`__
140142

141143
About
142144
-----

TODO.rst

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,27 +6,13 @@ TODO
66

77
- colour_checker_detection/__init__.py
88

9-
- Line 90 : # TODO: Remove legacy printing support when deemed appropriate.
9+
- Line 110 : # TODO: Remove legacy printing support when deemed appropriate.
1010

1111

1212
- colour_checker_detection/detection/common.py
1313

14-
- Line 126 : # TODO: Update when "Colour" 0.4.5 is released.
15-
- Line 1120 : # TODO: Update when "Colour" 0.4.5 is released.
16-
17-
18-
- colour_checker_detection/detection/tests/test_inference.py
19-
20-
- Line 58 : # TODO: Unit test is only reproducible on "macOs", skipping other OSes.
21-
- Line 62 : # TODO: Enable when "torch" is available on Python 3.12.
22-
- Line 97 : # TODO: Unit test is only reproducible on "macOs", skipping other OSes.
23-
- Line 101 : # TODO: Enable when "torch" is available on Python 3.12.
24-
25-
26-
- colour_checker_detection/detection/tests/test_segmentation.py
27-
28-
- Line 57 : # TODO: Unit test is only reproducible on "macOs", skipping other OSes.
29-
- Line 147 : # TODO: Unit test is only reproducible on "macOs", skipping other OSes.
14+
- Line 131 : # TODO: Update when "Colour" 0.4.5 is released.
15+
- Line 1321 : # TODO: Update when "Colour" 0.4.5 is released.
3016

3117
About
3218
-----

0 commit comments

Comments
 (0)