Skip to content

Commit 7eb6ace

Browse files
committed
update skeleton
1 parent 2fe66c7 commit 7eb6ace

File tree

6 files changed

+16
-20
lines changed

6 files changed

+16
-20
lines changed

.cruft.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"template": "https://codebase.helmholtz.cloud/psyplot/psyplot-plugin-template.git",
3-
"commit": "f0ad88b667f92604f1c0383a044c4d2546d30887",
3+
"commit": "63fa8a2b3c1bab8e173cb91b9fca045639a243dd",
44
"checkout": null,
55
"context": {
66
"cookiecutter": {
@@ -26,7 +26,9 @@
2626
"keywords": "visualization,psyplot,netcdf,raster,cartopy,earth-sciences,pyqt,qt,ipython,jupyter,qtconsole",
2727
"documentation_url": "https://psyplot.github.io/psyplot-gui",
2828
"use_markdown_for_documentation": "no",
29+
"ci_build_stage": "no",
2930
"ci_matrix": "pipenv",
31+
"use_pytest_xdist": "yes",
3032
"requires_gui": "yes",
3133
"deploy_package_in_ci": "yes",
3234
"deploy_pages_in_ci": "git-push",

.gitlab-ci.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,10 @@ test:
4141
- apt-get install -y xvfb python3-pyqt5.qtwebengine
4242
- pip install pipenv
4343
- pipenv install
44-
- xvfb-run make pipenv-test
44+
- NPROCS=auto xvfb-run make pipenv-test
4545
parallel:
4646
matrix:
47-
- SCENARIO:
48-
- default
47+
- SCENARIO: default
4948
artifacts:
5049
name: pipfile
5150
paths:

.reuse/add_license.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@
1818

1919
import os.path as osp
2020
from argparse import ArgumentParser
21+
from pathlib import Path
2122
from textwrap import dedent
2223
from typing import Dict, Optional, TypedDict
2324

2425
import yaml
2526
from reuse.project import Project
26-
from reuse.vcs import find_root
2727

2828
try:
2929
from reuse._annotate import add_arguments as _orig_add_arguments
@@ -110,7 +110,7 @@ def main(argv=None):
110110
args.year.append(shortcut["year"])
111111
args.copyright.append(shortcut["copyright"])
112112

113-
project = Project(find_root())
113+
project = Project(Path(__file__).parent.parent)
114114
args.func(args, project)
115115

116116

Makefile

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

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

30+
NPROCS ?= 1
31+
3032
help:
3133
@python -c "$$PRINT_HELP_PYSCRIPT" < $(MAKEFILE_LIST)
3234

@@ -77,7 +79,7 @@ pipenv-test: ## run tox
7779
pipenv run isort --check psyplot_gui
7880
pipenv run black --line-length 79 --check psyplot_gui
7981
pipenv run flake8 psyplot_gui
80-
pipenv run pytest -v --cov=psyplot_gui -x
82+
pipenv run pytest -v --cov=psyplot_gui -x -n $(NPROCS)
8183
pipenv run reuse lint
8284
pipenv run cffconvert --validate
8385

pyproject.toml

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,27 +14,17 @@ description = "Graphical user interface for the psyplot package"
1414
readme = "README.md"
1515
keywords = [
1616
"visualization",
17-
1817
"psyplot",
19-
2018
"netcdf",
21-
2219
"raster",
23-
2420
"cartopy",
25-
2621
"earth-sciences",
27-
2822
"pyqt",
29-
3023
"qt",
31-
3224
"ipython",
33-
3425
"jupyter",
35-
3626
"qtconsole",
37-
]
27+
]
3828

3929
authors = [
4030
{ name = 'Philipp S. Sommer', email = 'philipp.sommer@hereon.de' },
@@ -84,6 +74,7 @@ testsite = [
8474
"pytest-cov",
8575
"reuse",
8676
"cffconvert",
77+
"pytest-xdist",
8778
"netCDF4",
8879
"dask",
8980
"scipy",

tox.ini

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,19 @@
88
extras =
99
testsite
1010

11+
passenv =
12+
NPROCS
13+
1114
commands =
1215
; mypy psyplot_gui
1316
isort --check psyplot_gui
1417
black --line-length 79 --check psyplot_gui
1518
; blackdoc --check psyplot_gui
1619
flake8 psyplot_gui
17-
pytest -v --cov=psyplot_gui -x
20+
pytest -v --cov=psyplot_gui -x -n {env:NPROCS:1}
1821
reuse lint
1922
cffconvert --validate
2023

2124
[pytest]
22-
DJANGO_SETTINGS_MODULE = testproject.settings
2325
python_files = tests.py test_*.py *_tests.py
2426
norecursedirs = .* build dist *.egg venv docs

0 commit comments

Comments
 (0)