Skip to content

Commit 8aac1be

Browse files
committed
Merge branch 'ci-matrix' into 'develop'
implement CI matrix See merge request psyplot/psyplot-gui!37
2 parents 2fe66c7 + 69f74fd commit 8aac1be

27 files changed

+14215
-18
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": "no",
3032
"requires_gui": "yes",
3133
"deploy_package_in_ci": "yes",
3234
"deploy_pages_in_ci": "git-push",

.gitlab-ci.yml

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ test-package:
3030

3131
test:
3232
stage: test
33+
image: "${IMAGE}"
3334
variables:
3435
PIPENV_PIPFILE: "ci/matrix/${SCENARIO}/Pipfile"
3536
# disable sandboxing, otherwise chrome reports errors when the
@@ -44,8 +45,24 @@ test:
4445
- xvfb-run make pipenv-test
4546
parallel:
4647
matrix:
47-
- SCENARIO:
48-
- default
48+
- SCENARIO: default
49+
IMAGE: python:3.9
50+
# python scenarios
51+
- SCENARIO: mpl_38_py39
52+
IMAGE: python:3.9
53+
- SCENARIO: mpl_38_py310
54+
IMAGE: python:3.10
55+
- SCENARIO: mpl_38_py311
56+
IMAGE: python:3.11
57+
- SCENARIO: mpl_38_py312
58+
IMAGE: python:3.12
59+
# matplotlib scenarios
60+
- SCENARIO: mpl_35_py39
61+
IMAGE: python:3.9
62+
- SCENARIO: mpl_36_py310
63+
IMAGE: python:3.10
64+
- SCENARIO: mpl_37_py311
65+
IMAGE: python:3.11
4966
artifacts:
5067
name: pipfile
5168
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

ci/matrix/default/Pipfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ name = "pypi"
1111
psyplot-gui = {extras = ["testsite"], file = "../../.."}
1212
psyplot = {ref = "develop", git = "git+https://codebase.helmholtz.cloud/psyplot/psyplot.git"}
1313
psy-simple = {ref = "develop", git = "git+https://codebase.helmholtz.cloud/psyplot/psy-simple.git"}
14-
matplotlib = "3.7.*"
1514
PyQt5 = {version="*"}
1615
PyQtWebEngine = {version="*"}
1716
psyplot_gui_test = {path = "../../../tests/test_plugin/"}

ci/matrix/mpl_35_py39/Pipfile

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
# SPDX-FileCopyrightText: 2021-2024 Helmholtz-Zentrum hereon GmbH
2+
#
3+
# SPDX-License-Identifier: CC0-1.0
4+
5+
[[source]]
6+
url = "https://pypi.org/simple"
7+
verify_ssl = true
8+
name = "pypi"
9+
10+
[packages]
11+
psyplot-gui = {extras = ["testsite"], file = "../../.."}
12+
psyplot = {ref = "develop", git = "git+https://codebase.helmholtz.cloud/psyplot/psyplot.git"}
13+
psy-simple = {ref = "develop", git = "git+https://codebase.helmholtz.cloud/psyplot/psy-simple.git"}
14+
PyQt5 = {version="*"}
15+
PyQtWebEngine = {version="*"}
16+
psyplot_gui_test = {path = "../../../tests/test_plugin/"}
17+
matplotlib = "3.5.*"
18+
19+
[dev-packages]
20+
21+
[pipenv]
22+
allow_prereleases = true
23+
24+
[requires]
25+
python_version = "3.9"

ci/matrix/mpl_35_py39/Pipfile.lock

Lines changed: 1960 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ci/matrix/mpl_35_py39/Pipfile.lock.license

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ci/matrix/mpl_36_py310/Pipfile

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
# SPDX-FileCopyrightText: 2021-2024 Helmholtz-Zentrum hereon GmbH
2+
#
3+
# SPDX-License-Identifier: CC0-1.0
4+
5+
[[source]]
6+
url = "https://pypi.org/simple"
7+
verify_ssl = true
8+
name = "pypi"
9+
10+
[packages]
11+
psyplot-gui = {extras = ["testsite"], file = "../../.."}
12+
psyplot = {ref = "develop", git = "git+https://codebase.helmholtz.cloud/psyplot/psyplot.git"}
13+
psy-simple = {ref = "develop", git = "git+https://codebase.helmholtz.cloud/psyplot/psy-simple.git"}
14+
PyQt5 = {version="*"}
15+
PyQtWebEngine = {version="*"}
16+
psyplot_gui_test = {path = "../../../tests/test_plugin/"}
17+
matplotlib = "3.6.*"
18+
19+
[dev-packages]
20+
21+
[pipenv]
22+
allow_prereleases = true
23+
24+
[requires]
25+
python_version = "3.10"

ci/matrix/mpl_36_py310/Pipfile.lock

Lines changed: 2016 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ci/matrix/mpl_36_py310/Pipfile.lock.license

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)