Skip to content

Commit

Permalink
Merge pull request spacetelescope#3106 from meeseeksmachine/auto-back…
Browse files Browse the repository at this point in the history
…port-of-pr-3098-on-v3.10.x

Backport PR spacetelescope#3098 on branch v3.10.x (Fix for Imviz parser romandeps test after update to defaults)
  • Loading branch information
bmorris3 authored Jul 22, 2024
2 parents d61d749 + 9d090c7 commit 3f9ce14
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 5 deletions.
2 changes: 1 addition & 1 deletion docs/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ You also need the up-to-date tags for proper software versioning:
git rebase upstream/main
For the rest of contributing workflow, it is very similar to
`how to make a code contribution to astropy <https://docs.astropy.org/en/latest/development/workflow/development_workflow.html>`_,
`how to make a code contribution to astropy <https://docs.astropy.org/en/latest/development/quickstart.html>`_,
including setting up virtual environments, git basics, and more.

An exception is the change log; if your patch requires a change log, see ``CHANGES.rst`` for examples.
Expand Down
2 changes: 1 addition & 1 deletion docs/sample_notebooks.rst
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ These tools include three types of example Jupyter notebooks.

1. :gh-tree:`Sample Jdaviz Notebooks <notebooks>` that illustrate how to use Jdaviz and various API calls. These notebooks are located in the ``notebooks`` sub-directory of the git repository.

2. `Sample JDAT notebooks <https://jwst-docs.stsci.edu/jwst-post-pipeline-data-analysis/data-analysis-example-jupyter-notebooks>`_ that illustrate likely science workflows with data obtained from the various JWST instruments. These notebook incorporate ``astropy`` and Jdaviz when possible.
2. `Sample JDAT notebooks <https://jwst-docs.stsci.edu/jwst-post-pipeline-data-analysis#JWSTPostPipelineDataAnalysis-JWSTdataanalysis(JDAT)notebooks>`_ that illustrate likely science workflows with data obtained from the various JWST instruments. These notebooks incorporate ``astropy`` and Jdaviz when possible.

3. `Sample JWST pipeline notebooks <https://jwst-docs.stsci.edu/jwst-science-calibration-pipeline-overview/example-jupyter-notebooks-running-the-pipeline>`_ that illustrate how to run the JWST science calibration pipeline.
6 changes: 4 additions & 2 deletions jdaviz/configs/imviz/tests/test_parser_roman.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,20 @@

@pytest.mark.parametrize(
('ext_list', 'n_dc'),
[(None, 5),
[(None, 1),
('data', 1),
(['data', 'var_rnoise'], 2)])
def test_roman_wfi_ext_options(imviz_helper, roman_imagemodel, ext_list, n_dc):
imviz_helper.load_data(roman_imagemodel, data_label='roman_wfi_image_model', ext=ext_list)
dc = imviz_helper.app.data_collection
assert len(dc) == n_dc

if ext_list is None:
if ext_list == '*':
ext_list = ('data', 'dq', 'err', 'var_poisson', 'var_rnoise')
elif isinstance(ext_list, str):
ext_list = (ext_list, )
elif ext_list is None:
ext_list = ('data', )

for data, ext in zip(dc, ext_list):
assert data.label == f'roman_wfi_image_model[{ext.upper()}]'
Expand Down
2 changes: 1 addition & 1 deletion jdaviz/core/astrowidgets_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -395,7 +395,7 @@ def marker(self):
{'color': (1, 0, 0)}
The valid properties for Glue markers are listed at
https://docs.glueviz.org/en/stable/api/glue.core.visual.VisualAttributes.html
https://glue-core.readthedocs.io/en/latest/api/glue.core.visual.VisualAttributes.html
"""
return self._marker_dict
Expand Down

0 comments on commit 3f9ce14

Please sign in to comment.