Skip to content

Commit 69f19a1

Browse files
committed
Merge branch 'update-skeleton' into 'develop'
update skeleton See merge request psyplot/psy-maps!52
2 parents 2306767 + e19b28d commit 69f19a1

5 files changed

Lines changed: 9 additions & 17 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,cartopy,maps,georeferenced",
2727
"documentation_url": "https://psyplot.github.io/psy-maps",
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
@@ -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

CITATION.cff

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,11 @@ message: "If you use this software, please cite it using these metadata."
1616
title: "psy-maps"
1717
keywords:
1818
- "visualization"
19-
2019
- "psyplot"
21-
2220
- "netcdf"
23-
2421
- "matplotlib"
25-
2622
- "cartopy"
27-
2823
- "maps"
29-
3024
- "georeferenced"
3125

3226
license: 'LGPL-3.0-only'

pyproject.toml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,11 @@ description = "Psyplot plugin for visualization on a map"
1414
readme = "README.rst"
1515
keywords = [
1616
"visualization",
17-
1817
"psyplot",
19-
2018
"netcdf",
21-
2219
"matplotlib",
23-
2420
"cartopy",
25-
2621
"maps",
27-
2822
"georeferenced",
2923
]
3024

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_maps
1316
isort --check psy_maps
1417
black --line-length 79 --check psy_maps
1518
; blackdoc --check psy_maps
1619
flake8 psy_maps
1720
pytest -v --cov=psy_maps -x --ref
18-
pytest -v --cov=psy_maps -x --cov-append
21+
pytest -v --cov=psy_maps -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)