Skip to content

ENH Make _open_preferences_dialog return PreferencesDialog#6269

Merged
Czaki merged 2 commits intonapari:mainfrom
lucyleeow:pref_dlg
Sep 27, 2023
Merged

ENH Make _open_preferences_dialog return PreferencesDialog#6269
Czaki merged 2 commits intonapari:mainfrom
lucyleeow:pref_dlg

Conversation

@lucyleeow
Copy link
Copy Markdown
Contributor

References and relevant issues

closes #6235
suggested in #6230

Description

Make _open_preferences_dialog return the PreferencesDialog, allowing show_shortcuts to be simplified.

@github-actions github-actions bot added the qt Relates to qt label Sep 26, 2023
@lucyleeow
Copy link
Copy Markdown
Contributor Author

Both failures seem to be due to time out

@codecov
Copy link
Copy Markdown

codecov bot commented Sep 26, 2023

Codecov Report

Merging #6269 (9ced5f5) into main (d06b7c0) will increase coverage by 0.00%.
Report is 3 commits behind head on main.
The diff coverage is 100.00%.

@@           Coverage Diff           @@
##             main    #6269   +/-   ##
=======================================
  Coverage   91.60%   91.61%           
=======================================
  Files         585      585           
  Lines       51392    51392           
=======================================
+ Hits        47080    47083    +3     
+ Misses       4312     4309    -3     
Files Coverage Δ
napari/_qt/qt_main_window.py 75.39% <100.00%> (+0.03%) ⬆️
napari/components/_viewer_key_bindings.py 96.42% <100.00%> (-0.09%) ⬇️

... and 2 files with indirect coverage changes

Copy link
Copy Markdown
Contributor

@DragaDoncila DragaDoncila left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pulled down, looks good, thanks @lucyleeow !

Comment thread napari/_qt/qt_main_window.py
@DragaDoncila DragaDoncila added this to the 0.5.0 milestone Sep 26, 2023
@DragaDoncila DragaDoncila added the ready to merge Last chance for comments! Will be merged in ~24h label Sep 26, 2023
@Czaki Czaki added the maintenance PR with maintance changes, label Sep 26, 2023
@Czaki Czaki merged commit a07084c into napari:main Sep 27, 2023
@Czaki Czaki removed the ready to merge Last chance for comments! Will be merged in ~24h label Sep 27, 2023
@lucyleeow lucyleeow deleted the pref_dlg branch September 27, 2023 14:51
kne42 added a commit to kne42/napari that referenced this pull request Sep 27, 2023
* main: (21 commits)
  [pre-commit.ci] pre-commit autoupdate (napari#6266)
  ENH Make `_open_preferences_dialog` return `PreferencesDialog` (napari#6269)
  Fix link to artifacts in update dependecies comment (napari#6270)
  ci(dependabot): bump docker/login-action from 2.1.0 to 3.0.0 (napari#6263)
  FIX add `changing` event to `EventedDict` (napari#6268)
  Restore 'V' keybinding for layer visibiltiy toggle (napari#6261)
  remove: napari.qt.progress (deprecated in 0.4.11) (napari#6252)
  Fix `ShapeList.outline` validations for `int`/list like argument and add a test (napari#6215)
  Fix nitpicks in `id` and `title` `Action` fields in samples menu (napari#6267)
  ci(dependabot): bump actions/checkout from 2 to 4 (napari#6264)
  ci(dependabot): bump actions/setup-python from 2 to 4 (napari#6201)
  Fix typing in _app_model (napari#6059)
  Update `app-model`, `dask`, `fsspec`, `hypothesis`, `imageio`, `ipython`, `jsonschema`, `matplotlib`, `numpy`, `pandas`, `pillow`, `psygnal`, `pytest`, `qtconsole`, `qtpy`, `rich`, `scipy`, `superqt`, `tensorstore`, `tifffile`, `virtualenv`, `xarray`, `zarr` (napari#6265)
  Fix upgrade dependencies wokflow (napari#6211)
  Type _WeakCounter (napari#6246)
  convert Color to string (napari#6243)
  Partially fix translations testing (napari#6014)
  Allow to use all ViewerModel kwargs in Viewer constructor (napari#6209)
  MAINT: Replace `assert np.all(? == ?)` with `assert_array_equal` (napari#6244)
  Fix Python 3.11 StrEnum Compatibility (napari#6242)
  ...
kne42 added a commit to kne42/napari that referenced this pull request Sep 28, 2023
* main: (21 commits)
  [pre-commit.ci] pre-commit autoupdate (napari#6266)
  ENH Make `_open_preferences_dialog` return `PreferencesDialog` (napari#6269)
  Fix link to artifacts in update dependecies comment (napari#6270)
  ci(dependabot): bump docker/login-action from 2.1.0 to 3.0.0 (napari#6263)
  FIX add `changing` event to `EventedDict` (napari#6268)
  Restore 'V' keybinding for layer visibiltiy toggle (napari#6261)
  remove: napari.qt.progress (deprecated in 0.4.11) (napari#6252)
  Fix `ShapeList.outline` validations for `int`/list like argument and add a test (napari#6215)
  Fix nitpicks in `id` and `title` `Action` fields in samples menu (napari#6267)
  ci(dependabot): bump actions/checkout from 2 to 4 (napari#6264)
  ci(dependabot): bump actions/setup-python from 2 to 4 (napari#6201)
  Fix typing in _app_model (napari#6059)
  Update `app-model`, `dask`, `fsspec`, `hypothesis`, `imageio`, `ipython`, `jsonschema`, `matplotlib`, `numpy`, `pandas`, `pillow`, `psygnal`, `pytest`, `qtconsole`, `qtpy`, `rich`, `scipy`, `superqt`, `tensorstore`, `tifffile`, `virtualenv`, `xarray`, `zarr` (napari#6265)
  Fix upgrade dependencies wokflow (napari#6211)
  Type _WeakCounter (napari#6246)
  convert Color to string (napari#6243)
  Partially fix translations testing (napari#6014)
  Allow to use all ViewerModel kwargs in Viewer constructor (napari#6209)
  MAINT: Replace `assert np.all(? == ?)` with `assert_array_equal` (napari#6244)
  Fix Python 3.11 StrEnum Compatibility (napari#6242)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

maintenance PR with maintance changes, qt Relates to qt

Projects

None yet

Development

Successfully merging this pull request may close these issues.

ENH Make _open_preferences_dialog return PreferencesDialog

3 participants