Skip to content

Commit a0c82b9

Browse files
KelSolaarKelSolaar
committed
Merge branch 'feature/v0.2.0' into develop
2 parents 8c61166 + 1b71e1c commit a0c82b9

13 files changed

+85
-59
lines changed

‎TODO.rst

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,23 @@ TODO
66

77
- colour_hdri/__init__.py
88

9-
- Line 156 : # TODO: Remove legacy printing support when deemed appropriate.
9+
- Line 243 : # TODO: Remove legacy printing support when deemed appropriate.
1010

1111

12-
- colour_hdri/calibration/debevec1997.py
12+
- colour_hdri/tonemapping/global_operators/operators.py
1313

14-
- Line 164 : # TODO: Investigate if the normalisation value should account for the percentage of uncertain camera response functions values or be correlated to it and scaled according. As an alternative of setting the uncertain camera response functions values to zero, it would be interesting to explore extrapolation as the camera response functions are essentially smooth. It is important to note that camera sensors are usually acting non linearly when reaching saturation level.
14+
- Line 518 : # TODO: Implement automatic *p* and *non-uniform* computations support.
1515

1616

17-
- colour_hdri/tonemapping/global_operators/operators.py
17+
- colour_hdri/utilities/exif.py
18+
19+
- Line 314 : # TODO: Find a better name.
20+
21+
22+
- colour_hdri/utilities/image.py
1823

19-
- Line 486 : # TODO: Implement automatic *p* and *non-uniform* computations support.
24+
- Line 131 : # TODO: Remove pragma when https://github.com/python/mypy/issues/3004 is resolved.
25+
- Line 442 : # TODO: Revise then "MixinDataclassArray" is improved.
2026

2127
About
2228
-----

‎colour_hdri/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -217,8 +217,8 @@
217217
__application_name__ = "Colour - HDRI"
218218

219219
__major_version__ = "0"
220-
__minor_version__ = "1"
221-
__change_version__ = "8"
220+
__minor_version__ = "2"
221+
__change_version__ = "0"
222222
__version__ = ".".join(
223223
(__major_version__, __minor_version__, __change_version__)
224224
)

‎colour_hdri/examples/examples_absolute_luminance_calibration_and_photometric_exposure_conversion.ipynb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
"* [Clang 13.0.0 (clang-1300.0.29.3)] *\n",
3131
"* *\n",
3232
"* colour-science.org : *\n",
33-
"* colour : 0.4.0 *\n",
34-
"* colour-hdri : v0.1.8-95-g5ced6d0 *\n",
33+
"* colour : 0.4.1 *\n",
34+
"* colour-hdri : v0.1.8-100-g8c61166 *\n",
3535
"* *\n",
3636
"* Runtime : *\n",
3737
"* imageio : 2.16.0 *\n",

‎colour_hdri/examples/examples_adobe_dng_sdk_colour_processing.ipynb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@
4848
"* [Clang 13.0.0 (clang-1300.0.29.3)] *\n",
4949
"* *\n",
5050
"* colour-science.org : *\n",
51-
"* colour : 0.4.0 *\n",
52-
"* colour-hdri : v0.1.8-95-g5ced6d0 *\n",
51+
"* colour : 0.4.1 *\n",
52+
"* colour-hdri : v0.1.8-100-g8c61166 *\n",
5353
"* *\n",
5454
"* Runtime : *\n",
5555
"* imageio : 2.16.0 *\n",

