Skip to content

Commit b3d2374

Browse files
committed
Merge branch 'develop' into 'master'
[release] compatibility fixes for matplotlib 3.9 See merge request psyplot/psy-simple!44
2 parents 22fd047 + 22d4d10 commit b3d2374

File tree

22 files changed

+7557
-5264
lines changed

22 files changed

+7557
-5264
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:

README.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,10 @@ GNU LGPL-3.0 license for more details.
5555
You should have received a copy of the GNU LGPL-3.0 license
5656
along with this program. If not, see https://www.gnu.org/licenses/.
5757

58-
.. |CI| image:: https://codebase.helmholtz.cloud/psyplot/psy-simple/badges/main/pipeline.svg
59-
:target: https://codebase.helmholtz.cloud/psyplot/psy-simple/-/pipelines?page=1&scope=all&ref=main
60-
.. |Code coverage| image:: https://codebase.helmholtz.cloud/psyplot/psy-simple/badges/main/coverage.svg
61-
:target: https://codebase.helmholtz.cloud/psyplot/psy-simple/-/graphs/main/charts
58+
.. |CI| image:: https://codebase.helmholtz.cloud/psyplot/psy-simple/badges/master/pipeline.svg
59+
:target: https://codebase.helmholtz.cloud/psyplot/psy-simple/-/pipelines?page=1&scope=all&ref=master
60+
.. |Code coverage| image:: https://codebase.helmholtz.cloud/psyplot/psy-simple/badges/master/coverage.svg
61+
:target: https://codebase.helmholtz.cloud/psyplot/psy-simple/-/graphs/master/charts
6262
.. |Latest Release| image:: https://codebase.helmholtz.cloud/psyplot/psy-simple/-/badges/release.svg
6363
:target: https://codebase.helmholtz.cloud/psyplot/psy-simple
6464
.. |PyPI version| image:: https://img.shields.io/pypi/v/psy-simple.svg

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.

0 commit comments

Comments
 (0)