Merge branch 'feature/v0.2.6' into develop

.github/PULL_REQUEST_TEMPLATE.md

@@ -18,8 +18,8 @@ is available to guide the process: https://www.colour-science.org/contributing/.
 - [ ] Pyright static checking has been run and passed.
 - [ ] Pre-commit hooks have been run and passed.
 
-<!-- The unit tests can be invoked with `poetry run invoke tests` -->
-<!-- Pyright can be started with `pyright --skipunannotated` -->
+<!-- The unit tests can be invoked with `uv run invoke tests` -->
+<!-- Pyright can be started with `uv run pyright --threads --skipunannotated` -->
 
 **Documentation**
 

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

@@ -8,7 +8,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        python-version: [3.12]
+        python-version: [3.13]
       fail-fast: false
     runs-on: ${{ matrix.os }}
     steps:
@@ -29,18 +29,16 @@ jobs:
         run: |
           sudo apt-get update
           sudo apt-get --yes install latexmk texlive-full
-      - name: Install Poetry
+      - name: Install uv
         run: |
-          curl -sSL https://install.python-poetry.org | POETRY_HOME=$HOME/.poetry python3 -
-          echo "$HOME/.poetry/bin" >> $GITHUB_PATH
+          pip install uv
         shell: bash
       - name: Install Package Dependencies
         run: |
-          poetry run python -m pip install --upgrade pip
-          poetry install
-          poetry run python -c "import imageio;imageio.plugins.freeimage.download()"
+          uv sync --all-extras --no-dev
+          uv run python -c "import imageio;imageio.plugins.freeimage.download()"
         shell: bash
       - name: Build Documentation
         run: |
-          poetry run invoke docs
+          uv run invoke docs
         shell: bash

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

@@ -8,7 +8,7 @@ jobs:
     strategy:
       matrix:
         os: [macOS-latest, ubuntu-latest, windows-latest]
-        python-version: [3.9, "3.10", 3.11, 3.12]
+        python-version: ["3.10", 3.11, 3.12, 3.13]
       fail-fast: false
     runs-on: ${{ matrix.os }}
     steps:
@@ -22,39 +22,43 @@ jobs:
           echo "CI_SHA=${{ github.sha }}" >> $GITHUB_ENV
           echo "COVERALLS_REPO_TOKEN=${{ secrets.COVERALLS_REPO_TOKEN }}" >> $GITHUB_ENV
         shell: bash
-      - name: Set up Python 3.9 for Pre-Commit
+      - name: Set up Python 3.10 for Pre-Commit
         uses: actions/setup-python@v5
         with:
-          python-version: 3.9
+          python-version: "3.10"
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
-      - name: Install Poetry
+      - name: Install Dependencies (macOS)
+        if: matrix.os == 'macOS-latest'
         run: |
-          curl -sSL https://install.python-poetry.org | POETRY_HOME=$HOME/.poetry python3 -
-          echo "$HOME/.poetry/bin" >> $GITHUB_PATH
+          brew install freeimage
+          # TODO: Drop when https://github.com/imageio/imageio/issues/628 is addressed
+          echo "IMAGEIO_FREEIMAGE_LIB=/opt/homebrew/Cellar/freeimage/3.18.0/lib/libfreeimage.3.18.0.dylib" >> $GITHUB_ENV
+      - name: Install uv
+        run: |
+          pip install uv
         shell: bash
       - name: Install Package Dependencies
         run: |
-          poetry run python -m pip install --upgrade pip
-          poetry install
-          poetry run python -c "import imageio;imageio.plugins.freeimage.download()"
+          uv sync --all-extras --no-dev
+          uv run python -c "import imageio;imageio.plugins.freeimage.download()"
         shell: bash
       - name: Pre-Commit (All Files)
         run: |
-          poetry run pre-commit run --all-files
+          uv run pre-commit run --all-files
         shell: bash
       - name: Test Optimised Python Execution
         run: |
-          poetry run python -OO -c "import $CI_PACKAGE"
+          uv run python -OO -c "import $CI_PACKAGE"
         shell: bash
       - name: Test with Pytest
         run: |
-          poetry run python -W ignore -m pytest --doctest-modules --ignore=$CI_PACKAGE/examples --cov=$CI_PACKAGE $CI_PACKAGE
+          uv run python -W ignore -m pytest --doctest-modules --ignore=$CI_PACKAGE/examples --cov=$CI_PACKAGE $CI_PACKAGE
         shell: bash
       - name: Upload Coverage to coveralls.io
         if: matrix.os == 'macOS-latest' && matrix.python-version == '3.12'
         run: |
-          if [ -z "$COVERALLS_REPO_TOKEN" ]; then echo \"COVERALLS_REPO_TOKEN\" secret is undefined!; else poetry run coveralls; fi
+          if [ -z "$COVERALLS_REPO_TOKEN" ]; then echo \"COVERALLS_REPO_TOKEN\" secret is undefined!; else uv run coveralls; fi
         shell: bash

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

