Skip to content

Commit 3f506c7

Browse files
KelSolaarKelSolaar
committed
Merge branch 'release/v0.2.2'
2 parents 5524b5b + 8ae5008 commit 3f506c7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+1074
-1143
lines changed

‎.coveragerc

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
[run]
22
source = colour_hdri
3+
sigterm = True
34
[report]
45
exclude_lines =
56
pragma: no cover

‎.flake8

-3
This file was deleted.

‎.github/PULL_REQUEST_TEMPLATE.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ is available to guide the process: https://www.colour-science.org/contributing/.
1515
**Code Style and Quality**
1616

1717
- [ ] Unit tests have been implemented and passed.
18-
- [ ] Mypy static checking has been run and passed.
18+
- [ ] Pyright static checking has been run and passed.
1919
- [ ] Pre-commit hooks have been run and passed.
2020

2121
<!-- The unit tests can be invoked with `poetry run invoke tests` -->
22-
<!-- Mypy can be started with `dmypy run -- --show-error-codes --warn-unused-ignores --warn-redundant-casts --install-types --non-interactive -p colour-hdri` -->
22+
<!-- Pyright can be started with `pyright --skipunannotated` -->
2323

2424
**Documentation**
2525

‎.github/workflows/continuous-integration-documentation.yml

+4-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- name: Environment Variables
1717
run: |
1818
echo "CI_PYTHON_VERSION=${{ matrix.python-version }}" >> $GITHUB_ENV
19-
echo "CI_PACKAGE=colour" >> $GITHUB_ENV
19+
echo "CI_PACKAGE=colour_hdri" >> $GITHUB_ENV
2020
echo "CI_SHA=${{ github.sha }}" >> $GITHUB_ENV
2121
echo "MPLBACKEND=AGG" >> $GITHUB_ENV
2222
echo "COLOUR_SCIENCE__DOCUMENTATION_BUILD=True" >> $GITHUB_ENV
@@ -30,14 +30,16 @@ jobs:
3030
sudo apt-get update
3131
sudo apt-get --yes install latexmk texlive-full
3232
- name: Install Poetry
33+
env:
34+
POETRY_VERSION: 1.4.0
3335
run: |
3436
curl -sSL https://install.python-poetry.org | POETRY_HOME=$HOME/.poetry python3 -
3537
echo "$HOME/.poetry/bin" >> $GITHUB_PATH
3638
shell: bash
3739
- name: Install Package Dependencies
3840
run: |
3941
poetry run python -m pip install --upgrade pip
40-
poetry install --extras "read-the-docs"
42+
poetry install
4143
poetry run python -c "import imageio;imageio.plugins.freeimage.download()"
4244
shell: bash
4345
- name: Build Documentation

‎.github/workflows/continuous-integration-quality-unit-tests.yml

+4-2
Original file line numberDiff line numberDiff line change
@@ -66,14 +66,16 @@ jobs:
6666
echo "C:\Program Files\Adobe\Adobe DNG Converter" >> $GITHUB_PATH
6767
shell: bash
6868
- name: Install Poetry
69+
env:
70+
POETRY_VERSION: 1.4.0
6971
run: |
7072
curl -sSL https://install.python-poetry.org | POETRY_HOME=$HOME/.poetry python3 -
7173
echo "$HOME/.poetry/bin" >> $GITHUB_PATH
7274
shell: bash
7375
- name: Install Package Dependencies
7476
run: |
7577
poetry run python -m pip install --upgrade pip
76-
poetry install --extras "plotting"
78+
poetry install
7779
poetry run python -c "import imageio;imageio.plugins.freeimage.download()"
7880
shell: bash
7981
- name: Pre-Commit (All Files)
@@ -86,7 +88,7 @@ jobs:
8688
shell: bash
8789
- name: Test with Pytest
8890
run: |
89-
poetry run python -W ignore -m pytest --disable-warnings --doctest-modules --ignore=$CI_PACKAGE/examples --cov=$CI_PACKAGE $CI_PACKAGE
91+
poetry run python -W ignore -m pytest --doctest-modules --ignore=$CI_PACKAGE/examples --cov=$CI_PACKAGE $CI_PACKAGE
9092
shell: bash
9193
- name: Upload Coverage to coveralls.io
9294
run: |

‎.github/workflows/continuous-integration-static-type-checking.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,4 @@ jobs:
2626
pip install -r requirements.txt
2727
- name: Static Type Checking
2828
run: |
29-
mypy --install-types --non-interactive --show-error-codes --warn-unused-ignores --warn-redundant-casts $CI_PACKAGE
29+
pyright --skipunannotated

‎.gitignore

+1-3
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,10 @@
22
*.pyc
33
*.pyo
44
.DS_Store
5-
.coverage
6-
.dmypy.json
5+
.coverage*
76
.fleet
87
.idea
98
.ipynb_checkpoints
10-
.mypy_cache
119
.sandbox
1210
.vs
1311
.vscode

‎.pre-commit-config.yaml

