Skip to content

Commit 6d7dfc3

Browse files
committed
Merge branch 'feature/v0.2.5' into develop
2 parents 9c77994 + 63be65c commit 6d7dfc3

File tree

5 files changed

+61
-47
lines changed

5 files changed

+61
-47
lines changed

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__ = "4"
23+
__change_version__ = "5"
2424
__version__ = ".".join(
2525
(__major_version__, __minor_version__, __change_version__)
2626
)

apps/rgb_colourspace_transformation_matrix.py

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,10 @@ def _uid(id_):
121121
H5(children="Chromatic Adaptation Transform"),
122122
Dropdown(
123123
id=_uid("chromatic-adaptation-transform"),
124-
options=OPTIONS_CHROMATIC_ADAPTATION_TRANSFORM,
124+
options=[
125+
*OPTIONS_CHROMATIC_ADAPTATION_TRANSFORM,
126+
{"label": "None", "value": "None"},
127+
],
125128
value=STATE_DEFAULT[
126129
"chromatic_adaptation_transform"
127130
],
@@ -271,6 +274,12 @@ def set_RGB_to_RGB_matrix_output(
271274
Colour transformation matrix.
272275
"""
273276

277+
chromatic_adaptation_transform = (
278+
None
279+
if chromatic_adaptation_transform == "None"
280+
else chromatic_adaptation_transform
281+
)
282+
274283
M = matrix_RGB_to_RGB(
275284
RGB_COLOURSPACES[input_colourspace],
276285
RGB_COLOURSPACES[output_colourspace],

pyproject.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[tool.poetry]
22
name = "colour-dash"
3-
version = "0.2.4"
3+
version = "0.2.5"
44
description = "Various colour science Dash apps built on top of Colour"
55
license = "BSD-3-Clause"
66
authors = [ "Colour Developers <colour-developers@colour-science.org>" ]
@@ -42,7 +42,7 @@ classifiers = [
4242
python = ">= 3.9, < 3.12"
4343
colour-science = ">= 0.4.2"
4444
imageio = ">= 2, < 3"
45-
numpy = ">= 1.20, < 2"
45+
numpy = ">= 1.21, < 2"
4646
scipy = ">= 1.7, < 2"
4747
dash = "*"
4848
dash-renderer = "*"

requirements.txt

Lines changed: 45 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,63 +1,66 @@
1+
ansi2html==1.8.0
12
astor==0.8.1
2-
attrs==22.2.0
3-
black==23.1.0
3+
black==23.3.0
44
blackdoc==0.3.8
5-
certifi==2022.12.7
5+
certifi==2023.5.7
66
cfgv==3.3.1
7-
charset-normalizer==3.0.1
8-
click==8.1.3
7+
charset-normalizer==3.1.0
8+
click==8.1.4
99
colour-science==0.4.2
1010
coverage==6.5.0
1111
coveralls==3.3.1
12-
dash==2.8.1
12+
dash==2.11.1
1313
dash-core-components==2.0.0
1414
dash-html-components==2.0.0
1515
dash-renderer==1.9.1
1616
dash-table==5.0.0
1717
distlib==0.3.6
1818
docopt==0.6.2
1919
execnet==1.9.0
20-
filelock==3.9.0
21-
Flask==2.2.2
22-
flynt==0.77
20+
filelock==3.12.2
21+
Flask==2.2.5
22+
flynt==0.78
2323
gunicorn==20.1.0
24-
identify==2.5.17
24+
identify==2.5.24
2525
idna==3.4
26-
imageio==2.25.0
26+
imageio==2.31.1
2727
iniconfig==2.0.0
28-
invoke==2.0.0
28+
invoke==2.1.3
2929
itsdangerous==2.1.2
3030
Jinja2==3.1.2
31-
markdown-it-py==2.1.0
32-
MarkupSafe==2.1.2
31+
markdown-it-py==3.0.0
32+
MarkupSafe==2.1.3
3333
mdurl==0.1.2
34-
more-itertools==9.0.0
35-
mypy-extensions==0.4.3
36-
nodeenv==1.7.0
37-
numpy==1.24.1
38-
packaging==23.0
39-
pathspec==0.11.0
40-
Pillow==9.4.0
41-
pip==22.3.1
42-
platformdirs==2.6.2
43-
plotly==5.13.0
44-
pluggy==1.0.0
45-
pre-commit==3.0.3
46-
Pygments==2.14.0
47-
pyright==1.1.292
48-
pytest==7.2.1
49-
pytest-cov==4.0.0
50-
pytest-xdist==3.1.0
34+
more-itertools==9.1.0
35+
mypy-extensions==1.0.0
36+
nest-asyncio==1.5.6
37+
nodeenv==1.8.0
38+
numpy==1.25.0
39+
packaging==23.1
40+
pathspec==0.11.1
41+
Pillow==10.0.0
42+
pip==23.1.2
43+
platformdirs==3.8.1
44+
plotly==5.15.0
45+
pluggy==1.2.0
46+
pre-commit==3.3.3
47+
Pygments==2.15.1
48+
pyright==1.1.316
49+
pytest==7.4.0
50+
pytest-cov==4.1.0
51+
pytest-xdist==3.3.1
5152
PyYAML==6.0
52-
requests==2.28.2
53-
rich==13.3.1
54-
ruff==0.0.240
55-
scipy==1.10.0
56-
setuptools==67.1.0
57-
tenacity==8.1.0
53+
requests==2.31.0
54+
retrying==1.3.4
55+
rich==13.4.2
56+
ruff==0.0.277
57+
scipy==1.11.1
58+
setuptools==68.0.0
59+
six==1.16.0
60+
tenacity==8.2.2
5861
tomli==2.0.1
59-
typing_extensions==4.4.0
60-
urllib3==1.26.14
61-
virtualenv==20.17.1
62-
Werkzeug==2.2.2
63-
wheel==0.38.4
62+
typing_extensions==4.7.1
63+
urllib3==2.0.3
64+
virtualenv==20.23.1
65+
Werkzeug==2.2.3
66+
wheel==0.40.0

tasks.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616
if not hasattr(inspect, "getargspec"):
1717
inspect.getargspec = inspect.getfullargspec # pyright: ignore
1818

19-
from invoke import Context, task
19+
from invoke.tasks import task
20+
from invoke.context import Context
2021

2122
__author__ = "Colour Developers"
2223
__copyright__ = "Copyright 2018 Colour Developers"
@@ -36,6 +37,7 @@
3637
"docker_build",
3738
"docker_remove",
3839
"docker_run",
40+
"docker_push",
3941
]
4042

4143
APPLICATION_NAME: str = app.__application_name__

0 commit comments

Comments
 (0)