Merge branch 'master' into dev_guide

PlasmaControl · Oct 21, 2024 · 7b721b2 · 7b721b2
2 parents 659bd14 + 84a051b
commit 7b721b2
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 2 deletions.
diff --git a/.github/workflows/mpl_tests.yml b/.github/workflows/mpl_tests.yml
@@ -45,6 +45,17 @@ jobs:
           - mpl-version: 3.7.0
           - mpl-version: 3.7.1
           - mpl-version: 3.7.2
+          - mpl-version: 3.7.3
+          - mpl-version: 3.7.4
+          - mpl-version: 3.7.5
+          - mpl-version: 3.8.0
+          - mpl-version: 3.8.1
+          - mpl-version: 3.8.2
+          - mpl-version: 3.8.3
+          - mpl-version: 3.8.4
+          - mpl-version: 3.9.0
+          - mpl-version: 3.9.2
+
     steps:
       - uses: actions/checkout@v4
       - name: Set up Python 3.10

diff --git a/.github/workflows/notebook_tests.yml b/.github/workflows/notebook_tests.yml
@@ -67,6 +67,7 @@ jobs:
           source .venv-${{ matrix.python-version }}/bin/activate
           python -m pip install --upgrade pip
           pip install -r devtools/dev-requirements.txt
+          pip install matplotlib==3.7.2
 
       - name: Test notebooks with pytest and nbmake
         if: env.has_changes == 'true'

diff --git a/.github/workflows/regression_tests.yml b/.github/workflows/regression_tests.yml
@@ -66,6 +66,7 @@ jobs:
           source .venv-${{ matrix.python-version }}/bin/activate
           python -m pip install --upgrade pip
           pip install -r devtools/dev-requirements.txt
+          pip install matplotlib==3.7.2
 
       - name: Set Swap Space
         if: env.has_changes == 'true'

diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml
@@ -72,6 +72,7 @@ jobs:
           source .venv-${{ matrix.combos.python_version }}/bin/activate
           python -m pip install --upgrade pip
           pip install -r devtools/dev-requirements.txt
+          pip install matplotlib==3.7.2
 
       - name: Set Swap Space
         if: env.has_changes == 'true'

diff --git a/desc/plotting.py b/desc/plotting.py
@@ -110,15 +110,15 @@
 
 def _set_tight_layout(fig):
     # compat layer to deal with API changes in mpl 3.6.0
-    if int(matplotlib._version.version.split(".")[1]) < 6:
+    if int(matplotlib.__version__[0]) == 3 and int(matplotlib.__version__[2]) < 6:
         fig.set_tight_layout(True)
     else:
         fig.set_layout_engine("tight")
 
 
 def _get_cmap(name, n=None):
     # compat layer to deal with API changes in mpl 3.6.0
-    if int(matplotlib._version.version.split(".")[1]) < 6:
+    if int(matplotlib.__version__[0]) == 3 and int(matplotlib.__version__[2]) < 6:
         return matplotlib.cm.get_cmap(name, n)
     else:
         c = matplotlib.colormaps[name]