Merge branch 'feature/v0.2.5' into develop

colour-science · Oct 15, 2023 · 2b341f0 · 2b341f0
2 parents d7dae18 + 4770428
commit 2b341f0
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 8 deletions.
diff --git a/colour_demosaicing/bayer/demosaicing/bilinear.py b/colour_demosaicing/bayer/demosaicing/bilinear.py
@@ -13,6 +13,7 @@
 
 from __future__ import annotations
 
+import numpy as np
 from scipy.ndimage.filters import convolve
 
 from colour.hints import ArrayLike, Literal, NDArrayFloat
@@ -102,7 +103,7 @@ def demosaicing_CFA_Bayer_bilinear(
             [ 0.67058827,  0.18431373,  0.10196078]]])
     """
 
-    CFA = as_float_array(CFA)
+    CFA = np.squeeze(as_float_array(CFA))
     R_m, G_m, B_m = masks_CFA_Bayer(CFA.shape, pattern)
 
     H_G = (

diff --git a/colour_demosaicing/bayer/demosaicing/malvar2004.py b/colour_demosaicing/bayer/demosaicing/malvar2004.py
@@ -104,7 +104,7 @@ def demosaicing_CFA_Bayer_Malvar2004(
             [ 0.29803923,  0.30441178,  0.31740197]]])
     """
 
-    CFA = as_float_array(CFA)
+    CFA = np.squeeze(as_float_array(CFA))
     R_m, G_m, B_m = masks_CFA_Bayer(CFA.shape, pattern)
 
     GR_GB = (

diff --git a/colour_demosaicing/bayer/demosaicing/menon2007.py b/colour_demosaicing/bayer/demosaicing/menon2007.py
@@ -120,7 +120,7 @@ def demosaicing_CFA_Bayer_Menon2007(
             [ 0.29803923,  0.3764706 ,  0.42352942]]])
     """
 
-    CFA = as_float_array(CFA)
+    CFA = np.squeeze(as_float_array(CFA))
     R_m, G_m, B_m = masks_CFA_Bayer(CFA.shape, pattern)
 
     h_0 = as_float_array([0.0, 0.5, 0.0, 0.5, 0.0])

diff --git a/docs/installation.rst b/docs/installation.rst
@@ -13,11 +13,11 @@ Primary Dependencies
 
 **Colour - Demosaicing** requires various dependencies in order to run:
 
-- `python >= 3.8, < 4 <https://www.python.org/download/releases>`__
-- `colour-science >= 4 <https://pypi.org/project/colour-science>`__
+- `python >= 3.9, < 4 <https://www.python.org/download/releases>`__
+- `colour-science >= 4.3 <https://pypi.org/project/colour-science>`__
 - `imageio >= 2, < 3 <https://imageio.github.io>`__
-- `numpy >= 1.19, < 2 <https://pypi.org/project/numpy>`__
-- `scipy >= 1.5, < 2 <https://pypi.org/project/scipy>`__
+- `numpy >= 1.22, < 2 <https://pypi.org/project/numpy>`__
+- `scipy >= 1.8, < 2 <https://pypi.org/project/scipy>`__
 
 Pypi
 ----

diff --git a/pyproject.toml b/pyproject.toml
@@ -79,7 +79,7 @@ twine = "*"
 biblib-simple = "*"
 pydata-sphinx-theme = "*"
 restructuredtext-lint = "*"
-sphinx = ">= 4, < 5"
+sphinx = "*"
 sphinxcontrib-bibtex = "*"
 
 [tool.black]