Skip to content

Commit 16ee05e

Browse files
KelSolaarKelSolaar
committed
Merge branch 'release/v0.1.4'
2 parents 9dcbdfd + 07b9a7b commit 16ee05e

17 files changed

+315
-279
lines changed

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,16 @@ jobs:
77
name: ${{ matrix.os }} - Python ${{ matrix.python-version }}
88
strategy:
99
matrix:
10-
os: [ubuntu-20.04]
11-
python-version: [3.8]
10+
os: [ubuntu-22.04]
11+
python-version: [3.11]
1212
fail-fast: false
1313
runs-on: ${{ matrix.os }}
1414
steps:
1515
- uses: actions/checkout@v1
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_checker_detection" >> $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
@@ -31,8 +31,7 @@ jobs:
3131
sudo apt-get --yes install latexmk texlive-full
3232
- name: Install Poetry
3333
run: |
34-
curl -L https://raw.githubusercontent.com/sdispater/poetry/master/get-poetry.py -o get-poetry.py
35-
python get-poetry.py
34+
curl -sSL https://install.python-poetry.org | POETRY_HOME=$HOME/.poetry python3 -
3635
echo "$HOME/.poetry/bin" >> $GITHUB_PATH
3736
shell: bash
3837
- name: Install Package Dependencies

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

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ name: Continuous Integration - Quality & Unit Tests
33
on: [push, pull_request]
44

55
jobs:
6-
continuous-integration-package:
6+
continuous-integration-quality-unit-tests:
77
name: ${{ matrix.os }} - Python ${{ matrix.python-version }}
88
strategy:
99
matrix:
10-
os: [macOS-latest, ubuntu-20.04, windows-2019]
11-
python-version: [3.8, 3.9, '3.10']
10+
os: [macOS-latest, ubuntu-22.04, windows-2019]
11+
python-version: [3.9, '3.10', 3.11]
1212
fail-fast: false
1313
runs-on: ${{ matrix.os }}
1414
steps:
@@ -22,14 +22,17 @@ jobs:
2222
echo "CI_SHA=${{ github.sha }}" >> $GITHUB_ENV
2323
echo "COVERALLS_REPO_TOKEN=${{ secrets.COVERALLS_REPO_TOKEN }}" >> $GITHUB_ENV
2424
shell: bash
25+
- name: Set up Python 3.9 for Pre-Commit
26+
uses: actions/setup-python@v1
27+
with:
28+
python-version: 3.9
2529
- name: Set up Python ${{ matrix.python-version }}
2630
uses: actions/setup-python@v1
2731
with:
2832
python-version: ${{ matrix.python-version }}
2933
- name: Install Poetry
3034
run: |
31-
curl -L https://raw.githubusercontent.com/sdispater/poetry/master/get-poetry.py -o get-poetry.py
32-
python get-poetry.py --version 1.1.12
35+
curl -sSL https://install.python-poetry.org | POETRY_HOME=$HOME/.poetry python3 -
3336
echo "$HOME/.poetry/bin" >> $GITHUB_PATH
3437
shell: bash
3538
- name: Install Package Dependencies
@@ -48,7 +51,7 @@ jobs:
4851
shell: bash
4952
- name: Test with Pytest
5053
run: |
51-
poetry run python -W ignore -m py.test --disable-warnings --doctest-modules --ignore=$CI_PACKAGE/examples --cov=$CI_PACKAGE $CI_PACKAGE
54+
poetry run python -W ignore -m pytest --disable-warnings --doctest-modules --ignore=$CI_PACKAGE/examples --cov=$CI_PACKAGE $CI_PACKAGE
5255
shell: bash
5356
- name: Upload Coverage to coveralls.io
5457
run: |

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

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,30 +3,27 @@ name: Continuous Integration - Static Type Checking
33
on: [push, pull_request]
44

55
jobs:
6-
continuous-integration-package:
6+
continuous-integration-static-type-checking:
77
name: ${{ matrix.os }} - Python ${{ matrix.python-version }}
88
strategy:
99
matrix:
1010
os: [macOS-latest]
11-
python-version: [3.9]
11+
python-version: [3.11]
1212
fail-fast: false
1313
runs-on: ${{ matrix.os }}
1414
steps:
1515
- uses: actions/checkout@v1
1616
- name: Environment Variables
1717
run: |
18-
echo "CI_PACKAGE=colour" >> $GITHUB_ENV
18+
echo "CI_PACKAGE=colour_checker_detection" >> $GITHUB_ENV
1919
shell: bash
2020
- name: Set up Python ${{ matrix.python-version }}
2121
uses: actions/setup-python@v1
2222
with:
2323
python-version: ${{ matrix.python-version }}
24-
- name: Install Dependencies (macOS)
24+
- name: Install Package Dependencies
2525
run: |
26-
brew install gnu-sed graphviz
27-
ln -s /usr/local/bin/gsed /usr/local/bin/sed
28-
shell: bash
26+
pip install -r requirements.txt
2927
- name: Static Type Checking
3028
run: |
31-
pip install -r requirements.txt
32-
mypy --install-types --non-interactive --show-error-codes --warn-unused-ignores --warn-redundant-casts -p $CI_PACKAGE
29+
mypy --install-types --non-interactive --show-error-codes --warn-unused-ignores --warn-redundant-casts $CI_PACKAGE

