Skip to content

Commit

Permalink
Merge branch 'release/v0.2.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
KelSolaar committed Feb 26, 2022
2 parents 5679d86 + fa4f87f commit b798585
Show file tree
Hide file tree
Showing 5 changed files with 46 additions and 49 deletions.
2 changes: 1 addition & 1 deletion colour_demosaicing/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@

__major_version__ = "0"
__minor_version__ = "2"
__change_version__ = "0"
__change_version__ = "1"
__version__ = ".".join(
(__major_version__, __minor_version__, __change_version__)
)
Expand Down
43 changes: 18 additions & 25 deletions colour_demosaicing/examples/examples_bayer.ipynb

Large diffs are not rendered by default.

21 changes: 10 additions & 11 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "colour-demosaicing"
version = "0.2.0"
version = "0.2.1"
description = "CFA (Colour Filter Array) Demosaicing Algorithms for Python"
license = "BSD-3-Clause"
authors = [ "Colour Developers <[email protected]>" ]
Expand Down Expand Up @@ -50,6 +50,12 @@ exclude = [
[tool.poetry.dependencies]
python = ">= 3.8, < 3.11"
colour-science = ">= 0.4.0"
imageio = ">= 2, < 3"
numpy = ">= 1.19, < 2"
scipy = ">= 1.5, < 2"
typing-extensions = ">= 4, < 5" # Convenience for Google Colab.

matplotlib = { version = ">= 3.2, != 3.5.0, != 3.5.1", optional = true }

biblib-simple = { version = "*", optional = true } # Development dependency.
black = { version = "*", optional = true } # Development dependency.
Expand All @@ -59,9 +65,7 @@ flake8 = { version = "*", optional = true } # Development dependency.
flynt = { version = "*", optional = true } # Development dependency.
invoke = { version = "*", optional = true } # Development dependency.
jupyter = { version = "*", optional = true } # Development dependency.
matplotlib = { version = ">= 3.2, != 3.5.0, != 3.5.1", optional = true }
mypy = { version = "*", optional = true } # Development dependency.
numpy = { version = ">= 1.19, < 2", optional = true }
pre-commit = { version = "*", optional = true } # Development dependency.
pydata-sphinx-theme = { version = "*", optional = true } # Development dependency.
pydocstyle = { version = "*", optional = true } # Development dependency.
Expand Down Expand Up @@ -120,12 +124,7 @@ development = [
"twine",
]
plotting = [ "matplotlib" ]
read-the-docs = [
"matplotlib",
"numpy",
"pydata-sphinx-theme",
"sphinxcontrib-bibtex"
]
read-the-docs = [ "matplotlib", "pydata-sphinx-theme", "sphinxcontrib-bibtex" ]

[tool.black]
line-length = 79
Expand All @@ -150,5 +149,5 @@ convention = "numpy"
add-ignore = "D104,D200,D202,D205,D301,D400"

[build-system]
requires = [ "poetry>=0.12" ]
build-backend = "poetry.masonry.api"
requires = ["poetry_core>=1.0.0"]
build-backend = "poetry.core.masonry.api"
18 changes: 9 additions & 9 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ cfgv==3.3.1
charset-normalizer==2.0.12
click==8.0.4
colorama==0.4.4
colour-science==0.4.0
coverage==6.3.1
colour-science==0.4.1
coverage==6.3.2
coveralls==3.3.1
cycler==0.11.0
debugpy==1.5.1
Expand All @@ -32,15 +32,15 @@ executing==0.8.2
filelock==3.6.0
flake8==4.0.1
flynt==0.76
identify==2.4.10
identify==2.4.11
idna==3.3
imageio==2.16.0
imagesize==1.3.0
importlib-metadata==4.11.1
iniconfig==1.1.1
invoke==1.6.0
ipykernel==6.9.1
ipython==8.0.1
ipython==8.1.0
ipython-genutils==0.2.0
ipywidgets==7.6.5
jedi==0.18.1
Expand Down Expand Up @@ -108,11 +108,11 @@ QtPy==2.0.1
readme-renderer==32.0
requests==2.27.1
requests-toolbelt==0.9.1
restructuredtext-lint==1.3.2
restructuredtext-lint==1.4.0
rfc3986==2.0.0
scipy==1.8.0
Send2Trash==1.8.0
setuptools==59.6.0
setuptools==60.5.0
six==1.16.0
snowballstemmer==2.2.0
soupsieve==2.3.1
Expand All @@ -126,7 +126,7 @@ sphinxcontrib-qthelp==1.0.3
sphinxcontrib-serializinghtml==1.1.5
stack-data==0.2.0
terminado==0.13.1
testpath==0.5.0
testpath==0.6.0
tokenize-rt==4.2.1
toml==0.10.2
tomli==2.0.1
Expand All @@ -137,9 +137,9 @@ twine==3.8.0
types-setuptools==57.4.9
typing_extensions==4.1.1
urllib3==1.26.8
virtualenv==20.13.1
virtualenv==20.13.2
wcwidth==0.2.5
webencodings==0.5.1
wheel==0.37.0
wheel==0.37.1
widgetsnbextension==3.5.2
zipp==3.7.0
11 changes: 8 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,13 @@
],
}

install_requires = ["colour-science>=0.4.0"]
install_requires = [
"colour-science>=0.4.0",
"imageio>=2,<3",
"numpy>=1.19,<2",
"scipy>=1.5,<2",
"typing-extensions>=4,<5",
]

extras_require = {
"development": [
Expand Down Expand Up @@ -51,15 +57,14 @@
"plotting": ["matplotlib>=3.2,!=3.5.0,!=3.5.1"],
"read-the-docs": [
"matplotlib>=3.2,!=3.5.0,!=3.5.1",
"numpy>=1.19,<2",
"pydata-sphinx-theme",
"sphinxcontrib-bibtex",
],
}

setup(
name="colour-demosaicing",
version="0.2.0",
version="0.2.1",
description="CFA (Colour Filter Array) Demosaicing Algorithms for Python",
long_description=codecs.open("README.rst", encoding="utf8").read(),
author="Colour Developers",
Expand Down

0 comments on commit b798585

Please sign in to comment.