@@ -8,7 +8,7 @@ jobs:
     strategy:
       matrix:
         os: [macOS-latest]
-        python-version: [3.12]
+        python-version: [3.13]
       fail-fast: false
     runs-on: ${{ matrix.os }}
     steps:
@@ -23,7 +23,7 @@ jobs:
           python-version: ${{ matrix.python-version }}
       - name: Install Package Dependencies
         run: |
-          pip install -r requirements.txt
+          cat requirements.txt | grep -Eo '(^[^#]+)' | xargs -n 1 pip install || true
       - name: Static Type Checking
         run: |
-          pyright --skipunannotated
+          pyright --threads --skipunannotated

.gitignore

@@ -6,6 +6,7 @@
 .fleet
 .idea
 .ipynb_checkpoints
+.python-version
 .sandbox
 .vs
 .vscode
@@ -17,4 +18,4 @@ colour_demosaicing.egg-info
 dist
 docs/_build
 docs/generated
-poetry.lock
+uv.lock

README.rst

@@ -67,11 +67,11 @@ Primary Dependencies
 
 **Colour - Demosaicing** requires various dependencies in order to run:
 
-- `python >= 3.9, < 4 <https://www.python.org/download/releases>`__
-- `colour-science >= 4.3 <https://pypi.org/project/colour-science>`__
+- `python >= 3.10, < 3.14 <https://www.python.org/download/releases>`__
+- `colour-science >= 4.4 <https://pypi.org/project/colour-science>`__
 - `imageio >= 2, < 3 <https://imageio.github.io>`__
-- `numpy >= 1.22, < 2 <https://pypi.org/project/numpy>`__
-- `scipy >= 1.8, < 2 <https://pypi.org/project/scipy>`__
+- `numpy >= 1.24, < 3 <https://pypi.org/project/numpy>`__
+- `scipy >= 1.10, < 2 <https://pypi.org/project/scipy>`__
 
 Pypi
 ~~~~

TODO.rst

@@ -6,7 +6,7 @@ TODO
 
 -   colour_demosaicing/__init__.py
 
-    -   Line 82 : # TODO: Remove legacy printing support when deemed appropriate.
+    -   Line 80 : # TODO: Remove legacy printing support when deemed appropriate.
 
 About
 -----

docs/installation.rst

@@ -13,11 +13,11 @@ Primary Dependencies
 
 **Colour - Demosaicing** requires various dependencies in order to run:
 
-- `python >= 3.9, < 4 <https://www.python.org/download/releases>`__
-- `colour-science >= 4.3 <https://pypi.org/project/colour-science>`__
+- `python >= 3.10, < 3.14 <https://www.python.org/download/releases>`__
+- `colour-science >= 4.4 <https://pypi.org/project/colour-science>`__
 - `imageio >= 2, < 3 <https://imageio.github.io>`__
-- `numpy >= 1.22, < 2 <https://pypi.org/project/numpy>`__
-- `scipy >= 1.8, < 2 <https://pypi.org/project/scipy>`__
+- `numpy >= 1.24, < 3 <https://pypi.org/project/numpy>`__
+- `scipy >= 1.10, < 2 <https://pypi.org/project/scipy>`__
 
 Pypi
 ----

docs/requirements.txt

