Merge branch 'main' into v0.26.0

.pep8speaks.yml

@@ -4,7 +4,7 @@ message:  # Customize the comment made by the bot
     opened:  # Messages when a new PR is submitted
         header: "Hello @{name}, Thank you for submitting the Pull Request !"
                 # The keyword {name} is converted into the author's username
-        footer: "If you have not done so, please consult the [`jwql` Style Guide](https://github.com/spacetelescope/jwql/blob/master/style_guide/README.md)"
+        footer: "If you have not done so, please consult the [`jwql` Style Guide](https://github.com/spacetelescope/jwql/blob/main/style_guide/README.md)"
                 # The messages can be written as they would over GitHub
     updated:  # Messages when new commits are added to the PR
         header: "Hello @{name}, Thank you for updating !"

CODE_OF_CONDUCT.md

@@ -57,5 +57,5 @@ Project maintainers who do not follow or enforce the Code of Conduct in good fai
 This Code of Conduct is adapted from several existing code of conducts:
 
 - The [Contributor Covenant](http://contributor-covenant.org), version 1.4, available at [http://contributor-covenant.org/version/1/4](http://contributor-covenant.org/version/1/4/)
-- The [`stsci-package-template` code of conduct](https://github.com/spacetelescope/stsci-package-template/blob/master/CODE_OF_CONDUCT.md)
+- The [`stsci-package-template` code of conduct](https://github.com/spacetelescope/stsci-package-template/blob/main/CODE_OF_CONDUCT.md)
 - The [`scipy` code of conduct](https://docs.scipy.org/doc/scipy/reference/dev/conduct/code_of_conduct.html)

README.md

@@ -119,7 +119,7 @@ where (Bourque et al, 2020) is a citation of the Zenodo record available using t
 
 ## Software Contributions
 
-There are two current pages to review before you begin contributing to the `jwql` development. The first is our [style guide](https://github.com/spacetelescope/jwql/blob/master/style_guide/README.md) and the second is our [suggested git workflow page](https://github.com/spacetelescope/jwql/wiki/git-&-GitHub-workflow-for-contributing), which contains an in-depth explanation of the workflow.
+There are two current pages to review before you begin contributing to the `jwql` development. The first is our [style guide](https://github.com/spacetelescope/jwql/blob/main/style_guide/README.md) and the second is our [suggested git workflow page](https://github.com/spacetelescope/jwql/wiki/git-&-GitHub-workflow-for-contributing), which contains an in-depth explanation of the workflow.
 
 Contributors are also encouraged to check out the [Checklist for Contributors Guide](https://github.com/spacetelescope/jwql/wiki/Checklist-for-Contributors-and-Reviewers-of-Pull-Requests) to ensure the pull request contains all of the necessary changes.
 
@@ -147,7 +147,7 @@ Users who wish to report an issue or request a new feature may do so through the
 
 ## Code of Conduct
 
-Users and contributors to the `jwql` repository should adhere to the [Code of Conduct](https://github.com/spacetelescope/jwql/blob/master/CODE_OF_CONDUCT.md).  Any issues or violations pertaining to the Code of Conduct should be brought to the attention of a `jwql` team member or to `[email protected]`.
+Users and contributors to the `jwql` repository should adhere to the [Code of Conduct](https://github.com/spacetelescope/jwql/blob/main/CODE_OF_CONDUCT.md).  Any issues or violations pertaining to the Code of Conduct should be brought to the attention of a `jwql` team member or to `[email protected]`.
 
 ## Questions
 

WEBPAGE_TEMPLATE.md

@@ -13,7 +13,7 @@ The files and functions on the `webpage-template` branch that are designed to be
 | **URL entry template**  | list item that maps a URL to a view | `jwql/website/apps/jwql/urls.py` |
 | **data container function**  | python function that manipulates data for the view function | `website_template_data()` in `jwql/website/apps/jwql/data_containers.py` |
 
-*To learn more about topics like HTML templates, views, and URLs, see the [JWQL intro to web apps](https://github.com/spacetelescope/jwql/blob/master/presentations/JWQL_web_app.pdf).*
+*To learn more about topics like HTML templates, views, and URLs, see the [JWQL intro to web apps](https://github.com/spacetelescope/jwql/blob/main/presentations/JWQL_web_app.pdf).*
 
 
 

jwql/utils/monitor_template.py

@@ -46,7 +46,7 @@
 
     Any monitoring script written for ``jwql`` must adhere to the
     ``jwql`` style guide located at:
-    https://github.com/spacetelescope/jwql/blob/master/style_guide/README.md
+    https://github.com/spacetelescope/jwql/blob/main/style_guide/README.md
 """
 
 import os

jwql/website/apps/jwql/templates/engineering_database.html

@@ -12,7 +12,7 @@
     	<h2>Explore mnemonics in the DMS Engineering Database</h2><hr>
 
         <p align="justify">
-        This page allows interactive exploration of mnemonics stored in the Engineering Database (EDB) powered by MAST. Its use requires access privileges to the EDB (see <a href="https://outerspace.stsci.edu/pages/viewpage.action?spaceKey=JARI&title=JWST+Archive+Rehearsal+Instructions" target="_blank">instructions page</a>). Functionality is built on top of the <a href="https://astroquery.readthedocs.io/en/latest/mast/mast.html" target="_blank">astroquery.mast</a> module. Example programmatic code for EDB queries is available in this <a href="https://github.com/spacetelescope/jwql/tree/master/notebooks/edb_mnemonic_query.ipynb" target="_blank">Jupyter notebook</a>.
+        This page allows interactive exploration of mnemonics stored in the Engineering Database (EDB) powered by MAST. Its use requires access privileges to the EDB (see <a href="https://outerspace.stsci.edu/pages/viewpage.action?spaceKey=JARI&title=JWST+Archive+Rehearsal+Instructions" target="_blank">instructions page</a>). Functionality is built on top of the <a href="https://astroquery.readthedocs.io/en/latest/mast/mast.html" target="_blank">astroquery.mast</a> module. Example programmatic code for EDB queries is available in this <a href="https://github.com/spacetelescope/jwql/tree/main/notebooks/edb_mnemonic_query.ipynb" target="_blank">Jupyter notebook</a>.
         </p><br>
 
         <!--EDB Mnemonic Search-->

style_guide/accessibility_guidelines.md

@@ -1,7 +1,7 @@
 Guidelines for Accessible Development
 =====================================
 
-This document serves as a guide for developing accessible web pages and code within the `jwql` project.  Any contribution to the `jwql` code repository should be checked against these guidelines to ensure it meets all applicable standards. Any violations of these guidelines should be fixed before the code is committed to the `master` or `develop` branches. 
+This document serves as a guide for developing accessible web pages and code within the `jwql` project.  Any contribution to the `jwql` code repository should be checked against these guidelines to ensure it meets all applicable standards. Any violations of these guidelines should be fixed before the code is committed to the `main` or `develop` branches. 
 
 
 `jwql`-specific Guidelines

style_guide/logging_guide.md

@@ -1,7 +1,7 @@
 Logging Style Guide for `jwql` Instrument Monitors
 ==================================================
 
-This document serves as a style guide for adding logging to `jwql` instrument monitor software.  Any monitoring contribution to the `jwql` code repository should be checked against this guide to ensure proper usage of logging functions, and any violation of this and the style guide should be fixed before the code is committed to the `master` or `develop` branches.  Please refer to the accompanying [`example.py`](https://github.com/spacetelescope/jwql/blob/master/style_guide/example.py) script for a example code that abides by the style guide and the logging guide.
+This document serves as a style guide for adding logging to `jwql` instrument monitor software.  Any monitoring contribution to the `jwql` code repository should be checked against this guide to ensure proper usage of logging functions, and any violation of this and the style guide should be fixed before the code is committed to the `main` or `develop` branches.  Please refer to the accompanying [`example.py`](https://github.com/spacetelescope/jwql/blob/main/style_guide/example.py) script for a example code that abides by the style guide and the logging guide.
 
 
 Introduction