Merge pull request #78 from ericpre/various_fixes

Fix for matplotlib 3.10.dev and other tidy up

.github/workflows/tests.yml

@@ -72,19 +72,15 @@ jobs:
           sudo apt-get install libxcb-render-util0
           sudo apt-get install libxcb-xinerama0
 
-      - name: Install HyperSpy (RELEASE_next_major)
+      - name: Install HyperSpy (RELEASE_next_minor)
         if: contains( matrix.LABEL, 'RnM')
         run: |
-          # pip install git+https://github.com/hyperspy/hyperspy.git@RELEASE_next_major
-          # revert back when hyperspy 2.1 is released 
           pip install git+https://github.com/hyperspy/hyperspy.git@RELEASE_next_minor
 
       - name: Install HyperSpy (RELEASE_next_patch)
         if: contains( matrix.LABEL, 'RnP')
         run: |
-          # pip install git+https://github.com/hyperspy/hyperspy.git@RELEASE_next_patch
-          # revert back when hyperspy 2.1 is released 
-          pip install git+https://github.com/hyperspy/hyperspy.git@RELEASE_next_minor
+          pip install git+https://github.com/hyperspy/hyperspy.git@RELEASE_next_patch
 
       - name: Install exSpy
         if: ${{ ! contains( matrix.LABEL, 'minimum') }}

CHANGES.md

@@ -4,6 +4,8 @@
 
 ## v2.1 (UNRELEASED)
 
+* Fix getting matplotlib backend for matplotlib >= 3.10.dev ([#78](https://github.com/hyperspy/hyperspy_gui_traitsui/pull/78)).
+* Use `qt` instead of `qt4` when setting `ETSConfig.toolkit` ([#78](https://github.com/hyperspy/hyperspy_gui_traitsui/pull/78)).
 * Fix slider in image contrast editor on python >=3.10 ([#76](https://github.com/hyperspy/hyperspy_gui_traitsui/pull/76)).
 * Fix getting version with editable installation ([#75](https://github.com/hyperspy/hyperspy_gui_traitsui/pull/75)).
 * Add releasing guide and release script ([#75](https://github.com/hyperspy/hyperspy_gui_traitsui/pull/75)).

hyperspy_gui_traitsui/__init__.py

@@ -101,13 +101,13 @@ def set_ets_toolkit(toolkit):
 
 
 # Get the backend from matplotlib
-backend = matplotlib.get_backend()
+backend = matplotlib.get_backend().lower()
 _logger.debug('Loading hyperspy.traitsui_gui')
 _logger.debug('Current MPL backend: %s', backend)
-if "WX" in backend:
+if "wx" in backend:
     set_ets_toolkit("wx")
-elif "Qt" in backend:
-    set_ets_toolkit("qt4")
+elif "qt" in backend:
+    set_ets_toolkit("qt")
 elif ETSConfig.toolkit == "":
     # The toolkit has not been set and no supported toolkit is available, so
     # setting it to "null"