Skip to content

Commit b2b3d41

Browse files
KelSolaarKelSolaar
committed
Merge branch 'release/v0.2.7'
2 parents 7682ccc + 7c93394 commit b2b3d41

File tree

7 files changed

+234
-154
lines changed

7 files changed

+234
-154
lines changed

‎.pre-commit-config.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
repos:
22
- repo: https://github.com/ikamensh/flynt/
3-
rev: '0.77'
3+
rev: '1.0.1'
44
hooks:
55
- id: flynt
66
- repo: https://github.com/charliermarsh/ruff-pre-commit
7-
rev: 'v0.0.239'
7+
rev: 'v0.0.285'
88
hooks:
99
- id: ruff
1010
- repo: https://github.com/psf/black
11-
rev: 22.10.0
11+
rev: 23.7.0
1212
hooks:
1313
- id: black
1414
language_version: python3.9

‎README.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Colour - Dash
66
Introduction
77
------------
88

9-
Various colour science `Dash <https://dash.plot.ly/>`__ apps built on top of
9+
Various colour science `Dash <https://dash.plot.ly>`__ apps built on top of
1010
`Colour <https://github.com/colour-science/colour>`__.
1111

1212
Installation
@@ -43,7 +43,7 @@ Code of Conduct
4343
---------------
4444

4545
The *Code of Conduct*, adapted from the `Contributor Covenant 1.4 <https://www.contributor-covenant.org/version/1/4/code-of-conduct.html>`__,
46-
is available on the `Code of Conduct <https://www.colour-science.org/code-of-conduct/>`__ page.
46+
is available on the `Code of Conduct <https://www.colour-science.org/code-of-conduct>`__ page.
4747

4848
Contact & Social
4949
----------------

‎app.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
__major_version__ = "0"
2222
__minor_version__ = "2"
23-
__change_version__ = "6"
23+
__change_version__ = "7"
2424
__version__ = ".".join(
2525
(__major_version__, __minor_version__, __change_version__)
2626
)

