Skip to content

Commit 33f4c7a

Browse files
committed
Merge branch 'release/v0.1.5'
2 parents 16ee05e + 68429ce commit 33f4c7a

26 files changed

+564
-636
lines changed

.coveragerc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
[run]
22
source = colour_checker_detection
3+
sigterm = True
34
[report]
45
exclude_lines =
56
pragma: no cover

.flake8

Lines changed: 0 additions & 3 deletions
This file was deleted.

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 2 additions & 2 deletions
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-checker-detection` -->
22+
<!-- Pyright can be started with `pyright --skipunannotated` -->
2323

2424
**Documentation**
2525

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ jobs:
3131
with:
3232
python-version: ${{ matrix.python-version }}
3333
- name: Install Poetry
34+
env:
35+
POETRY_VERSION: 1.4.0
3436
run: |
3537
curl -sSL https://install.python-poetry.org | POETRY_HOME=$HOME/.poetry python3 -
3638
echo "$HOME/.poetry/bin" >> $GITHUB_PATH
@@ -51,9 +53,10 @@ jobs:
5153
shell: bash
5254
- name: Test with Pytest
5355
run: |
54-
poetry run python -W ignore -m pytest --disable-warnings --doctest-modules --ignore=$CI_PACKAGE/examples --cov=$CI_PACKAGE $CI_PACKAGE
56+
poetry run python -W ignore -m pytest --doctest-modules --ignore=$CI_PACKAGE/examples --cov=$CI_PACKAGE $CI_PACKAGE
5557
shell: bash
5658
- name: Upload Coverage to coveralls.io
59+
if: matrix.os == 'macOS-latest' && matrix.python-version == '3.11'
5760
run: |
5861
if [ -z "$COVERALLS_REPO_TOKEN" ]; then echo \"COVERALLS_REPO_TOKEN\" secret is undefined!; else poetry run coveralls; fi
5962
shell: bash

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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 3 deletions
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

Lines changed: 6 additions & 18 deletions
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

Lines changed: 2 additions & 5 deletions
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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@ About
1717

1818
| **Colour - Checker Detection** by Colour Developers
1919
| Copyright 2018 Colour Developers – `colour-developers@colour-science.org <colour-developers@colour-science.org>`__
20-
| This software is released under terms of New BSD License: https://opensource.org/licenses/BSD-3-Clause
20+
| This software is released under terms of BSD-3-Clause: https://opensource.org/licenses/BSD-3-Clause
2121
| `https://github.com/colour-science/colour-checker-detection <https://github.com/colour-science/colour-checker-detection>`__

0 commit comments

Comments
 (0)