+6-18
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
repos:
2-
- repo: https://github.com/asottile/pyupgrade
3-
rev: v3.2.2
4-
hooks:
5-
- id: pyupgrade
6-
args: [--py39-plus]
72
- repo: https://github.com/ikamensh/flynt/
8-
rev: '0.77'
3+
rev: '1.0.1'
94
hooks:
105
- id: flynt
6+
- repo: https://github.com/charliermarsh/ruff-pre-commit
7+
rev: 'v0.0.285'
8+
hooks:
9+
- id: ruff
1110
- repo: https://github.com/psf/black
12-
rev: 22.10.0
11+
rev: 23.7.0
1312
hooks:
1413
- id: black
1514
language_version: python3.9
@@ -18,14 +17,3 @@ repos:
1817
hooks:
1918
- id: blackdoc
2019
language_version: python3.9
21-
- repo: https://github.com/PyCQA/flake8
22-
rev: 6.0.0
23-
hooks:
24-
- id: flake8
25-
- repo: https://github.com/pycqa/pydocstyle
26-
rev: 6.1.1
27-
hooks:
28-
- id: pydocstyle
29-
args:
30-
- --convention=numpy
31-
- --add-ignore=D104,D200,D202,D205,D301,D400

‎.readthedocs.yaml

+2-5
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,5 @@ formats:
1313
- pdf
1414

1515
python:
16-
install:
17-
- method: pip
18-
path: .
19-
extra_requirements:
20-
- read-the-docs
16+
install:
17+
- requirements: docs/requirements.txt

‎CONTRIBUTORS.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@ About
1313

1414
| **Colour - HDRI** by Colour Developers
1515
| Copyright 2015 Colour Developers – `colour-developers@colour-science.org <colour-developers@colour-science.org>`__
16-
| This software is released under terms of New BSD License: https://opensource.org/licenses/BSD-3-Clause
16+
| This software is released under terms of BSD-3-Clause: https://opensource.org/licenses/BSD-3-Clause
1717
| `https://github.com/colour-science/colour-hdri <https://github.com/colour-science/colour-hdri>`__

‎LICENSE

+8-21
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,11 @@
11
Copyright 2015 Colour Developers
2-
All rights reserved.
32

4-
Redistribution and use in source and binary forms, with or without
5-
modification, are permitted provided that the following conditions are met:
6-
* Redistributions of source code must retain the above copyright
7-
notice, this list of conditions and the following disclaimer.
8-
* Redistributions in binary form must reproduce the above copyright
9-
notice, this list of conditions and the following disclaimer in the
10-
documentation and/or other materials provided with the distribution.
11-
* Neither the name of the Colour Developers nor the
12-
names of its contributors may be used to endorse or promote products
13-
derived from this software without specific prior written permission.
3+
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
144

15-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
16-
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
17-
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
18-
DISCLAIMED. IN NO EVENT SHALL COLOUR DEVELOPERS BE LIABLE FOR ANY
19-
DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
20-
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
21-
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
22-
ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
23-
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
24-
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
5+
1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
6+
7+
2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
8+
9+
3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
10+
11+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE

‎README.rst

+16-17
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Colour - HDRI
55
66
|actions| |coveralls| |codacy| |version|
77

8-
.. |actions| image:: https://img.shields.io/github/workflow/status/colour-science/colour-hdri/Continuous%20Integration%20-%20Quality%20&%20Unit%20Tests?label=actions&logo=github&style=flat-square
8+
.. |actions| image:: https://img.shields.io/github/actions/workflow/status/colour-science/colour-hdri/.github/workflows/continuous-integration-quality-unit-tests.yml?branch=develop&style=flat-square
99
:target: https://github.com/colour-science/colour-hdri/actions
1010
:alt: Develop Build Status
1111
.. |coveralls| image:: http://img.shields.io/coveralls/colour-science/colour-hdri/develop.svg?style=flat-square
@@ -20,11 +20,11 @@ Colour - HDRI
2020

2121
.. end-badges
2222
23-
A `Python <https://www.python.org/>`__ package implementing various
23+
A `Python <https://www.python.org>`__ package implementing various
2424
HDRI processing algorithms.
2525

2626
It is open source and freely available under the
27-
`New BSD License <https://opensource.org/licenses/BSD-3-Clause>`__ terms.
27+
`BSD-3-Clause <https://opensource.org/licenses/BSD-3-Clause>`__ terms.
2828

2929
.. image:: https://raw.githubusercontent.com/colour-science/colour-hdri/master/docs/_static/Radiance_001.png
3030

@@ -74,20 +74,20 @@ Primary Dependencies
7474

7575
**Colour - HDRI** requires various dependencies in order to run:
7676