‎apps/common.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,12 +143,12 @@ def spimtx_format_matrix(M: ArrayLike, decimals: int = 10) -> str:
143143
equalitygroup: ""
144144
bitdepth: 32f
145145
description: |
146-
Convert from {input_colourspace} to Linear {output_colourspace}
146+
Convert from Linear {input_colourspace} to Linear {output_colourspace}
147147
isdata: false
148148
encoding: scene-linear
149149
allocation: uniform
150150
from_scene_reference: !<GroupTransform>
151-
name: {input_colourspace} to Linear {output_colourspace}
151+
name: Linear {input_colourspace} to Linear {output_colourspace}
152152
children:
153153
- !<MatrixTransform> {{matrix: {matrix}}}
154154
"""[

‎pyproject.toml‎

Lines changed: 54 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[tool.poetry]
22
name = "colour-dash"
3-
version = "0.2.6"
3+
version = "0.2.7"
44
description = "Various colour science Dash apps built on top of Colour"
55
license = "BSD-3-Clause"
66
authors = [ "Colour Developers <[email protected]>" ]
@@ -40,58 +40,31 @@ classifiers = [
4040

4141
[tool.poetry.dependencies]
4242
python = ">= 3.9, < 3.12"
43-
colour-science = ">= 0.4.2"
43+
colour-science = ">= 0.4.3"
4444
imageio = ">= 2, < 3"
45-
numpy = ">= 1.21, < 2"
46-
scipy = ">= 1.7, < 2"
45+
numpy = ">= 1.22, < 2"
46+
scipy = ">= 1.8, < 2"
4747
dash = "*"
4848
dash-renderer = "*"
4949
gunicorn = "*"
5050
plotly = "*"
5151

52-
black = { version = "*", optional = true } # Development dependency.
53-
blackdoc = { version = "*", optional = true } # Development dependency.
54-
coverage = { version = "!= 6.3", optional = true } # Development dependency.
55-
coveralls = { version = "*", optional = true } # Development dependency.
56-
flynt = { version = "*", optional = true } # Development dependency.
57-
invoke = { version = "*", optional = true } # Development dependency.
58-
pre-commit = { version = "*", optional = true } # Development dependency.
59-
pyright = { version = "*", optional = true } # Development dependency.
60-
pytest = { version = "*", optional = true } # Development dependency.
61-
pytest-cov = { version = "*", optional = true } # Development dependency.
62-
pytest-xdist = { version = "*", optional = true } # Development dependency.
63-
ruff = { version = "*", optional = true } # Development dependency.
64-
65-
[tool.poetry.dev-dependencies]
52+
[tool.poetry.group.dev.dependencies]
6653
black = "*"
6754
blackdoc = "*"
68-
coverage = "*"
55+
coverage = "!= 6.3"
6956
coveralls = "*"
7057
flynt = "*"
7158
invoke = "*"
59+
jupyter = "*"
7260
pre-commit = "*"
7361
pyright = "*"
7462
pytest = "*"
7563
pytest-cov = "*"
7664
pytest-xdist = "*"
7765
ruff = "*"
78-
79-
[tool.poetry.extras]
80-
development = [
81-
"black",
82-
"blackdoc",
83-
"coverage",
84-
"coveralls",
85-
"flynt",
86-
"invoke",
87-
"mypy",
88-
"pre-commit",
89-
"pyright",
90-
"pytest",
91-
"pytest-cov",
92-
"pytest-xdist",
93-
"ruff",
94-
]
66+
toml = "*"
67+
twine = "*"
9568

9669
[tool.black]
9770
line-length = 79
@@ -119,47 +92,47 @@ reportUnusedExpression = false
11992
target-version = "py39"
12093
line-length = 88
12194
select = [
122-
"A", # flake8-builtins
123-
"ARG", # flake8-unused-arguments
124-
# "ANN", # flake8-annotations
125-
"B", # flake8-bugbear
126-
# "BLE", # flake8-blind-except
127-
"C4", # flake8-comprehensions
128-
# "C90", # mccabe
129-
# "COM", # flake8-commas
130-
"DTZ", # flake8-datetimez
131-
"D", # pydocstyle
132-
"E", # pydocstyle
133-
# "ERA", # eradicate
134-
# "EM", # flake8-errmsg
135-
"EXE", # flake8-executable
136-
"F", # flake8
137-
# "FBT", # flake8-boolean-trap
138-
"G", # flake8-logging-format
139-
"I", # isort
140-
"ICN", # flake8-import-conventions
141-
"INP", # flake8-no-pep420
142-
"ISC", # flake8-implicit-str-concat
143-
"N", # pep8-naming
144-
# "PD", # pandas-vet
145-
"PIE", # flake8-pie
146-
"PGH", # pygrep-hooks
147-
"PL", # pylint
148-
# "PT", # flake8-pytest-style
149-
# "PTH", # flake8-use-pathlib [Enable]
150-
"Q", # flake8-quotes
151-
"RET", # flake8-return
152-
"RUF", # Ruff
153-
"S", # flake8-bandit
154-
"SIM", # flake8-simplify
155-
"T10", # flake8-debugger
156-
"T20", # flake8-print
157-
# "TCH", # flake8-type-checking
158-
"TID", # flake8-tidy-imports
159-
"TRY", # tryceratops
160-
"UP", # pyupgrade
161-
"W", # pydocstyle
162-
"YTT" # flake8-2020
95+
"A", # flake8-builtins
96+
"ARG", # flake8-unused-arguments
97+
# "ANN", # flake8-annotations
98+
"B", # flake8-bugbear
99+
# "BLE", # flake8-blind-except
100+
"C4", # flake8-comprehensions
101+
# "C90", # mccabe
102+
# "COM", # flake8-commas
103+
"DTZ", # flake8-datetimez
104+
"D", # pydocstyle
105+
"E", # pydocstyle
106+
# "ERA", # eradicate
107+
# "EM", # flake8-errmsg
108+
"EXE", # flake8-executable
109+
"F", # flake8
110+
# "FBT", # flake8-boolean-trap
111+
"G", # flake8-logging-format
112+
"I", # isort
113+
"ICN", # flake8-import-conventions
114+
"INP", # flake8-no-pep420
115+
"ISC", # flake8-implicit-str-concat
116+
"N", # pep8-naming
117+
# "PD", # pandas-vet
118+
"PIE", # flake8-pie
119+
"PGH", # pygrep-hooks
120+
"PL", # pylint
121+
# "PT", # flake8-pytest-style
122+
# "PTH", # flake8-use-pathlib [Enable]
123+
"Q", # flake8-quotes
124+
"RET", # flake8-return
125+
"RUF", # Ruff
126+
"S", # flake8-bandit
127+
"SIM", # flake8-simplify
128+
"T10", # flake8-debugger
129+
"T20", # flake8-print
130+
# "TCH", # flake8-type-checking
131+
"TID", # flake8-tidy-imports
132+
"TRY", # tryceratops
133+
"UP", # pyupgrade
134+
"W", # pydocstyle
135+
"YTT" # flake8-2020
163136
]
164137
ignore = [
165138
"B008",
@@ -178,9 +151,13 @@ ignore = [
178151
"N813",
179152
"N815",
180153
"N816",
154+
"PGH003",
181155
"PIE804",
182156
"PLE0605",
157+
"PLR0911",
158+
"PLR0912",
183159
"PLR0913",
160+
"PLR0915",
184161
"PLR2004",
185162
"RET504",
186163
"RET505",

0 commit comments

Comments
 (0)