Display units (unit conversion refactor)

.readthedocs.yaml

@@ -1,11 +1,11 @@
 version: 2
 
 build:
-  os: ubuntu-20.04
+  os: ubuntu-22.04
   apt_packages:
     - graphviz
   tools:
-    python: "3.9"
+    python: "3.11"
   jobs:
     post_checkout:
       # Use `git log` to check if the latest commit contains "skip rtd" or "rtd skip",

CHANGES.rst

@@ -4,12 +4,22 @@
 New Features
 ------------
 
+- Introduce jdaviz.open to automatically detect the appropriate config and load data [#2221]
+
+- Add Simplify button to subset plugin to make composite spectral subsets more user
+  friendly. [#2237]
+
 Cubeviz
 ^^^^^^^
 
 Imviz
 ^^^^^
 
+- Added the ability to load DS9 region files (``.reg``) using the ``IMPORT DATA``
+  button. However, this only works after loading at least one image into Imviz. [#2201]
+
+- Added support for new ``CircularAnnulusROI`` subset from glue. [#2201]
+
 Mosviz
 ^^^^^^
 
@@ -22,6 +32,8 @@ Specviz2d
 API Changes
 -----------
 
+- Subset Plugin now respects the chosen display unit after using Unit Conversion. [#2195]
+
 Cubeviz
 ^^^^^^^
 
@@ -34,12 +46,16 @@ Mosviz
 Specviz
 ^^^^^^^
 
+* Re-enabled unit conversion support. [#2127]
+
 Specviz2d
 ^^^^^^^^^
 
 Bug Fixes
 ---------
 
+- Fixed wrong elliptical region translation in ``app.get_subsets()``. [#2244]
+
 Cubeviz
 ^^^^^^^
 
@@ -58,6 +74,9 @@ Specviz2d
 Other Changes and Additions
 ---------------------------
 
+- Gaussian smooth plugin excludes results from the gaussian smooth plugin from the input
+  dataset dropdown. [#2239]
+
 3.5.1 (unreleased)
 ==================
 

docs/_static/jdaviz.css

@@ -0,0 +1,74 @@
+/* Main page overview cards */
+
+.sd-card {
+  background: #fff;
+  border-radius: 0;
+  padding: 30px 10px 20px 10px;
+  margin: 10px 0px;
+}
+
+.sd-card .sd-card-header {
+  text-align: center;
+}
+
+.sd-card .sd-card-header .sd-card-text {
+  margin: 0px;
+}
+
+.sd-card .sd-card-img-top {
+  height: 52px;
+  width: 52px;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.sd-card .sd-card-header {
+  border: none;
+  background-color: white;
+  color: #150458 !important;
+  font-size: var(--pst-font-size-h5);
+  font-weight: bold;
+  padding: 2.5rem 0rem 0.5rem 0rem;
+}
+
+.sd-card .sd-card-footer {
+  border: none;
+  background-color: white;
+}
+
+.sd-card .sd-card-footer .sd-card-text {
+  max-width: 220px;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+/* Dark theme tweaking */
+html[data-theme=dark] .sd-card img[src*='.svg'] {
+    filter: invert(0.82) brightness(0.8) contrast(1.2);
+}
+
+/* Main index page overview cards */
+html[data-theme=dark] .sd-card {
+  background-color:var(--pst-color-background);
+}
+
+html[data-theme=dark] .sd-shadow-sm {
+    box-shadow: 0 .1rem 1rem rgba(250, 250, 250, .6) !important
+}
+
+html[data-theme=dark] .sd-card .sd-card-header {
+  background-color:var(--pst-color-background);
+  color: #150458 !important;
+}
+
+html[data-theme=dark] .sd-card .sd-card-footer {
+  background-color:var(--pst-color-background);
+}
+
+html[data-theme=dark] h1 {
+  color: var(--pst-color-primary);
+}
+
+html[data-theme=dark] h3 {
+  color: #0a6774;
+}

docs/conf.py

@@ -25,42 +25,32 @@
 # Thus, any C-extensions that are needed to build the documentation will *not*
 # be accessible, and the documentation will not build correctly.
 
-import os
 import sys
 import datetime
-import importlib.metadata as importlib_metadata
 
-from pathlib import Path
-
-if sys.version_info < (3, 11):
-    import tomli as tomllib
-else:
-    import tomllib
+from jdaviz import __version__
 
 try:
-    from sphinx_astropy.conf.v1 import *  # noqa
+    from sphinx_astropy.conf.v2 import *  # noqa
 except ImportError:
     print('ERROR: the documentation requires the sphinx-astropy package to be installed')
     sys.exit(1)
 
-with open(Path(__file__).parent.parent / "pyproject.toml", "rb") as configuration_file:
-    metadata = tomllib.load(configuration_file)
-
 # -- General configuration ----------------------------------------------------
 
 # By default, highlight as Python 3.
 highlight_language = 'python3'
 
 # If your documentation needs a minimal Sphinx version, state it here.
-#needs_sphinx = '1.2'
+# needs_sphinx = '1.2'
 
 # To perform a Sphinx version check that needs to be more specific than
 # major.minor, call `check_sphinx_version("x.y.z")` here.
 # check_sphinx_version("1.2.1")
 
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
-exclude_patterns.append('_templates')
+exclude_patterns.append('_templates')  # noqa: F405
 
 # This is added to the end of RST files - a good place to put substitutions to
 # be used globally.
@@ -134,13 +124,13 @@
 .. |icon-viewer-data-select| image:: /img/icons/viewer_data_select.png
   :scale: 30
   :alt: data select icon
-"""
+"""  # noqa: F405
 
 # -- Project information ------------------------------------------------------
 
 # This does not *have* to match the package name, but typically does
-project = metadata['project']['name']
-author = metadata['project']['authors'][0]['name']
+project = "jdaviz"
+author = "JDADF Developers"
 copyright = '{0}, {1}'.format(
     datetime.datetime.now().year, author)
 
@@ -149,15 +139,15 @@
 # built documents.
 
 # The full version, including alpha/beta/rc tags.
-release = importlib_metadata.version(project)
+release = __version__
+dev = "dev" in release
 # The short X.Y version.
 version = '.'.join(release.split('.')[:2])
 
-extensions += ['sphinx.ext.extlinks']
+extensions += ['sphinx.ext.extlinks', 'sphinx_design']  # noqa: F405
 gh_tag = f'v{release}' if '.dev' not in release else 'main'
 extlinks = {'gh-tree': (f'https://github.com/spacetelescope/jdaviz/tree/{gh_tag}/%s', '%s'),
-            'gh-notebook': (f'https://github.com/spacetelescope/jdaviz/blob/{gh_tag}/notebooks/%s.ipynb',
-                            '%s notebook')}
+            'gh-notebook': (f'https://github.com/spacetelescope/jdaviz/blob/{gh_tag}/notebooks/%s.ipynb', '%s notebook')}  # noqa: E501
 
 # -- Options for HTML output --------------------------------------------------
 
@@ -168,33 +158,54 @@
 # variables set in the global configuration. The variables set in the
 # global configuration are listed below, commented out.
 
+html_css_files = ["jdaviz.css"]
+html_copy_source = False
+
+html_theme_options.update(  # noqa: F405
+    {
+        "github_url": "https://github.com/spacetelescope/jdaviz",
+        "external_links": [
+            {"name": "Help Desk", "url": "http://jwsthelp.stsci.edu/"},
+        ],
+        "use_edit_page_button": True,
+    }
+)
+
+html_context = {
+    "default_mode": "light",
+    "to_be_indexed": ["stable", "latest"],
+    "is_development": dev,
+    "github_user": "spacetelescope",
+    "github_repo": "jdaviz",
+    "github_version": "main",
+    "doc_path": "docs",
+}
 
 # Add any paths that contain custom themes here, relative to this directory.
 # To use a different custom theme, add the directory containing the theme.
-#html_theme_path = []
+# html_theme_path = []
 
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes. To override the custom theme, set this to the
 # name of a builtin theme or the name of a custom theme in html_theme_path.
-#html_theme = None
 
-html_theme = "sphinx_rtd_theme"
+# html_theme = "sphinx_rtd_theme"
 
 # Custom sidebar templates, maps document names to template names.
-#html_sidebars = {}
+# html_sidebars = {}
 
 # The name of an image file (relative to this directory) to place at the top
 # of the sidebar.
-#html_logo = ''
+html_logo = 'logos/jdaviz.svg'
 
 # The name of an image file (within the static path) to use as favicon of the
 # docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
 # pixels large.
-#html_favicon = ''
+html_favicon = 'logos/specviz2d.ico'
 
 # If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
 # using the given strftime format.
-#html_last_updated_fmt = ''
+# html_last_updated_fmt = ''
 
 # The name for this set of Sphinx documents.  If None, it defaults to
 # "<project> v<release> documentation".
@@ -220,21 +231,6 @@
               [author], 1)]
 
 
-# -- Options for the edit_on_github extension ---------------------------------
-
-if metadata['tool']['build_sphinx']['edit_on_github']:
-
-    extensions += ['sphinx_astropy.ext.edit_on_github']
-
-    edit_on_github_project = metadata['tool']['build_sphinx']['github_project']
-    edit_on_github_branch = "main"
-
-    edit_on_github_source_root = ""
-    edit_on_github_doc_root = "docs"
-
-# -- Resolving issue number to links in changelog -----------------------------
-github_issues_url = 'https://github.com/{0}/issues/'.format(metadata['tool']['build_sphinx']['github_project'])
-
 # -- Turn on nitpicky mode for sphinx (to warn about references not found) ----
 nitpicky = True
 
@@ -263,15 +259,16 @@
     nitpick_ignore.append((dtype, target))
 
 # Extra intersphinx in addition to what is already in sphinx-astropy
-intersphinx_mapping['glue'] = ('http://docs.glueviz.org/en/stable/', None)
-intersphinx_mapping['glue_jupyter'] = ('https://glue-jupyter.readthedocs.io/en/stable/', None)
-intersphinx_mapping['regions'] = ('https://astropy-regions.readthedocs.io/en/stable/', None)
-intersphinx_mapping['skimage'] = ('https://scikit-image.org/docs/stable/', None)
-intersphinx_mapping['specutils'] = ('https://specutils.readthedocs.io/en/stable/', None)
-intersphinx_mapping['specreduce'] = ('https://specreduce.readthedocs.io/en/stable/', None)
-intersphinx_mapping['photutils'] = ('https://photutils.readthedocs.io/en/stable/', None)
-intersphinx_mapping['traitlets'] = ('https://traitlets.readthedocs.io/en/stable/', None)
-intersphinx_mapping['roman_datamodels'] = ('https://roman-datamodels.readthedocs.io/en/stable/', None)
+intersphinx_mapping.update({  # noqa: F405
+    'glue': ('http://docs.glueviz.org/en/stable/', None),
+    'glue_jupyter': ('https://glue-jupyter.readthedocs.io/en/stable/', None),
+    'photutils': ('https://photutils.readthedocs.io/en/stable/', None),
+    'regions': ('https://astropy-regions.readthedocs.io/en/stable/', None),
+    'roman_datamodels': ('https://roman-datamodels.readthedocs.io/en/stable/', None),
+    'skimage': ('https://scikit-image.org/docs/stable/', None),
+    'specreduce': ('https://specreduce.readthedocs.io/en/stable/', None),
+    'specutils': ('https://specutils.readthedocs.io/en/stable/', None),
+    'traitlets': ('https://traitlets.readthedocs.io/en/stable/', None)})
 
 # Options for linkcheck
 linkcheck_ignore = ['https://github.com/spacetelescope/jdaviz/settings/branches']