Skip to content

Commit 22d4d10

Browse files
committed
Merge branch 'update-pipfiles' into 'develop'
add tests for mpl 3.9 See merge request psyplot/psy-simple!43
2 parents 9483b7a + 3d799ce commit 22d4d10

File tree

20 files changed

+7547
-5253
lines changed

20 files changed

+7547
-5253
lines changed

.gitlab-ci.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,8 @@ test:
6565
IMAGE: python:3.10
6666
- SCENARIO: mpl_37_py311
6767
IMAGE: python:3.11
68+
- SCENARIO: mpl_39_py312
69+
IMAGE: python:3.12
6870
artifacts:
6971
name: pipfile
7072
paths:

ci/matrix/mpl_35_py39/Pipfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ psyplot-gui = {ref = "develop", git = "git+https://codebase.helmholtz.cloud/psyp
1414
PyQt5 = {version="*"}
1515
PyQtWebEngine = {version="*"}
1616
matplotlib = "3.5.*"
17+
numpy = "<2.0.0"
1718

1819
[dev-packages]
1920

ci/matrix/mpl_35_py39/Pipfile.lock

Lines changed: 684 additions & 660 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: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ psyplot-gui = {ref = "develop", git = "git+https://codebase.helmholtz.cloud/psyp
1414
PyQt5 = {version="*"}
1515
PyQtWebEngine = {version="*"}
1616
matplotlib = "3.6.*"
17+
numpy = "<2.0.0"
1718

1819
[dev-packages]
1920

ci/matrix/mpl_36_py310/Pipfile.lock

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

ci/matrix/mpl_37_py311/Pipfile.lock

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

ci/matrix/mpl_38_py310/Pipfile.lock

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

ci/matrix/mpl_38_py311/Pipfile.lock

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

ci/matrix/mpl_38_py312/Pipfile.lock

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

ci/matrix/mpl_38_py39/Pipfile.lock

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

0 commit comments

Comments
 (0)