‎colour_hdri/examples/examples_global_tonemapping_operators.ipynb

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@
5151
"* [Clang 13.0.0 (clang-1300.0.29.3)] *\n",
5252
"* *\n",
5353
"* colour-science.org : *\n",
54-
"* colour : 0.4.0 *\n",
55-
"* colour-hdri : v0.1.8-95-g5ced6d0 *\n",
54+
"* colour : 0.4.1 *\n",
55+
"* colour-hdri : v0.1.8-100-g8c61166 *\n",
5656
"* *\n",
5757
"* Runtime : *\n",
5858
"* imageio : 2.16.0 *\n",
@@ -216,7 +216,7 @@
216216
{
217217
"data": {
218218
"application/vnd.jupyter.widget-view+json": {
219-
"model_id": "5bcab8dc2e0e46e691846d62194ca422",
219+
"model_id": "c2266db4e5264a5b80fe08d63d2784a8",
220220
"version_major": 2,
221221
"version_minor": 0
222222
},
@@ -258,7 +258,7 @@
258258
{
259259
"data": {
260260
"application/vnd.jupyter.widget-view+json": {
261-
"model_id": "ce94231db0c34de588eb7414036128ff",
261+
"model_id": "60eb1fbec9d84e3c80cd313e2629919a",
262262
"version_major": 2,
263263
"version_minor": 0
264264
},
@@ -302,7 +302,7 @@
302302
{
303303
"data": {
304304
"application/vnd.jupyter.widget-view+json": {
305-
"model_id": "8cefd38f130c43f389ddc0aa26502514",
305+
"model_id": "295091d06ccc407393388715854cc88f",
306306
"version_major": 2,
307307
"version_minor": 0
308308
},
@@ -346,7 +346,7 @@
346346
{
347347
"data": {
348348
"application/vnd.jupyter.widget-view+json": {
349-
"model_id": "d3fed39bf2dc4611a266363db1855626",
349+
"model_id": "5192d3c8dfaf4b4cae9511f5998e0c41",
350350
"version_major": 2,
351351
"version_minor": 0
352352
},
@@ -393,7 +393,7 @@
393393
{
394394
"data": {
395395
"application/vnd.jupyter.widget-view+json": {
396-
"model_id": "30246bc695664b89a83822de387d56e1",
396+
"model_id": "cd291399380542f2b38f6eebef480033",
397397
"version_major": 2,
398398
"version_minor": 0
399399
},
@@ -439,7 +439,7 @@
439439
{
440440
"data": {
441441
"application/vnd.jupyter.widget-view+json": {
442-
"model_id": "596fba58dbe14f488a624e3726cfa073",
442+
"model_id": "22c5cfb2d15a43e48d7bcef1c7d0c1b5",
443443
"version_major": 2,
444444
"version_minor": 0
445445
},
@@ -483,7 +483,7 @@
483483
{
484484
"data": {
485485
"application/vnd.jupyter.widget-view+json": {
486-
"model_id": "1b837b726f1f478e9e1536cd4f5fd13b",
486+
"model_id": "3f4822ce3fa04493b768851a5d5b4242",
487487
"version_major": 2,
488488
"version_minor": 0
489489
},
@@ -532,7 +532,7 @@
532532
{
533533
"data": {
534534
"application/vnd.jupyter.widget-view+json": {
535-
"model_id": "3e68b34e2c584b05b2e0b11e372a0fea",
535+
"model_id": "ae81e34227f94766ad3bbf55d4314fb5",
536536
"version_major": 2,
537537
"version_minor": 0
538538
},
@@ -584,7 +584,7 @@
584584
{
585585
"data": {
586586
"application/vnd.jupyter.widget-view+json": {
587-
"model_id": "ae2337e5425e40f680fc250090b1938e",
587+
"model_id": "87503288e2784daf8a8dd5ffaf14ea04",
588588
"version_major": 2,
589589
"version_minor": 0
590590
},

‎colour_hdri/examples/examples_merge_from_ldr_files.ipynb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@
4141
"* [Clang 13.0.0 (clang-1300.0.29.3)] *\n",
4242
"* *\n",
4343
"* colour-science.org : *\n",
44-
"* colour : 0.4.0 *\n",
45-
"* colour-hdri : v0.1.8-95-g5ced6d0 *\n",
44+
"* colour : 0.4.1 *\n",
45+
"* colour-hdri : v0.1.8-100-g8c61166 *\n",
4646
"* *\n",
4747
"* Runtime : *\n",
4848
"* imageio : 2.16.0 *\n",

‎colour_hdri/examples/examples_merge_from_raw_files.ipynb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@
5151
"* [Clang 13.0.0 (clang-1300.0.29.3)] *\n",
5252
"* *\n",
5353
"* colour-science.org : *\n",
54-
"* colour : 0.4.0 *\n",
55-
"* colour-hdri : v0.1.8-95-g5ced6d0 *\n",
54+
"* colour : 0.4.1 *\n",
55+
"* colour-hdri : v0.1.8-100-g8c61166 *\n",
5656
"* *\n",
5757
"* Runtime : *\n",
5858
"* imageio : 2.16.0 *\n",

‎colour_hdri/examples/examples_merge_from_raw_files_using_rawpy.ipynb

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,15 @@
77
"# Colour - HDRI - Examples: Merge from Raw Files using Rawpy"
88
]
99
},
10+
{
11+
"cell_type": "markdown",
12+
"metadata": {},
13+
"source": [
14+
"<div class=\"alert alert-warning\">\n",
15+
"This notebook has not been run in recent releases because Rawpy is not available on Apple M1.\n",
16+
"</div>"
17+
]
18+
},
1019
{
1120
"cell_type": "markdown",
1221
"metadata": {},

‎colour_hdri/examples/examples_merge_from_raw_files_with_post_demosaicing.ipynb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@
5454
"* [Clang 13.0.0 (clang-1300.0.29.3)] *\n",
5555
"* *\n",
5656
"* colour-science.org : *\n",
57-
"* colour : 0.4.0 *\n",
58-
"* colour-demosaicing : 0.2.0 *\n",
59-
"* colour-hdri : v0.1.8-95-g5ced6d0 *\n",
57+
"* colour : 0.4.1 *\n",
58+
"* colour-demosaicing : 0.2.1 *\n",
59+
"* colour-hdri : v0.1.8-100-g8c61166 *\n",
6060
"* *\n",
6161
"* Runtime : *\n",
6262
"* imageio : 2.16.0 *\n",

‎colour_hdri/examples/examples_variance_minimization_light_probe_sampling.ipynb

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@
1313
"source": [
1414
"Through this example, lights will be extracted from radiance images using Viriyothai (2009) variance minimization light probe sampling algorithm.\n",
1515
"\n",
16-
"> Note: The current implementation is not entirely vectorised nor optimised thus slow."
16+
"<div class=\"alert alert-warning\">\n",
17+
"The current implementation is not entirely vectorised nor optimised thus slow.\n",
18+
"</div>"
1719
]
1820
},
1921
{
@@ -32,8 +34,8 @@
3234
"* [Clang 13.0.0 (clang-1300.0.29.3)] *\n",
3335
"* *\n",
3436
"* colour-science.org : *\n",
35-
"* colour : 0.4.0 *\n",
36-
"* colour-hdri : v0.1.8-95-g5ced6d0 *\n",
37+
"* colour : 0.4.1 *\n",
38+
"* colour-hdri : v0.1.8-100-g8c61166 *\n",
3739
"* *\n",
3840
"* Runtime : *\n",
3941
"* imageio : 2.16.0 *\n",

‎pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[tool.poetry]
22
name = "colour-hdri"
3-
version = "0.1.8"
3+
version = "0.2.0"
44
description = "HDRI / Radiance image processing algorithms for Python"
55
license = "BSD-3-Clause"
66
authors = [ "Colour Developers <colour-developers@colour-science.org>" ]

‎requirements.txt

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ cfgv==3.3.1
1717
charset-normalizer==2.0.12
1818
click==8.0.4
1919
colorama==0.4.4
20-
colour-demosaicing==0.2.0
21-
colour-science==0.4.0
20+
colour-demosaicing==0.2.1
21+
colour-science==0.4.1
2222
coverage==6.3.2
2323
coveralls==3.3.1
2424
cycler==0.11.0
@@ -33,15 +33,15 @@ executing==0.8.2
3333
filelock==3.6.0
3434
flake8==4.0.1
3535
flynt==0.76
36-
identify==2.4.10
36+
identify==2.4.11
3737
idna==3.3
3838
imageio==2.16.0
3939
imagesize==1.3.0
4040
importlib-metadata==4.11.1
4141
iniconfig==1.1.1
4242
invoke==1.6.0
4343
ipykernel==6.9.1
44-
ipython==8.0.1
44+
ipython==8.1.0
4545
ipython-genutils==0.2.0
4646
ipywidgets==7.6.5
4747
jedi==0.18.1
@@ -109,11 +109,11 @@ QtPy==2.0.1
109109
readme-renderer==32.0
110110
requests==2.27.1
111111
requests-toolbelt==0.9.1
112-
restructuredtext-lint==1.3.2
112+
restructuredtext-lint==1.4.0
113113
rfc3986==2.0.0
114114
scipy==1.8.0
115115
Send2Trash==1.8.0
116-
setuptools==59.6.0
116+
setuptools==60.5.0
117117
six==1.16.0
118118
snowballstemmer==2.2.0
119119
soupsieve==2.3.1
@@ -127,19 +127,20 @@ sphinxcontrib-qthelp==1.0.3
127127
sphinxcontrib-serializinghtml==1.1.5
128128
stack-data==0.2.0
129129
terminado==0.13.1
130-
testpath==0.5.0
130+
testpath==0.6.0
131131
tokenize-rt==4.2.1
132132
toml==0.10.2
133133
tomli==2.0.1
134134
tornado==6.1
135135
tqdm==4.62.3
136136
traitlets==5.1.1
137137
twine==3.8.0
138+
types-setuptools==57.4.9
138139
typing_extensions==4.1.1
139140
urllib3==1.26.8
140-
virtualenv==20.13.1
141+
virtualenv==20.13.2
141142
wcwidth==0.2.5
142143
webencodings==0.5.1
143-
wheel==0.37.0
144+
wheel==0.37.1
144145
widgetsnbextension==3.5.2
145146
zipp==3.7.0

‎setup.py

Lines changed: 25 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -33,43 +33,51 @@
3333

3434
package_data = {
3535
"": ["*"],
36-
"colour_hdri": [
37-
"examples/*",
38-
"resources/colour-hdri-examples-datasets/*",
39-
"resources/colour-hdri-tests-datasets/*",
40-
],
36+
"colour_hdri": ["examples/*", "resources/colour-hdri-tests-datasets/*"],
4137
}
4238

43-
install_requires = ["colour-science>=0.3.16,<0.4.0", "recordclass"]
39+
install_requires = [
40+
"colour-science>=0.4.0",
41+
"imageio>=2,<3",
42+
"numpy>=1.19,<2",
43+
"scipy>=1.5,<2",
44+
"typing-extensions>=4,<5",
45+
]
4446

4547
extras_require = {
4648
"development": [
4749
"biblib-simple",
48-
"coverage",
50+
"black",
51+
"coverage!=6.3",
4952
"coveralls",
5053
"flake8",
54+
"flynt",
5155
"invoke",
5256
"jupyter",
53-
"mock",
54-
"nose",
57+
"mypy",
5558
"pre-commit",
59+
"pydata-sphinx-theme",
60+
"pydocstyle",
5661
"pytest",
62+
"pytest-cov",
5763
"restructuredtext-lint",
58-
"sphinx<=3.1.2",
59-
"sphinx_rtd_theme",
64+
"sphinx>=4,<5",
6065
"sphinxcontrib-bibtex",
6166
"toml",
6267
"twine",
63-
"yapf==0.23",
6468
],
65-
"optional": ["colour-demosaicing", "rawpy"],
66-
"plotting": ["matplotlib"],
67-
"read-the-docs": ["mock", "numpy", "sphinxcontrib-bibtex"],
69+
"optional": ["colour-demosaicing>=0.2.0"],
70+
"plotting": ["matplotlib>=3.2,!=3.5.0,!=3.5.1"],
71+
"read-the-docs": [
72+
"matplotlib>=3.2,!=3.5.0,!=3.5.1",
73+
"pydata-sphinx-theme",
74+
"sphinxcontrib-bibtex",
75+
],
6876
}
6977

7078
setup(
7179
name="colour-hdri",
72-
version="0.1.8",
80+
version="0.2.0",
7381
description="HDRI / Radiance image processing algorithms for Python",
7482
long_description=codecs.open("README.rst", encoding="utf8").read(),
7583
author="Colour Developers",
@@ -81,5 +89,5 @@
8189
package_data=package_data,
8290
install_requires=install_requires,
8391
extras_require=extras_require,
84-
python_requires=">=3.6,<4.0",
92+
python_requires=">=3.8,<3.11",
8593
)

0 commit comments

Comments
 (0)