diff --git a/app.py b/app.py index 33abe94..3929f5a 100644 --- a/app.py +++ b/app.py @@ -20,7 +20,7 @@ __major_version__ = "0" __minor_version__ = "2" -__change_version__ = "4" +__change_version__ = "5" __version__ = ".".join( (__major_version__, __minor_version__, __change_version__) ) diff --git a/apps/rgb_colourspace_transformation_matrix.py b/apps/rgb_colourspace_transformation_matrix.py index ca5636a..f6c85cd 100644 --- a/apps/rgb_colourspace_transformation_matrix.py +++ b/apps/rgb_colourspace_transformation_matrix.py @@ -121,7 +121,10 @@ def _uid(id_): H5(children="Chromatic Adaptation Transform"), Dropdown( id=_uid("chromatic-adaptation-transform"), - options=OPTIONS_CHROMATIC_ADAPTATION_TRANSFORM, + options=[ + *OPTIONS_CHROMATIC_ADAPTATION_TRANSFORM, + {"label": "None", "value": "None"}, + ], value=STATE_DEFAULT[ "chromatic_adaptation_transform" ], @@ -271,6 +274,12 @@ def set_RGB_to_RGB_matrix_output( Colour transformation matrix. """ + chromatic_adaptation_transform = ( + None + if chromatic_adaptation_transform == "None" + else chromatic_adaptation_transform + ) + M = matrix_RGB_to_RGB( RGB_COLOURSPACES[input_colourspace], RGB_COLOURSPACES[output_colourspace], diff --git a/pyproject.toml b/pyproject.toml index b6c3e92..ac40e32 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "colour-dash" -version = "0.2.4" +version = "0.2.5" description = "Various colour science Dash apps built on top of Colour" license = "BSD-3-Clause" authors = [ "Colour Developers " ] @@ -42,7 +42,7 @@ classifiers = [ python = ">= 3.9, < 3.12" colour-science = ">= 0.4.2" imageio = ">= 2, < 3" -numpy = ">= 1.20, < 2" +numpy = ">= 1.21, < 2" scipy = ">= 1.7, < 2" dash = "*" dash-renderer = "*" diff --git a/requirements.txt b/requirements.txt index 8dfa86b..50081fe 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,15 +1,15 @@ +ansi2html==1.8.0 astor==0.8.1 -attrs==22.2.0 -black==23.1.0 +black==23.3.0 blackdoc==0.3.8 -certifi==2022.12.7 +certifi==2023.5.7 cfgv==3.3.1 -charset-normalizer==3.0.1 -click==8.1.3 +charset-normalizer==3.1.0 +click==8.1.4 colour-science==0.4.2 coverage==6.5.0 coveralls==3.3.1 -dash==2.8.1 +dash==2.11.1 dash-core-components==2.0.0 dash-html-components==2.0.0 dash-renderer==1.9.1 @@ -17,47 +17,50 @@ dash-table==5.0.0 distlib==0.3.6 docopt==0.6.2 execnet==1.9.0 -filelock==3.9.0 -Flask==2.2.2 -flynt==0.77 +filelock==3.12.2 +Flask==2.2.5 +flynt==0.78 gunicorn==20.1.0 -identify==2.5.17 +identify==2.5.24 idna==3.4 -imageio==2.25.0 +imageio==2.31.1 iniconfig==2.0.0 -invoke==2.0.0 +invoke==2.1.3 itsdangerous==2.1.2 Jinja2==3.1.2 -markdown-it-py==2.1.0 -MarkupSafe==2.1.2 +markdown-it-py==3.0.0 +MarkupSafe==2.1.3 mdurl==0.1.2 -more-itertools==9.0.0 -mypy-extensions==0.4.3 -nodeenv==1.7.0 -numpy==1.24.1 -packaging==23.0 -pathspec==0.11.0 -Pillow==9.4.0 -pip==22.3.1 -platformdirs==2.6.2 -plotly==5.13.0 -pluggy==1.0.0 -pre-commit==3.0.3 -Pygments==2.14.0 -pyright==1.1.292 -pytest==7.2.1 -pytest-cov==4.0.0 -pytest-xdist==3.1.0 +more-itertools==9.1.0 +mypy-extensions==1.0.0 +nest-asyncio==1.5.6 +nodeenv==1.8.0 +numpy==1.25.0 +packaging==23.1 +pathspec==0.11.1 +Pillow==10.0.0 +pip==23.1.2 +platformdirs==3.8.1 +plotly==5.15.0 +pluggy==1.2.0 +pre-commit==3.3.3 +Pygments==2.15.1 +pyright==1.1.316 +pytest==7.4.0 +pytest-cov==4.1.0 +pytest-xdist==3.3.1 PyYAML==6.0 -requests==2.28.2 -rich==13.3.1 -ruff==0.0.240 -scipy==1.10.0 -setuptools==67.1.0 -tenacity==8.1.0 +requests==2.31.0 +retrying==1.3.4 +rich==13.4.2 +ruff==0.0.277 +scipy==1.11.1 +setuptools==68.0.0 +six==1.16.0 +tenacity==8.2.2 tomli==2.0.1 -typing_extensions==4.4.0 -urllib3==1.26.14 -virtualenv==20.17.1 -Werkzeug==2.2.2 -wheel==0.38.4 +typing_extensions==4.7.1 +urllib3==2.0.3 +virtualenv==20.23.1 +Werkzeug==2.2.3 +wheel==0.40.0 diff --git a/tasks.py b/tasks.py index ad4204d..7beb998 100644 --- a/tasks.py +++ b/tasks.py @@ -16,7 +16,8 @@ if not hasattr(inspect, "getargspec"): inspect.getargspec = inspect.getfullargspec # pyright: ignore -from invoke import Context, task +from invoke.tasks import task +from invoke.context import Context __author__ = "Colour Developers" __copyright__ = "Copyright 2018 Colour Developers" @@ -36,6 +37,7 @@ "docker_build", "docker_remove", "docker_run", + "docker_push", ] APPLICATION_NAME: str = app.__application_name__