‎.gitignore

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,19 @@
1+
*.egg-info
12
*.pyc
3+
*.pyo
24
.DS_Store
35
.coverage
46
.dmypy.json
7+
.fleet
58
.idea
6-
.ipynb_checkpoints/
9+
.ipynb_checkpoints
710
.mypy_cache
11+
.sandbox
12+
.vs
13+
.vscode
14+
815
__pycache__
16+
917
build
1018
colour_checker_detection.egg-info
1119
dist

‎.pre-commit-config.yaml

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,25 @@
11
repos:
22
- repo: https://github.com/asottile/pyupgrade
3-
rev: v2.31.0
3+
rev: v3.2.2
44
hooks:
55
- id: pyupgrade
6-
args: [--py38-plus]
6+
args: [--py39-plus]
77
- repo: https://github.com/ikamensh/flynt/
8-
rev: '0.76'
8+
rev: '0.77'
99
hooks:
1010
- id: flynt
1111
- repo: https://github.com/psf/black
12-
rev: 22.1.0
12+
rev: 22.10.0
1313
hooks:
1414
- id: black
15-
language_version: python3.8
15+
language_version: python3.9
16+
- repo: https://github.com/keewis/blackdoc
17+
rev: v0.3.8
18+
hooks:
19+
- id: blackdoc
20+
language_version: python3.9
1621
- repo: https://github.com/PyCQA/flake8
17-
rev: 4.0.1
22+
rev: 6.0.0
1823
hooks:
1924
- id: flake8
2025
- repo: https://github.com/pycqa/pydocstyle
@@ -23,4 +28,4 @@ repos:
2328
- id: pydocstyle
2429
args:
2530
- --convention=numpy
26-
- --add-ignore=D104,D200,D202,D205,D301,D400
31+
- --add-ignore=D104,D200,D202,D205,D301,D400

‎.readthedocs.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ version: 2
33
build:
44
os: ubuntu-20.04
55
tools:
6-
python: "3.8"
6+
python: "3.11"
77

88
sphinx:
99
configuration: docs/conf.py

‎CONTRIBUTORS.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Contributors
44
Development & Technical Support
55
-------------------------------
66

7-
- **Thomas Mansencal**, *Lead Pipeline Developer @ WetaFX*
7+
- **Thomas Mansencal**, *Technology Supervisor @ Wētā FX*
88

99
Project coordination, overall development.
1010

‎README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Colour - Checker Detection
55
66
|actions| |coveralls| |codacy| |version|
77

8-
.. |actions| image:: https://img.shields.io/github/workflow/status/colour-science/colour-checker-detection/Continuous%20Integration?label=actions&logo=github&style=flat-square
8+
.. |actions| image:: https://img.shields.io/github/workflow/status/colour-science/colour-checker-detection/Continuous%20Integration%20-%20Quality%20&%20Unit%20Tests?label=actions&logo=github&style=flat-square
99
:target: https://github.com/colour-science/colour-checker-detection/actions
1010
:alt: Develop Build Status
1111
.. |coveralls| image:: http://img.shields.io/coveralls/colour-science/colour-checker-detection/develop.svg?style=flat-square

‎colour_checker_detection/__init__.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,19 +41,19 @@
4141
"detect_colour_checkers_segmentation",
4242
]
4343

44-
RESOURCES_DIRECTORY: str = os.path.join(os.path.dirname(__file__), "resources")
45-
EXAMPLES_RESOURCES_DIRECTORY: str = os.path.join(
46-
RESOURCES_DIRECTORY, "colour-checker-detection-examples-datasets"
44+
ROOT_RESOURCES: str = os.path.join(os.path.dirname(__file__), "resources")
45+
ROOT_RESOURCES_EXAMPLES: str = os.path.join(
46+
ROOT_RESOURCES, "colour-checker-detection-examples-datasets"
4747
)
48-
TESTS_RESOURCES_DIRECTORY: str = os.path.join(
49-
RESOURCES_DIRECTORY, "colour-checker-detection-tests-datasets"
48+
ROOT_RESOURCES_TESTS: str = os.path.join(
49+
ROOT_RESOURCES, "colour-checker-detection-tests-datasets"
5050
)
5151

5252
__application_name__ = "Colour - Checker Detection"
5353

5454
__major_version__ = "0"
5555
__minor_version__ = "1"
56-
__change_version__ = "3"
56+
__change_version__ = "4"
5757
__version__ = ".".join(
5858
(__major_version__, __minor_version__, __change_version__)
5959
)

0 commit comments

Comments
 (0)