Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix for matplotlib 3.10.dev and other tidy up #78

Merged
merged 4 commits into from
May 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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') }}
Expand Down
2 changes: 2 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)).
Expand Down
8 changes: 4 additions & 4 deletions hyperspy_gui_traitsui/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -101,13 +101,13 @@


# Get the backend from matplotlib
backend = matplotlib.get_backend()
backend = matplotlib.get_backend().lower()

Check warning on line 104 in hyperspy_gui_traitsui/__init__.py

View check run for this annotation

Codecov / codecov/patch

hyperspy_gui_traitsui/__init__.py#L104

Added line #L104 was not covered by tests
_logger.debug('Loading hyperspy.traitsui_gui')
_logger.debug('Current MPL backend: %s', backend)
if "WX" in backend:
if "wx" in backend:

Check warning on line 107 in hyperspy_gui_traitsui/__init__.py

View check run for this annotation

Codecov / codecov/patch

hyperspy_gui_traitsui/__init__.py#L107

Added line #L107 was not covered by tests
set_ets_toolkit("wx")
elif "Qt" in backend:
set_ets_toolkit("qt4")
elif "qt" in backend:
set_ets_toolkit("qt")

Check warning on line 110 in hyperspy_gui_traitsui/__init__.py

View check run for this annotation

Codecov / codecov/patch

hyperspy_gui_traitsui/__init__.py#L109-L110

Added lines #L109 - L110 were not covered by tests
elif ETSConfig.toolkit == "":
# The toolkit has not been set and no supported toolkit is available, so
# setting it to "null"
Expand Down
Empty file removed hyperspy_gui_traitsui/conftest.py
Empty file.