Skip to content

Commit

Permalink
Merge branch 'feature/v0.4.5' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
KelSolaar committed Jan 6, 2024
2 parents e913ced + 1a15d1a commit 0d8982c
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/continuous-integration-documentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-22.04]
python-version: [3.12]
python-version: [3.11]
fail-fast: false
runs-on: ${{ matrix.os }}
steps:
Expand Down
16 changes: 5 additions & 11 deletions colour/colorimetry/tristimulus_values.py
Original file line number Diff line number Diff line change
Expand Up @@ -619,7 +619,7 @@ def sd_to_XYZ_integration(
Examples
--------
>>> from colour import MSDS_CMFS, SDS_ILLUMINANTS, SpectralDistribution
>>> from colour import MSDS_CMFS, SDS_ILLUMINANTS
>>> cmfs = MSDS_CMFS["CIE 1931 2 Degree Standard Observer"]
>>> illuminant = SDS_ILLUMINANTS["D65"]
>>> shape = SpectralShape(400, 700, 20)
Expand Down Expand Up @@ -798,7 +798,7 @@ def sd_to_XYZ_tristimulus_weighting_factors_ASTME308(
Examples
--------
>>> from colour import MSDS_CMFS, SDS_ILLUMINANTS, SpectralDistribution
>>> from colour import MSDS_CMFS, SDS_ILLUMINANTS
>>> cmfs = MSDS_CMFS["CIE 1931 2 Degree Standard Observer"]
>>> illuminant = SDS_ILLUMINANTS["D65"]
>>> shape = SpectralShape(400, 700, 20)
Expand Down Expand Up @@ -960,7 +960,7 @@ def sd_to_XYZ_ASTME308(
Examples
--------
>>> from colour import MSDS_CMFS, SDS_ILLUMINANTS, SpectralDistribution
>>> from colour import MSDS_CMFS, SDS_ILLUMINANTS
>>> cmfs = MSDS_CMFS["CIE 1931 2 Degree Standard Observer"]
>>> illuminant = SDS_ILLUMINANTS["D65"]
>>> shape = SpectralShape(400, 700, 20)
Expand Down Expand Up @@ -1210,13 +1210,7 @@ def sd_to_XYZ(
Examples
--------
>>> import numpy as np
>>> from colour import (
... MSDS_CMFS,
... SDS_ILLUMINANTS,
... SpectralDistribution,
... SpectralShape,
... )
>>> from colour import MSDS_CMFS, SDS_ILLUMINANTS
>>> cmfs = MSDS_CMFS["CIE 1931 2 Degree Standard Observer"]
>>> illuminant = SDS_ILLUMINANTS["D65"]
>>> shape = SpectralShape(400, 700, 20)
Expand Down Expand Up @@ -1899,7 +1893,7 @@ class on the last / tail axis as follows:
Examples
--------
>>> from colour import MSDS_CMFS, SDS_ILLUMINANTS, SpectralDistribution
>>> from colour import MSDS_CMFS, SDS_ILLUMINANTS
>>> cmfs = MSDS_CMFS["CIE 1931 2 Degree Standard Observer"]
>>> illuminant = SDS_ILLUMINANTS["D65"]
>>> shape = SpectralShape(400, 700, 60)
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ tqdm = ">= 4, < 5"
xxhash = ">= 3.2, < 4"

[tool.poetry.group.graphviz.dependencies]
pygraphviz = { version = ">= 1, < 2", python = "< 3.12" }
pygraphviz = { version = ">= 1, < 2", python = "< 3.12" }

[tool.poetry.group.meshing.dependencies]
trimesh = ">= 3, < 4"
Expand Down

0 comments on commit 0d8982c

Please sign in to comment.