Merge pull request #1031 from mantidproject/fix_matplotlib_errors

Upgrade matplotlib to version 3.8.4
mantidproject · Nov 14, 2024 · 4b7ad4e · 4b7ad4e
2 parents 51d4f72 + c07224a
commit 4b7ad4e
Show file tree

Hide file tree

Showing 9 changed files with 2,254 additions and 710 deletions.
diff --git a/.github/actions/publish-package/action.yml b/.github/actions/publish-package/action.yml
@@ -22,7 +22,7 @@ runs:
     shell: bash -l {0}
     run: |
       conda config --set always_yes yes --set changeps1 no
-      conda create -n build-env python=3.10
+      conda create -n build-env
       conda activate build-env
       mamba install -c conda-forge mamba conda-build anaconda-client conda-verify boa
       conda config --add channels mantid/label/nightly

diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml
@@ -25,7 +25,7 @@ jobs:
 
       - name: Install Mantid
         run: |
-          conda install -c mantid/label/nightly mantid mantidqt
+          mamba install -c mantid/label/nightly mantid mantidqt
 
       - name: Run Tests and Coverage
         run: |

diff --git a/.github/workflows/unit_tests_nightly.yml b/.github/workflows/unit_tests_nightly.yml
@@ -25,7 +25,7 @@ jobs:
 
       - name: Install Mantid
         run: |
-          conda install -c mantid/label/nightly mantid mantidqt
+          mamba install -c mantid/label/nightly mantid mantidqt
 
       - name: Run Tests and Coverage
         run: |

diff --git a/conda/conda_build_config.yaml b/conda/conda_build_config.yaml
@@ -1,2 +1,2 @@
 python:
-  - 3.12
+  - =3.12
diff --git a/docs/source/quickstart.rst b/docs/source/quickstart.rst
@@ -15,8 +15,8 @@ You can then copy the ``mslice`` subfolder (the folder containing a file called
 ``scripts/ExternalInterfaces/`` folder of *Mantid*, which will make the new version accessible from *MantidWorkbench*.
 
 Alternatively, Mslice is available as a conda package via anaconda.org on the `mantid channel <https://anaconda.org/mantid/mslice>`_.
-To install the released conda package do ``conda install -c mantid mslice``.
-To install the latest nightly conda package do ``conda install -c mantid/label/nightly mslice``. The nightly conda package includes
+To install the released conda package do ``mamba install -c mantid mslice``.
+To install the latest nightly conda package do ``mamba install -c mantid/label/nightly mslice``. The nightly conda package includes
 all recent changes of the development version up to and including the day before and is only created when all tests have run
 successfully.
 In both cases MSlice can be started by typing ``mslice`` on the command line after activating your conda environment.

diff --git a/environment.yml b/environment.yml
@@ -5,7 +5,7 @@ channels:
   - mantid/label/nightly
 dependencies:
   - coverage
-  - coveralls=3.3.1  # Pinned to a version that works with more recent versions of coverage
+  - coveralls
   - ipython
   - mock
   - pip

diff --git a/pyproject.toml b/pyproject.toml
@@ -22,7 +22,7 @@ classifiers = [
 dependencies = [
     "ipython",
     "numpy",
-    "matplotlib>=1.5",
+    "matplotlib>=3.8.4",
     "six",
     "qtawesome",
     "pre-commit",
@@ -60,7 +60,7 @@ where = ["src"]
 [tool.pytest.ini_options]
 pythonpath = ["src"]
 testpaths = ["tests"]
-filterwarnings = ["error"]
+filterwarnings = ["error", "ignore::DeprecationWarning"]
 
 [tool.coverage.report]
 include = [
-Original file line number
+Diff line change
@@ -1,2 +1,2 @@
     python:
-      - 3.12
+      - =3.12