Merge Dev into Stretch Feature Branch

.github/ISSUE_TEMPLATE/4_Documentation_issue.md

@@ -1,5 +1,5 @@
 ---
-name: ⛔ Documentation Issue
+name: "\U0001F4D6 Documentation issue"
 about: Report issues or problems with documentation.
 
 ---

.github/pull_request_template.md

@@ -30,12 +30,14 @@
 <!--- Go over all the following points, and put an `x` in all the boxes that apply. -->
 <!--- If you're unsure about any of these, don't hesitate to ask. We're here to help! -->
 <!--- - [ ] My code follows the code style of this project. -->
-- [ ] I have read and agree to abide by the [Code of Conduct](https://usgs-astrogeology.github.io/code/)
+- [ ] I have read and agree to abide by the [Code of Conduct](https://github.com/USGS-Astrogeology/ISIS3/blob/dev/Code-Of-Conduct.md)
 - [ ] I have read the [**CONTRIBUTING**](https://github.com/USGS-Astrogeology/ISIS3/blob/dev/CONTRIBUTING.md) document.
 - [ ] My change requires a change to the documentation.
 - [ ] I have updated the documentation accordingly.
 - [ ] I have added tests to cover my changes.
 - [ ] All new and existing tests passed.
+- [ ] I have added myself to the [.zenodo.json](https://github.com/USGS-Astrogeology/ISIS3/blob/dev/.zenodo.json) document.
+- [ ] I have added any user impacting changes to the [CHANGELOG.md](https://github.com/USGS-Astrogeology/ISIS3/blob/dev/CHANGELOG.md) document.
 
 ## Licensing
 This project is mostly composed of free and unencumbered software released into the public domain, and we are unlikely to accept contributions that are not also released into the public domain. Somewhere near the top of each file should have these words:

.zenodo.json

@@ -0,0 +1,209 @@
+{
+  "creators": [
+    {
+      "affiliation": "United States Geological Survey, Astro Geology Science Center",
+      "name": "Laura, Jason",
+      "orcid": ""
+    },
+    {
+      "name": "Addair, Travis"
+    },
+    {
+      "affiliation": "United States Geological Survey, Astro Geology Science Center",
+      "name": "Adoram-Kershner, Lauren"
+    },
+    {
+      "name": "Alexandrov, Oleg"
+    },
+    {
+      "name": "Anderson, Jeff"
+    },
+    {
+      "name": "Annex, Andrew"
+    },
+    {
+      "name": "Austin, Christopher"
+    },
+    {
+      "name": "Backer, Jeanie"
+    },
+    {
+      "name": "Barrett, Janet"
+    },
+    {
+      "name": "Becker, Kris"
+    },
+    {
+      "affiliation": "United States Geological Survey, Astro Geology Science Center",
+      "name": "Berry, Kristin"
+    },
+    {
+      "name": "Beyer, Ross",
+      "affiliation": "SETI Institute and NASA Ames Research Center",
+      "orcid": "0000-0003-4503-3335"
+    },
+    {
+      "name": "Bonn, John"
+    },
+    {
+      "name": "Boyd, Mackenzie"
+    },
+    {
+      "name": "Brownsberger, Sasha"
+    },
+    {
+      "name": "Combs, Christopher"
+    },
+    {
+      "name": "Cook, Debbie"
+    },
+    {
+      "name": "Covington, Jeffrey"
+    },
+    {
+      "name": "Crough, James Alexander"
+    },
+    {
+      "name": "Curtis, Aaron"
+    },
+    {
+      "affiliation": "United States Geological Survey, Astro Geology Science Center",
+      "name": "Dunn, Evin"
+    },
+    {
+      "name": "Edmundson, Kenneth"
+    },
+    {
+      "name": "Eis, Mathew"
+    },
+    {
+      "name": "Gault, Eric"
+    },
+    {
+      "name": "Giroux, Aaron"
+    },
+    {
+      "affiliation": "United States Geological Survey, Astro Geology Science Center",
+      "name": "Giroux, Tim"
+    },
+    {
+      "name": "Goins, Adam"
+    },
+    {
+      "name": "Hahn, Marjorie"
+    },
+    {
+      "name": "Heyer, Eric"
+    },
+    {
+      "name": "Howington-Kraus, Elpitha"
+    },
+    {
+      "name": "Humphrey, Ian"
+    },
+    {
+      "name": "Lambright, Steven"
+    },
+    {
+      "name": "Lee, Ella Mae"
+    },
+    {
+      "affiliation": "United States Geological Survey, Astro Geology Science Center",
+      "name": "Lee, Kaitlyn"
+    },
+    {
+      "affiliation": "United States Geological Survey, Astro Geology Science Center",
+      "name": "Leggett, Rebecca"
+    },
+    {
+      "affiliation": "United States Geological Survey, Astro Geology Science Center",
+      "name": "Mapel, Jesse"
+    },
+    {
+      "name": "Milazzo, Moses"
+    },
+    {
+      "name": "Miller, David"
+    },
+    {
+      "name": "Neubauer, Cole"
+    },
+    {
+      "name": "Oyama, Kim"
+    },
+    {
+      "affiliation": "United States Geological Survey, Astro Geology Science Center",
+      "name": "Paquette, Adam"
+    },
+    {
+      "name": "Prasad, Sharmilla"
+    },
+    {
+      "name": "Rideout, Jai"
+    },
+    {
+      "affiliation": "United States Geological Survey, Astro Geology Science Center",
+      "name": "Rodriguez, Kelvin"
+    },
+    {
+      "name": "Rose, Curtis"
+    },
+    {
+      "name": "Saleh, Raad"
+    },
+    {
+      "affiliation": "United States Geological Survey, Astro Geology Science Center",
+      "name": "Sanders, Austin"
+    },
+    {
+      "name": "Seignovert, Benoit"
+    },
+    {
+      "name": "Shepard, Makayla"
+    },
+    {
+      "affiliation": "United States Geological Survey, Astro Geology Science Center",
+      "name": "Shinaman, John"
+    },
+    {
+      "affiliation": "United States Geological Survey, Astro Geology Science Center",
+      "name": "Sides, Stuart",
+      "orcid": ""
+    },
+    {
+      "name": "Silva, Victor"
+    },
+    {
+      "affiliation": "United States Geological Survey, Astro Geology Science Center",
+      "name": "Stamile, Amy"
+    },
+    {
+      "name": "Stapleton, Summer"
+    },
+    {
+      "name": "Stebenne, Andrew"
+    },
+    {
+      "name": "Sucharski, Tracie"
+    },
+    {
+      "name": "Thomas, Orrin"
+    },
+    {
+      "affiliation": "United States Geological Survey, Astro Geology Science Center",
+      "name": "Weller, Lynn"
+    },
+    {
+      "affiliation": "United States Geological Survey, Astro Geology Science Center",
+      "name": "Williams, Kaj"
+    },
+    {
+      "name": "Wilson, Tyler"
+    }
+  ],
+  "title": "Integrated Software for Imagers and Spectrometers",
+  "description": "A software library and set of tools to support ingestion, processing, and analysis of planetary science data.",
+  "license": "cc-zero",
+  "access_right": "open",
+  "upload_type": "software"
+}

AUTHORS.rst

@@ -1,67 +1,79 @@
-ISIS3 Contributors
-==================
+Integrated Software for Imagers and Spectrometers Contributors
+==============================================================
 
-- Aaron Curtis 
-- Adam Goins 
-- Adam Paquette 
-- Andrew Annex 
-- Andrew Stebenne 
-- Austin Sanders 
-- B. Seignovert 
-- Christopher Austin  
-- Christopher Ryan Combs Jr 
-- Cole Neubauer 
-- Curtis Rose 
-- David Miller 
-- Debbie Cook 
-- Ella Mae Lee 
-- Elpitha Howington-Kraus 
-- Eric Gault
-- Eric Hyer 
-- Evin Dunn 
-- Ian Humphrey 
-- Jac Shinaman 
-- Jai Rideout 
-- James Alexander Crough 
-- Janet Barrett 
-- Jason Laura 
-- Jeannie Backer 
-- Jeff Anderson 
-- Jeffrey Covington 
-- Jesse Mapel 
-- John Bonn 
-- Kaitlyn Lee 
-- Kaj E Williams  
-- Kelvin Rodriguez 
-- Ken Edmundson 
-- Kim Oyama  
-- Kris Becker 
-- Kristin Berry 
-- Lauren Adoram-Kershner  
-- Lynn Weller 
-- Mackenzie Boyd 
-- Makayla Shepherd 
-- Marjorie Hahn 
-- Mathew Eis 
-- Michael Aye 
-- Moses Milazzo 
-- Oleg Alexandrov 
-- Orrin Thomas 
-- Peter Giroux 
-- Raad A. Saleh 
-- Ross Beyer 
-- Sasha Brownsberger 
-- Sharmilla Prasad 
-- Steven Lambright 
-- Stuart Sides 
-- Summer Stapleton 
-- Tracie Sucharski 
-- Travis Addair 
-- Tyler Wilson 
-- Victor Silva 
+- Addair, Travis
+- Adoram-Kershner, Lauren (United States Geological Survey, Astro
+  Geology Science Center)
+- Alexandrov, Oleg
+- Anderson, Jeff
+- Annex, Andrew
+- Austin, Christopher
+- Backer, Jeanie
+- Barrett, Janet
+- Becker, Kris
+- Berry, Kristin (United States Geological Survey, Astro Geology
+  Science Center)
+- Beyer, Ross (SETI Institute and NASA Ames Research Center)
+- Bonn, John
+- Boyd, Mackenzie
+- Brownsberger, Sasha
+- Combs, Christopher
+- Cook, Debbie
+- Covington, Jeffrey
+- Crough, James Alexander
+- Curtis, Aaron
+- Dunn, Evin (United States Geological Survey, Astro Geology Science
+  Center)
+- Edmundson, Kenneth
+- Eis, Mathew
+- Gault, Eric
+- Giroux, Aaron
+- Giroux, Tim (United States Geological Survey, Astro Geology Science
+  Center)
+- Goins, Adam
+- Hahn, Marjorie
+- Heyer, Eric
+- Howington-Kraus, Elpitha
+- Humphrey, Ian
+- Lambright, Steven
+- Laura, Jason (United States Geological Survey, Astro Geology Science
+  Center)
+- Lee, Ella Mae
+- Lee, Kaitlyn (United States Geological Survey, Astro Geology Science
+  Center)
+- Mapel, Jesse (United States Geological Survey, Astro Geology Science
+  Center)
+- Milazzo, Moses
+- Miller, David
+- Neubauer, Cole
+- Oyama, Kim
+- Paquette, Adam (United States Geological Survey, Astro Geology
+  Science Center)
+- Prasad, Sharmilla
+- Rideout, Jai
+- Rodriguez, Kelvin (United States Geological Survey, Astro Geology
+  Science Center)
+- Rose, Curtis
+- Saleh, Raad
+- Sanders, Austin (United States Geological Survey, Astro Geology
+  Science Center)
+- Seignovert, Benoit
+- Shepard, Makayla
+- Shinaman, John (United States Geological Survey, Astro Geology
+  Science Center)
+- Sides, Stuart (United States Geological Survey, Astro Geology
+  Science Center)
+- Silva, Victor
+- Stapleton, Summer
+- Stebenne, Andrew
+- Sucharski, Tracie
+- Thomas, Orrin
+- Weller, Lynn (United States Geological Survey, Astro Geology Science
+  Center)
+- Williams, Kaj (United States Geological Survey, Astro Geology
+  Science Center)
+- Wilson, Tyler
 
 -----
-This list was initially generated using this bash command (additional manual edits are needed):
-
-git log --pretty="- %an %n" | sort | uniq -i >> AUTHORS.rst
-
+This list was generated from the .zenodo.json file by running the
+isis/scripts/zenodo_to_authors.py Python program.