Merge pull request #810 from tylerjereddy/treddy_issue_479

MAINT: unpin matplotlib

Author: shanedsnyder

.cirrus.yml

@@ -8,8 +8,7 @@ task:
     /opt/homebrew/opt/[email protected]/bin/python3 -m venv ~/py_310
     source ~/py_310/bin/activate
     python -m pip install --upgrade pip
-    python -m pip install --upgrade pytest lxml
-    python -m pip install 'matplotlib<3.5'
+    python -m pip install --upgrade pytest lxml matplotlib packaging
     brew install automake libtool binutils
     mkdir -p /tmp/darshan_install
     export DARSHAN_INSTALL_PATH=/tmp/darshan_install

.github/workflows/main_ci.yml

@@ -31,10 +31,7 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          python -m pip install --upgrade pytest mypy pyflakes asv pytest-cov codecov lxml
-          # matplotlib is pinned because of
-          # gh-479
-          python -m pip install 'matplotlib<3.5'
+          python -m pip install --upgrade pytest mypy pyflakes asv pytest-cov codecov lxml matplotlib packaging
       - if: ${{matrix.platform == 'macos-latest'}}
         name: Install MacOS deps
         run: |

darshan-util/pydarshan/darshan/tests/test_plot_dxt_heatmap.py

@@ -3,7 +3,9 @@
 from numpy.testing import assert_array_equal, assert_allclose
 import pandas as pd
 import seaborn as sns
+import matplotlib
 import matplotlib.pyplot as plt
+from packaging import version
 
 import darshan
 from darshan.experimental.plots import heatmap_handling, plot_dxt_heatmap
@@ -389,10 +391,16 @@ def test_adjust_for_colorbar(filepath):
         # since `dxt.darshan` has 1 rank, the colorbar doesn't have
         # to go closer to the edge of the figure
         assert cbar_positions.x0 == 0.82
-        assert cbar_positions.x1 == 0.8416135084427767
+        if version.parse(matplotlib.__version__) < version.parse("3.5.0"):
+            assert cbar_positions.x1 == 0.8416135084427767
+        else:
+            assert cbar_positions.x1 == 1.72
     else:
         assert cbar_positions.x0 == 0.85
-        assert cbar_positions.x1 == 0.8716135084427767
+        if version.parse(matplotlib.__version__) < version.parse("3.5.0"):
+            assert cbar_positions.x1 == 0.8716135084427767
+        else:
+            assert cbar_positions.x1 == 1.75
 
 @pytest.mark.parametrize(
     "filepath",

darshan-util/pydarshan/pyproject.toml

@@ -14,9 +14,10 @@ skip = [
     "*_s390x"
 ]
 test-requires = [
+    "packaging",
     "pytest",
     "lxml",
-    "matplotlib<3.5",
+    "matplotlib",
     "importlib_resources;python_version<'3.9'"
 ]
 before-test = "pip install -U git+https://github.com/darshan-hpc/darshan-logs.git@main"