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

disable file imports when running on external server #3239

Merged
merged 2 commits into from
Oct 22, 2024

Conversation

kecnry
Copy link
Member

@kecnry kecnry commented Oct 21, 2024

Description

This pull request disables "From File..." options for importing catalogs and footprints from a file in cases where jdaviz is running on an external server.

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. Bugfix milestone also needs an accompanying backport label.
  • After merge, any internal documentations need updating (e.g., JIRA, Innerspace)?

@kecnry kecnry added bug Something isn't working 💤backport-v3.10.x on-merge: backport to v3.10.x 💤backport-v4.0.x on-merge: backport to v4.0.x labels Oct 21, 2024
@github-actions github-actions bot added imviz plugin Label for plugins common to multiple configurations labels Oct 21, 2024
@kecnry kecnry added this to the 4.0.1 milestone Oct 21, 2024
@kecnry kecnry force-pushed the disable-serverside-import branch from ca7d365 to d09fabd Compare October 21, 2024 18:09
@kecnry kecnry added the skip-changelog-checks changelog bot directive label Oct 21, 2024
@kecnry
Copy link
Member Author

kecnry commented Oct 21, 2024

NOTE: I'm not sure if the auto backport will still work for 3.10.x, if it does not, we can manually backport there (probably will be a changelog conflict anyways due to the 4.0.x changelog entry not existing).

@kecnry kecnry marked this pull request as ready for review October 21, 2024 18:20
@@ -76,6 +76,8 @@ Cubeviz
Imviz
^^^^^

- Remove "From File.." option when running on an external server. [#3239]
Copy link
Contributor

Choose a reason for hiding this comment

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

Actually do we want to advertise this?

Copy link
Member Author

Choose a reason for hiding this comment

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

it'll be in the PR history regardless 🤷‍♂️

Copy link
Contributor

Choose a reason for hiding this comment

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

If you insist on change log, I think also need entry under 4.0.x section.

Copy link
Member Author

Choose a reason for hiding this comment

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

there is (this one you're commenting on is 4.0.1, the other one is 3.10.4)

@pllim pllim modified the milestones: 4.0.1, 3.10.4 Oct 21, 2024
@pllim
Copy link
Contributor

pllim commented Oct 21, 2024

p.s. Are these the only ones we need to block? Any others?

@kecnry
Copy link
Member Author

kecnry commented Oct 21, 2024

these are all. @gibsongreen can follow the same pattern when implementing subset importing.

Copy link
Contributor

@pllim pllim left a comment

Choose a reason for hiding this comment

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

Okie dokie then. Feel free to merge. Thanks for the quick fix!

cc @havok2063

Copy link

codecov bot commented Oct 21, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 88.63%. Comparing base (f5b3a1d) to head (d09fabd).
Report is 1 commits behind head on main.

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #3239   +/-   ##
=======================================
  Coverage   88.62%   88.63%           
=======================================
  Files         125      125           
  Lines       18775    18779    +4     
=======================================
+ Hits        16640    16644    +4     
  Misses       2135     2135           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Copy link
Contributor

@gibsongreen gibsongreen left a comment

Choose a reason for hiding this comment

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

Changes to the plugins look good to me and I have this PR bookmarked for the future effort!

@kecnry kecnry merged commit f552510 into spacetelescope:main Oct 22, 2024
31 of 32 checks passed

This comment was marked as resolved.

meeseeksmachine pushed a commit to meeseeksmachine/jdaviz that referenced this pull request Oct 22, 2024
kecnry added a commit to kecnry/jdaviz that referenced this pull request Oct 22, 2024
…3239)

* disable file imports when running on external server
@kecnry kecnry deleted the disable-serverside-import branch October 22, 2024 14:06
kecnry added a commit that referenced this pull request Oct 22, 2024
* disable file imports when running on external server
kecnry added a commit that referenced this pull request Oct 22, 2024
rosteen pushed a commit to rosteen/jdaviz that referenced this pull request Oct 29, 2024
rosteen pushed a commit to rosteen/jdaviz that referenced this pull request Oct 29, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working imviz plugin Label for plugins common to multiple configurations Ready for final review skip-changelog-checks changelog bot directive 💤backport-v3.10.x on-merge: backport to v3.10.x 💤backport-v4.0.x on-merge: backport to v4.0.x
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants