Skip to content

Commit 4e123b9

Browse files
committed
Merge branch 'update-skeleton' into 'develop'
update skeleton See merge request psyplot/psy-simple!40
2 parents 8ff7a0c + 839bc8a commit 4e123b9

4 files changed

Lines changed: 9 additions & 8 deletions

File tree

.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": "8b481a9c63f07a7d709a1dc383dacea7f076101e",
3+
"commit": "63fa8a2b3c1bab8e173cb91b9fca045639a243dd",
44
"checkout": null,
55
"context": {
66
"cookiecutter": {
@@ -26,7 +26,9 @@
2626
"keywords": "visualization,psyplot,netcdf,matplotlib",
2727
"documentation_url": "https://psyplot.github.io/psy-simple",
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",

.reuse/add_license.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020
from argparse import ArgumentParser
2121
from textwrap import dedent
2222
from typing import Dict, Optional, TypedDict
23+
from pathlib import Path
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

pyproject.toml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,8 @@ description = "Psyplot plugin for simple visualization tasks"
1414
readme = "README.rst"
1515
keywords = [
1616
"visualization",
17-
1817
"psyplot",
19-
2018
"netcdf",
21-
2219
"matplotlib",
2320
]
2421

tox.ini

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

11+
passenv =
12+
NPROCS
13+
1114
commands =
1215
mypy psy_simple
1316
isort --check psy_simple
1417
black --line-length 79 --check psy_simple
1518
; blackdoc --check psy_simple
1619
flake8 psy_simple
1720
pytest -v --cov=psy_simple -x --ref
18-
pytest -v --cov=psy_simple -x --cov-append
21+
pytest -v --cov=psy_simple -x -n {env:NPROCS:1}
1922
reuse lint
2023
cffconvert --validate
2124

2225
[pytest]
23-
DJANGO_SETTINGS_MODULE = testproject.settings
2426
python_files = tests.py test_*.py *_tests.py
2527
norecursedirs = .* build dist *.egg venv docs

0 commit comments

Comments
 (0)