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

Use new "true circle" tool from glue-jupyter #2332

Merged
merged 5 commits into from
Sep 8, 2023

Conversation

pllim
Copy link
Contributor

@pllim pllim commented Aug 1, 2023

Description

This pull request is a companion PR to:

  • Bump glue-jupyter minversion when it is released with the required feature.

Change log entry

  • Is a change log needed? If yes, is it added to CHANGES.rst? If you want to avoid merge conflicts,
    list the proposed change log here for review and add to CHANGES.rst before merge. If no, maintainer
    should add a no-changelog-entry-needed label.

Checklist for package maintainer(s)

This checklist is meant to remind the package maintainer(s) who will review this pull request of some common things to look for. This list is not exhaustive.

  • Are two approvals required? Branch protection rule does not check for the second approval. If a second approval is not necessary, please apply the trivial label.
  • Do the proposed changes actually accomplish desired goals? Also manually run the affected example notebooks, if necessary.
  • Do the proposed changes follow the STScI Style Guides?
  • Are tests added/updated as required? If so, do they follow the STScI Style Guides?
  • Are docs added/updated as required? If so, do they follow the STScI Style Guides?
  • Did the CI pass? If not, are the failures related?
  • Is a milestone set? Set this to bugfix milestone if this is a bug fix and needs to be released ASAP; otherwise, set this to the next major release milestone.
  • After merge, any internal documentations need updating (e.g., JIRA, Innerspace)? 🐱

@dhomeier

This comment was marked as resolved.

@pllim pllim force-pushed the circle-must-be-circle branch from 078e84b to 0733cfc Compare September 6, 2023 16:57
CHANGES.rst Outdated
@@ -79,6 +79,9 @@ Specviz2d
Bug Fixes
---------

- Circle tool to create circular Subset no longer result in an ellipse
Copy link
Contributor Author

Choose a reason for hiding this comment

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

I am not convinced this needs backport. But I can move it if you think otherwise.

@codecov
Copy link

codecov bot commented Sep 6, 2023

@pllim pllim marked this pull request as ready for review September 6, 2023 17:28
@pllim
Copy link
Contributor Author

pllim commented Sep 6, 2023

devdeps is unrelated (we have to wait for scikit-image to catch up with numpy)

Copy link
Member

@kecnry kecnry left a comment

Choose a reason for hiding this comment

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

Thanks! (I see no reason to backport this - especially since it bumps the pin to bleeding-edge glue-jupyter).

CHANGES.rst Outdated Show resolved Hide resolved
Co-authored-by: Kyle Conroy <kyleconroy@gmail.com>
Copy link
Contributor

@javerbukh javerbukh left a comment

Choose a reason for hiding this comment

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

LGTM

@pllim pllim merged commit 96d974a into spacetelescope:main Sep 8, 2023
@pllim pllim deleted the circle-must-be-circle branch September 8, 2023 13:33
@pllim
Copy link
Contributor Author

pllim commented Sep 8, 2023

Thanks for the reviews!

javerbukh pushed a commit to javerbukh/jdaviz that referenced this pull request Sep 15, 2023
* Use truecircle tool
from glue-viz/glue-jupyter#376

* MNT: Bump glue-jupyter minversion
that can use this new tool

* Add change log

* Fix line too long

* Fix change log verbiage

Co-authored-by: Kyle Conroy <kyleconroy@gmail.com>

---------

Co-authored-by: Kyle Conroy <kyleconroy@gmail.com>
javerbukh pushed a commit to javerbukh/jdaviz that referenced this pull request Sep 15, 2023
fix event handling for choosing config from launcher

filepath fallback when object from config-detection fails to load

