Skip to content

Commit 267183f

Browse files
committed
Merge branch 'release/v0.2.7'
2 parents 8bb1291 + c1d9caa commit 267183f

Some content is hidden

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

66 files changed

+1465
-889
lines changed

.coveragerc

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ source = colour_datasets
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-datasets/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-datasets/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: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,6 @@ jobs:
2020
echo "CI_SHA=${{ github.sha }}" >> $GITHUB_ENV
2121
echo "COVERALLS_REPO_TOKEN=${{ secrets.COVERALLS_REPO_TOKEN }}" >> $GITHUB_ENV
2222
shell: bash
23-
- name: Set up Python 3.10 for Pre-Commit
24-
uses: actions/setup-python@v5
25-
with:
26-
python-version: "3.10"
2723
- name: Set up Python ${{ matrix.python-version }}
2824
uses: actions/setup-python@v5
2925
with:
@@ -34,12 +30,13 @@ jobs:
3430
shell: bash
3531
- name: Install Package Dependencies
3632
run: |
37-
uv sync --all-extras --no-dev
33+
uv sync --all-extras
3834
uv run python -c "import imageio;imageio.plugins.freeimage.download()"
3935
shell: bash
40-
- name: Pre-Commit (All Files)
36+
- name: Prek (All Files)
37+
if: matrix.os == 'macOS-latest'
4138
run: |
42-
uv run pre-commit run --all-files
39+
uv run prek run --all-files
4340
shell: bash
4441
- name: Test Optimised Python Execution
4542
run: |

.gitignore

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,28 @@
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__
1526

16-
build
17-
dist
18-
docs/_build
19-
docs/generated
20-
references
27+
# Project Directories
2128
zenodo
22-
uv.lock

.pre-commit-config.yaml

Lines changed: 10 additions & 13 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,32 +15,29 @@ 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=exitance,seperately"]
21+
args:
22+
["--ignore-words-list=assertIn,exitance,seperately,socio-economic"]
2223
exclude: "BIBLIOGRAPHY.bib|CONTRIBUTORS.rst"
23-
- repo: https://github.com/ikamensh/flynt
24-
rev: "1.0.1"
25-
hooks:
26-
- id: flynt
27-
args: [--verbose]
2824
- repo: https://github.com/PyCQA/isort
29-
rev: "5.13.2"
25+
rev: "6.0.1"
3026
hooks:
3127
- id: isort
3228
- repo: https://github.com/astral-sh/ruff-pre-commit
33-
rev: "v0.1.14"
29+
rev: "v0.12.4"
3430
hooks:
3531
- id: ruff-format
3632
- id: ruff
33+
args: [--fix]
3734
- repo: https://github.com/adamchainz/blacken-docs
38-
rev: 1.16.0
35+
rev: 1.19.1
3936
hooks:
4037
- id: blacken-docs
41-
language_version: python3.10
38+
language_version: python3.11
4239
- repo: https://github.com/pre-commit/mirrors-prettier
43-
rev: "v3.1.0"
40+
rev: "v4.0.0-alpha.8"
4441
hooks:
4542
- id: prettier
4643
- 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 & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ Primary Dependencies
162162

163163
- `python >= 3.10, < 3.14 <https://www.python.org/download/releases>`__
164164
- `cachetools <https://pypi.org/project/cachetools>`__
165-
- `colour-science >= 4.4 <https://pypi.org/project/colour-science>`__
165+
- `colour-science >= 4.5 <https://pypi.org/project/colour-science>`__
166166
- `imageio >= 2, < 3 <https://imageio.github.io>`__
167167
- `numpy >= 1.24, < 3 <https://pypi.org/project/numpy>`__
168168
- `scipy >= 1.10, < 2 <https://pypi.org/project/scipy>`__
@@ -217,7 +217,8 @@ The *Colour Developers* can be reached via different means:
217217
- `Facebook <https://www.facebook.com/python.colour.science>`__
218218
- `Github Discussions <https://github.com/colour-science/colour-datasets/discussions>`__
219219
- `Gitter <https://gitter.im/colour-science/colour>`__
220-
- `Twitter <https://twitter.com/colour_science>`__
220+
- `X <https://x.com/colour_science>`__
221+
- `Bluesky <https://bsky.app/profile/colour-science.bsky.social>`__
221222

222223
About
223224
-----

TODO.rst

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,34 +6,34 @@ TODO
66

77
- colour_datasets/__init__.py
88

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

1111

1212
- colour_datasets/records/zenodo.py
1313

14-
- Line 433 : # TODO: Remove the following space escaping: The new Zenodo API is not quoting filenames properly thus we are temporarily escaping spaces for now. https://github.com/colour-science/colour-datasets/issues/ 36issuecomment-1773464695
14+
- Line 437 : # TODO: Remove the following space escaping: The new Zenodo API is not quoting filenames properly thus we are temporarily escaping spaces for now. https://github.com/colour-science/colour-datasets/issues/ 36issuecomment-1773464695
1515

1616

1717
- colour_datasets/utilities/common.py
1818

19-
- Line 43 : # TODO: Use *colour* definition.
19+
- Line 47 : # TODO: Use *colour* definition.
2020

2121

2222
- colour_datasets/loaders/kuopio.py
2323

24-
- Line 304 : # TODO: Implement support for *Natural Colors*: https://sandbox.zenodo.org/record/315640 http://www.uef.fi/web/spectral/natural-colors
24+
- Line 310 : # TODO: Implement support for *Natural Colors*: https://sandbox.zenodo.org/record/315640 http://www.uef.fi/web/spectral/natural-colors
2525

2626

2727
- colour_datasets/loaders/xrite2016.py
2828

29-
- Line 108 : # TODO: Implement support for "CGATS" file format in "Colour": https://github.com/colour-science/colour/issues/354
29+
- Line 111 : # TODO: Implement support for "CGATS" file format in "Colour": https://github.com/colour-science/colour/issues/354
3030

3131

3232
- colour_datasets/loaders/dyer2017.py
3333

34-
- Line 141 : # TODO: Re-instate "manufacturer", "model", "illuminant" and "type" attributes according to outcome of https://github.com/ampas/rawtoaces/issues/114. Those attributes are currently stored in "self._kwargs".
35-
- Line 923 : # TODO: Re-instate "manufacturer", "model", "illuminant" and "type" attributes according to outcome of https://github.com/ampas/rawtoaces/issues/114.
36-
- Line 1420 : # TODO: Re-instate "manufacturer", "model", "illuminant" and "type" attributes according to outcome of https://github.com/ampas/rawtoaces/issues/114.
34+
- Line 145 : # TODO: Re-instate "manufacturer", "model", "illuminant" and "type" attributes according to outcome of https://github.com/ampas/rawtoaces/issues/114. Those attributes are currently stored in "self._kwargs".
35+
- Line 933 : # TODO: Re-instate "manufacturer", "model", "illuminant" and "type" attributes according to outcome of https://github.com/ampas/rawtoaces/issues/114.
36+
- Line 1436 : # TODO: Re-instate "manufacturer", "model", "illuminant" and "type" attributes according to outcome of https://github.com/ampas/rawtoaces/issues/114.
3737

3838
About
3939
-----

0 commit comments

Comments
 (0)