77-
- `python >= 3.8, < 4 <https://www.python.org/download/releases/>`__
78-
- `colour-science >= 4 <https://pypi.org/project/colour-science/>`__
79-
- `imageio >= 2, < 3 <https://imageio.github.io/>`__
80-
- `numpy >= 1.19, < 2 <https://pypi.org/project/numpy/>`__
81-
- `scipy >= 1.5, < 2 <https://pypi.org/project/scipy/>`__
77+
- `python >= 3.9, < 4 <https://www.python.org/download/releases>`__
78+
- `colour-science >= 4.3 <https://pypi.org/project/colour-science>`__
79+
- `imageio >= 2, < 3 <https://imageio.github.io>`__
80+
- `numpy >= 1.22, < 2 <https://pypi.org/project/numpy>`__
81+
- `scipy >= 1.8, < 2 <https://pypi.org/project/scipy>`__
8282

8383
Optional Features Dependencies
8484
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
8585

86-
- `colour-demosaicing <https://pypi.org/project/colour-demosaicing/>`__
86+
- `colour-demosaicing <https://pypi.org/project/colour-demosaicing>`__
8787
- `Adobe DNG Converter <https://www.adobe.com/support/downloads/product.jsp?product=106&platform=Mac>`__
88-
- `dcraw <https://www.cybercom.net/~dcoffin/dcraw/>`__
89-
- `ExifTool <http://www.sno.phy.queensu.ca/~phil/exiftool/>`__
90-
- `rawpy <https://pypi.org/project/rawpy/>`__
88+
- `dcraw <https://www.cybercom.net/~dcoffin/dcraw>`__
89+
- `ExifTool <http://www.sno.phy.queensu.ca/~phil/exiftool>`__
90+
- `rawpy <https://pypi.org/project/rawpy>`__
9191

9292
Pypi
9393
~~~~
@@ -114,7 +114,7 @@ Contributing
114114
^^^^^^^^^^^^
115115

116116
If you would like to contribute to `Colour - HDRI <https://github.com/colour-science/colour-hdri>`__,
117-
please refer to the following `Contributing <https://www.colour-science.org/contributing/>`__
117+
please refer to the following `Contributing <https://www.colour-science.org/contributing>`__
118118
guide for `Colour <https://github.com/colour-science/colour>`__.
119119

120120
Bibliography
@@ -146,7 +146,7 @@ Software
146146

147147
**C/C++**
148148

149-
- `OpenCV <https://opencv.org/>`__ by Bradski, G.
149+
- `OpenCV <https://opencv.org>`__ by Bradski, G.
150150
- `Piccante <https://github.com/cnr-isti-vclab/piccante>`__ by Banterle, F. and Benedetti, L.,
151151

152152
*Piccante* was used to verify the Grossberg (2003) Histogram Based Image Sampling.
@@ -159,15 +159,14 @@ Code of Conduct
159159
---------------
160160

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

164164
Contact & Social
165165
----------------
166166

167167
The *Colour Developers* can be reached via different means:
168168

169169
- `Email <mailto:colour-developers@colour-science.org>`__
170-
- `Discourse <https://colour-science.discourse.group/>`__
171170
- `Facebook <https://www.facebook.com/python.colour.science>`__
172171
- `Github Discussions <https://github.com/colour-science/colour-hdri/discussions>`__
173172
- `Gitter <https://gitter.im/colour-science/colour>`__
@@ -178,5 +177,5 @@ About
178177

179178
| **Colour - HDRI** by Colour Developers
180179
| Copyright 2015 Colour Developers – `colour-developers@colour-science.org <colour-developers@colour-science.org>`__
181-
| This software is released under terms of New BSD License: https://opensource.org/licenses/BSD-3-Clause
180+
| This software is released under terms of BSD-3-Clause: https://opensource.org/licenses/BSD-3-Clause
182181
| `https://github.com/colour-science/colour-hdri <https://github.com/colour-science/colour-hdri>`__

‎TODO.rst

+5-6
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ TODO
66

77
- colour_hdri/__init__.py
88

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

1111

1212
- colour_hdri/tonemapping/global_operators/operators.py
1313

14-
- Line 593 : # TODO: Implement automatic *p* and *non-uniform* computations support.
14+
- Line 585 : # TODO: Implement automatic *p* and *non-uniform* computations support.
1515

1616

1717
- colour_hdri/utilities/exif.py
@@ -21,13 +21,12 @@ TODO
2121

2222
- colour_hdri/utilities/image.py
2323

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.
24+
- Line 443 : # TODO: Revise then "MixinDataclassArray" is improved.
2625

2726
About
2827
-----
2928

3029
| **Colour - HDRI** by Colour Developers
31-
| Copyright 2015 Colour Developers – `colour-developers@colour-science.org <colour-developers@colour-science.org>`__
32-
| This software is released under terms of New BSD License: https://opensource.org/licenses/BSD-3-Clause
30+
| Copyright 2015 Colour Developers - `colour-developers@colour-science.org <colour-developers@colour-science.org>`__
31+
| This software is released under terms of BSD-3-Clause: https://opensource.org/licenses/BSD-3-Clause
3332
| `https://github.com/colour-science/colour-hdri <https://github.com/colour-science/colour-hdri>`__

0 commit comments

Comments
 (0)