fix: support for notebook 7 (spacetelescope#2420)

Notebook 7 requires a different way to detect if the app runs in
a notebook context.

Fix explanation in markdown cell.

DOC: Footprints plugin API docs (spacetelescope#2426)

* build footprints API docs

* add code snippet in plugin docs

* fix syntax in API docs

---------

Co-authored-by: P. L. Lim <2090236+pllim@users.noreply.github.com>

prevent overwriting user-API methods (spacetelescope#2425)

fix default color for overlay when traitlet set by user

* for the FIRST overlay, the user could have set the color traitlet before the internal overlay object is created (which occurs as soon as the plugin is first shown).  In that case, we want to respect the user choice of color.

similar fixes for any other traitlet when plugin inactive

regression test

change log entry

fix API import of single region and overwriting existing entry

* along with regression testing

TST: Also pull in scikit-image dev
to get rid of incompatibility with numpy

Use new "true circle" tool from glue-jupyter (spacetelescope#2332)

* Use truecircle tool
from glue-viz/glue-jupyter#376

* MNT: Bump glue-jupyter minversion
that can use this new tool

* Add change log

* Fix line too long

* Fix change log verbiage

Co-authored-by: Kyle Conroy <kyleconroy@gmail.com>

---------

Co-authored-by: Kyle Conroy <kyleconroy@gmail.com>

Enable multiselect in subset plugin for recentering (spacetelescope#2430)

* Enable multiselect in subset plugin for recentering

* Fix bug with default text

* Remove unused import

* Fix bug in aperature photometry

* Address review comments

* Remove commented out code

* Add initial tests

* Fix bug when exiting multiselect and switching subsets

* Add documentation and update CHANGES file

* Remove print statement

* Add comment about recentering taking multiple iterations to docs

* fix chip styling in subset dropdown

* only set selected_has_subregions if exists

* only show multiselect toggle in imviz

* Apply suggestions from code review

Co-authored-by: P. L. Lim <2090236+pllim@users.noreply.github.com>

---------

Co-authored-by: Kyle Conroy <kyleconroy@gmail.com>
Co-authored-by: P. L. Lim <2090236+pllim@users.noreply.github.com>

Debug standalone build (spacetelescope#2441)

* Log jdaviz output for debugging

* Run workflow on debugging branch

* See if collecting data from jupyter-client will fix this, otherwise might need to downgrade

* Remove debugging stuff

MNT: Bump actions/checkout to v4

Enable workflow_dispatch for standalone

because it cannot be enabled outside of main apparently

[ci skip] [rtd skip]

EXP: Update workflow versions

Fix Mosviz slit overlay (spacetelescope#2434)

* Fix Mosviz slit overlay
by using polygon instead of forcing a rectangle without angle info.

Co-authored-by: Camilla Pacifici <camilla.pacifici@gmail.com>

* Off by one error in predicted PR num

---------

Co-authored-by: Camilla Pacifici <camilla.pacifici@gmail.com>

API access (hidden) to disable cubeviz movie UI (spacetelescope#2440)

* (hidden) API access to disable cubeviz movie UI
* default movie_enabled based on new app-setting server_is_remote
* test coverage

TST: Ignore ASDF warning about gwcs-1.0.0 schema
because gwcs dev and/or asdf-wcs-schemas 0.2.0 triggers the warning because the schema is no longer supported.
javerbukh pushed a commit to javerbukh/jdaviz that referenced this pull request Sep 18, 2023
fix event handling for choosing config from launcher

filepath fallback when object from config-detection fails to load

fix: support for notebook 7 (spacetelescope#2420)

Notebook 7 requires a different way to detect if the app runs in
a notebook context.

Fix explanation in markdown cell.

DOC: Footprints plugin API docs (spacetelescope#2426)

* build footprints API docs

* add code snippet in plugin docs

* fix syntax in API docs

---------

Co-authored-by: P. L. Lim <2090236+pllim@users.noreply.github.com>

prevent overwriting user-API methods (spacetelescope#2425)

fix default color for overlay when traitlet set by user

* for the FIRST overlay, the user could have set the color traitlet before the internal overlay object is created (which occurs as soon as the plugin is first shown).  In that case, we want to respect the user choice of color.

similar fixes for any other traitlet when plugin inactive

regression test

change log entry

fix API import of single region and overwriting existing entry

* along with regression testing

TST: Also pull in scikit-image dev
to get rid of incompatibility with numpy

Use new "true circle" tool from glue-jupyter (spacetelescope#2332)

* Use truecircle tool
from glue-viz/glue-jupyter#376

* MNT: Bump glue-jupyter minversion
that can use this new tool

* Add change log

* Fix line too long

* Fix change log verbiage

Co-authored-by: Kyle Conroy <kyleconroy@gmail.com>

---------

Co-authored-by: Kyle Conroy <kyleconroy@gmail.com>

Enable multiselect in subset plugin for recentering (spacetelescope#2430)

* Enable multiselect in subset plugin for recentering

* Fix bug with default text

* Remove unused import

* Fix bug in aperature photometry

* Address review comments

* Remove commented out code

* Add initial tests

* Fix bug when exiting multiselect and switching subsets

* Add documentation and update CHANGES file

* Remove print statement

* Add comment about recentering taking multiple iterations to docs

* fix chip styling in subset dropdown

* only set selected_has_subregions if exists

* only show multiselect toggle in imviz

* Apply suggestions from code review

Co-authored-by: P. L. Lim <2090236+pllim@users.noreply.github.com>

---------

Co-authored-by: Kyle Conroy <kyleconroy@gmail.com>
Co-authored-by: P. L. Lim <2090236+pllim@users.noreply.github.com>

Debug standalone build (spacetelescope#2441)

* Log jdaviz output for debugging

* Run workflow on debugging branch

* See if collecting data from jupyter-client will fix this, otherwise might need to downgrade

* Remove debugging stuff

MNT: Bump actions/checkout to v4

Enable workflow_dispatch for standalone

because it cannot be enabled outside of main apparently

[ci skip] [rtd skip]

EXP: Update workflow versions

Fix Mosviz slit overlay (spacetelescope#2434)

* Fix Mosviz slit overlay
by using polygon instead of forcing a rectangle without angle info.

Co-authored-by: Camilla Pacifici <camilla.pacifici@gmail.com>

* Off by one error in predicted PR num

---------

Co-authored-by: Camilla Pacifici <camilla.pacifici@gmail.com>

API access (hidden) to disable cubeviz movie UI (spacetelescope#2440)

* (hidden) API access to disable cubeviz movie UI
* default movie_enabled based on new app-setting server_is_remote
* test coverage

TST: Ignore ASDF warning about gwcs-1.0.0 schema
because gwcs dev and/or asdf-wcs-schemas 0.2.0 triggers the warning because the schema is no longer supported.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants