Skip to content

Commit bd88dd2

Browse files
committed
do not use pytest-xdist
1 parent 5e0702e commit bd88dd2

File tree

5 files changed

+4
-10
lines changed

5 files changed

+4
-10
lines changed

.cruft.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"use_markdown_for_documentation": "no",
2929
"ci_build_stage": "no",
3030
"ci_matrix": "pipenv",
31-
"use_pytest_xdist": "yes",
31+
"use_pytest_xdist": "no",
3232
"requires_gui": "yes",
3333
"deploy_package_in_ci": "yes",
3434
"deploy_pages_in_ci": "git-push",

.gitlab-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ test:
4242
- apt-get install -y xvfb python3-pyqt5.qtwebengine
4343
- pip install pipenv
4444
- pipenv install
45-
- NPROCS=auto xvfb-run make pipenv-test
45+
- xvfb-run make pipenv-test
4646
parallel:
4747
matrix:
4848
- SCENARIO: default

Makefile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@ export PRINT_HELP_PYSCRIPT
2727

2828
BROWSER := python -c "$$BROWSER_PYSCRIPT"
2929

30-
NPROCS ?= 1
31-
3230
help:
3331
@python -c "$$PRINT_HELP_PYSCRIPT" < $(MAKEFILE_LIST)
3432

@@ -79,7 +77,7 @@ pipenv-test: ## run tox
7977
pipenv run isort --check psyplot_gui
8078
pipenv run black --line-length 79 --check psyplot_gui
8179
pipenv run flake8 psyplot_gui
82-
pipenv run pytest -v --cov=psyplot_gui -x -n $(NPROCS)
80+
pipenv run pytest -v --cov=psyplot_gui -x
8381
pipenv run reuse lint
8482
pipenv run cffconvert --validate
8583

pyproject.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@ testsite = [
7474
"pytest-cov",
7575
"reuse",
7676
"cffconvert",
77-
"pytest-xdist",
7877
"netCDF4",
7978
"dask",
8079
"scipy",

tox.ini

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,13 @@
88
extras =
99
testsite
1010

11-
passenv =
12-
NPROCS
13-
1411
commands =
1512
; mypy psyplot_gui
1613
isort --check psyplot_gui
1714
black --line-length 79 --check psyplot_gui
1815
; blackdoc --check psyplot_gui
1916
flake8 psyplot_gui
20-
pytest -v --cov=psyplot_gui -x -n {env:NPROCS:1}
17+
pytest -v --cov=psyplot_gui -x
2118
reuse lint
2219
cffconvert --validate
2320

0 commit comments

Comments
 (0)