Skip to content

Commit f3abcc4

Browse files
committed
Merge branch 'feature/v0.1.4' into develop
2 parents 18e41b2 + 3f0704a commit f3abcc4

File tree

5 files changed

+12
-9
lines changed

5 files changed

+12
-9
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
shell: bash
4949
- name: Test with Pytest
5050
run: |
51-
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
5252
shell: bash
5353
- name: Upload Coverage to coveralls.io
5454
run: |

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,6 @@ jobs:
2121
uses: actions/setup-python@v1
2222
with:
2323
python-version: ${{ matrix.python-version }}
24-
- name: Install Dependencies (macOS)
25-
run: |
26-
brew install gnu-sed graphviz
27-
ln -s /usr/local/bin/gsed /usr/local/bin/sed
28-
shell: bash
2924
- name: Static Type Checking
3025
run: |
3126
pip install -r requirements.txt

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,11 @@
55
.idea
66
.ipynb_checkpoints/
77
.mypy_cache
8+
.vscode
9+
.sandbox
10+
811
__pycache__
12+
913
build
1014
colour_checker_detection.egg-info
1115
dist

pyproject.toml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ pydata-sphinx-theme = { version = "*", optional = true } # Development dependen
6868
pydocstyle = { version = "*", optional = true } # Development dependency.
6969
pytest = { version = "*", optional = true } # Development dependency.
7070
pytest-cov = { version = "*", optional = true } # Development dependency.
71+
pytest-xdist = { version = "*", optional = true} #Development dependency
7172
pyupgrade = { version = "*", optional = true } # Development dependency.
7273
restructuredtext-lint = { version = "*", optional = true } # Development dependency.
7374
sphinx = { version = ">= 4, < 5", optional = true } # Development dependency.
@@ -90,6 +91,7 @@ pydata-sphinx-theme = "*"
9091
pydocstyle = "*"
9192
pytest = "*"
9293
pytest-cov = "*"
94+
pytest-xdist = "*"
9395
pyupgrade = "*"
9496
restructuredtext-lint = "*"
9597
sphinx = ">= 4, < 5"
@@ -145,6 +147,9 @@ ignore_missing_imports = true
145147
convention = "numpy"
146148
add-ignore = "D104,D200,D202,D205,D301,D400"
147149

150+
[tool.pytest.ini_options]
151+
addopts = "-n auto --durations=5"
152+
148153
[build-system]
149154
requires = [ "poetry_core>=1.0.0" ]
150155
build-backend = "poetry.core.masonry.api"

tasks.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -239,12 +239,11 @@ def tests(ctx: Context):
239239

240240
message_box('Running "Pytest"...')
241241
ctx.run(
242-
"py.test "
242+
"pytest "
243243
"--disable-warnings "
244244
"--doctest-modules "
245245
f"--ignore={PYTHON_PACKAGE_NAME}/examples "
246-
f"{PYTHON_PACKAGE_NAME}",
247-
env={"MPLBACKEND": "AGG"},
246+
f"{PYTHON_PACKAGE_NAME}"
248247
)
249248

250249

0 commit comments

Comments
 (0)