Skip to content

Commit e08633b

Browse files
committed
Merge branch 'release/v0.2.1'
2 parents c729e96 + aaa4a88 commit e08633b

Some content is hidden

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

59 files changed

+698
-354
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_datasets" >> $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: [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:
@@ -20,14 +20,17 @@ jobs:
2020
echo "CI_SHA=${{ github.sha }}" >> $GITHUB_ENV
2121
echo "COVERALLS_REPO_TOKEN=${{ secrets.COVERALLS_REPO_TOKEN }}" >> $GITHUB_ENV
2222
shell: bash
23+
- name: Set up Python 3.9 for Pre-Commit
24+
uses: actions/setup-python@v1
25+
with:
26+
python-version: 3.9
2327
- name: Set up Python ${{ matrix.python-version }}
2428
uses: actions/setup-python@v1
2529
with:
2630
python-version: ${{ matrix.python-version }}
2731
- name: Install Poetry
2832
run: |
29-
curl -L https://raw.githubusercontent.com/sdispater/poetry/master/get-poetry.py -o get-poetry.py
30-
python get-poetry.py --version 1.1.12
33+
curl -sSL https://install.python-poetry.org | POETRY_HOME=$HOME/.poetry python3 -
3134
echo "$HOME/.poetry/bin" >> $GITHUB_PATH
3235
shell: bash
3336
- name: Install Package Dependencies
@@ -45,7 +48,7 @@ jobs:
4548
shell: bash
4649
- name: Test with Pytest
4750
run: |
48-
poetry run python -W ignore -m py.test --disable-warnings --doctest-modules --ignore=$CI_PACKAGE/examples --cov=$CI_PACKAGE $CI_PACKAGE
51+
poetry run python -W ignore -m pytest --disable-warnings --doctest-modules --ignore=$CI_PACKAGE/examples --cov=$CI_PACKAGE $CI_PACKAGE
4952
shell: bash
5053
- name: Upload Coverage to coveralls.io
5154
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_datasets" >> $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: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,16 @@
44
.DS_Store
55
.coverage
66
.dmypy.json
7+
.fleet
78
.idea
9+
.ipynb_checkpoints
810
.mypy_cache
11+
.sandbox
12+
.vs
13+
.vscode
14+
915
__pycache__
16+
1017
build
1118
dist
1219
docs/_build

.pre-commit-config.yaml

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

.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

0 commit comments

Comments
 (0)