@@ -1,50 +1,52 @@
-accessible-pygments==0.0.4 ; python_version >= "3.9" and python_version < "3.13"
-alabaster==0.7.13 ; python_version >= "3.9" and python_version < "3.13"
-babel==2.14.0 ; python_version >= "3.9" and python_version < "3.13"
-beautifulsoup4==4.12.2 ; python_version >= "3.9" and python_version < "3.13"
-biblib-simple==0.1.2 ; python_version >= "3.9" and python_version < "3.13"
-certifi==2023.11.17 ; python_version >= "3.9" and python_version < "3.13"
-charset-normalizer==3.3.2 ; python_version >= "3.9" and python_version < "3.13"
-colorama==0.4.6 ; python_version >= "3.9" and python_version < "3.13" and sys_platform == "win32"
-colour-science==0.4.4 ; python_version >= "3.9" and python_version < "3.13"
-contourpy==1.2.0 ; python_version >= "3.9" and python_version < "3.13"
-cycler==0.12.1 ; python_version >= "3.9" and python_version < "3.13"
-docutils==0.20.1 ; python_version >= "3.9" and python_version < "3.13"
-fonttools==4.46.0 ; python_version >= "3.9" and python_version < "3.13"
-idna==3.6 ; python_version >= "3.9" and python_version < "3.13"
-imageio==2.33.1 ; python_version >= "3.9" and python_version < "3.13"
-imagesize==1.4.1 ; python_version >= "3.9" and python_version < "3.13"
-importlib-metadata==7.0.0 ; python_version >= "3.9" and python_version < "3.10"
-importlib-resources==6.1.1 ; python_version >= "3.9" and python_version < "3.10"
-jinja2==3.1.2 ; python_version >= "3.9" and python_version < "3.13"
-kiwisolver==1.4.5 ; python_version >= "3.9" and python_version < "3.13"
-latexcodec==2.0.1 ; python_version >= "3.9" and python_version < "3.13"
-markupsafe==2.1.3 ; python_version >= "3.9" and python_version < "3.13"
-matplotlib==3.8.2 ; python_version >= "3.9" and python_version < "3.13"
-numpy==1.26.2 ; python_version >= "3.9" and python_version < "3.13"
-packaging==23.2 ; python_version >= "3.9" and python_version < "3.13"
-pillow==10.1.0 ; python_version >= "3.9" and python_version < "3.13"
-pybtex==0.24.0 ; python_version >= "3.9" and python_version < "3.13"
-pybtex-docutils==1.0.3 ; python_version >= "3.9" and python_version < "3.13"
-pydata-sphinx-theme==0.14.4 ; python_version >= "3.9" and python_version < "3.13"
-pygments==2.17.2 ; python_version >= "3.9" and python_version < "3.13"
-pyparsing==3.1.1 ; python_version >= "3.9" and python_version < "3.13"
-python-dateutil==2.8.2 ; python_version >= "3.9" and python_version < "3.13"
-pyyaml==6.0.1 ; python_version >= "3.9" and python_version < "3.13"
-requests==2.31.0 ; python_version >= "3.9" and python_version < "3.13"
-restructuredtext-lint==1.4.0 ; python_version >= "3.9" and python_version < "3.13"
-scipy==1.11.4 ; python_version >= "3.9" and python_version < "3.13"
-six==1.16.0 ; python_version >= "3.9" and python_version < "3.13"
-snowballstemmer==2.2.0 ; python_version >= "3.9" and python_version < "3.13"
-soupsieve==2.5 ; python_version >= "3.9" and python_version < "3.13"
-sphinx==7.2.6 ; python_version >= "3.9" and python_version < "3.13"
-sphinxcontrib-applehelp==1.0.7 ; python_version >= "3.9" and python_version < "3.13"
-sphinxcontrib-bibtex==2.6.1 ; python_version >= "3.9" and python_version < "3.13"
-sphinxcontrib-devhelp==1.0.5 ; python_version >= "3.9" and python_version < "3.13"
-sphinxcontrib-htmlhelp==2.0.4 ; python_version >= "3.9" and python_version < "3.13"
-sphinxcontrib-jsmath==1.0.1 ; python_version >= "3.9" and python_version < "3.13"
-sphinxcontrib-qthelp==1.0.6 ; python_version >= "3.9" and python_version < "3.13"
-sphinxcontrib-serializinghtml==1.1.9 ; python_version >= "3.9" and python_version < "3.13"
-typing-extensions==4.9.0 ; python_version >= "3.9" and python_version < "3.13"
-urllib3==2.1.0 ; python_version >= "3.9" and python_version < "3.13"
-zipp==3.17.0 ; python_version >= "3.9" and python_version < "3.10"
+# This file was autogenerated by uv via the following command:
+#    uv export --no-hashes --all-extras --no-dev
+accessible-pygments==0.0.5
+alabaster==1.0.0
+babel==2.16.0
+beautifulsoup4==4.12.3
+biblib-simple==0.1.2
+certifi==2024.8.30
+charset-normalizer==3.4.0
+colorama==0.4.6 ; sys_platform == 'win32'
+colour-science==0.4.5
+contourpy==1.3.0
+cycler==0.12.1
+docutils==0.21.2
+fonttools==4.54.1
+idna==3.10
+imageio==2.35.1
+imagesize==1.4.1
+jinja2==3.1.4
+kiwisolver==1.4.7
+latexcodec==3.0.0
+markupsafe==3.0.1
+matplotlib==3.9.2
+numpy==2.1.2
+packaging==24.1
+pillow==10.4.0
+pybtex==0.24.0
+pybtex-docutils==1.0.3
+pydata-sphinx-theme==0.15.4
+pygments==2.18.0
+pyparsing==3.1.4
+python-dateutil==2.9.0.post0
+pyyaml==6.0.2
+requests==2.32.3
+restructuredtext-lint==1.4.0
+scipy==1.14.1
+setuptools==75.1.0 ; python_full_version >= '3.12'
+six==1.16.0
+snowballstemmer==2.2.0
+soupsieve==2.6
+sphinx==8.1.0
+sphinxcontrib-applehelp==2.0.0
+sphinxcontrib-bibtex==2.6.3
+sphinxcontrib-devhelp==2.0.0
+sphinxcontrib-htmlhelp==2.1.0
+sphinxcontrib-jsmath==1.0.1
+sphinxcontrib-qthelp==2.0.0
+sphinxcontrib-serializinghtml==2.0.0
+tomli==2.0.2 ; python_full_version < '3.11'
+trimesh==4.4.9
+typing-extensions==4.12.2
+urllib3==2.2.3