From 28090d19d982dfcd5b4b71ac2c92ccefaed32517 Mon Sep 17 00:00:00 2001 From: Matt Fisher Date: Thu, 7 Dec 2023 14:27:14 -0700 Subject: [PATCH 1/4] Change CITATION.cff to fix Zenodo Currently, Zenodo is unhappy with array values for `license`. This violates the CFF spec. The related GitHub issue is added as a comment in this commit. --- CITATION.cff | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CITATION.cff b/CITATION.cff index 890c5a89..ff196bab 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -12,7 +12,10 @@ contact: - name: "NSIDC" email: "nsidc@nsidc.org" type: "software" -license: ["MIT"] +# NOTE: The CFF spec says `license` can be a list, but Zenodo is currently not +# accepting lists for this key: +# https://github.com/zenodo/zenodo/issues/2515 +license: "MIT" keywords: - "data" - "Remote sensing" From 837558c3434e06e2240aa49925c12d66d09d5e53 Mon Sep 17 00:00:00 2001 From: Matt Fisher Date: Thu, 7 Dec 2023 14:29:28 -0700 Subject: [PATCH 2/4] Add pre-commit hook to validate CITATION.cff --- .pre-commit-config.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index a58408e8..891d4132 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -22,3 +22,9 @@ repos: hooks: - id: prettier types_or: [yaml] + - repo: https://github.com/citation-file-format/cffconvert + rev: "054bda51dbe278b3e86f27c890e3f3ac877d616c" + hooks: + - id: "validate-cff" + args: + - "--verbose" From 7b931ef82aed51ed73ce1a63a16756ca14d39c8e Mon Sep 17 00:00:00 2001 From: Matt Fisher Date: Thu, 7 Dec 2023 14:34:31 -0700 Subject: [PATCH 3/4] Fix linting errors in CITATION.cff There was an extra slash in Chris' author.orcid entry. --- CITATION.cff | 96 ++++++++++++++++++++++++++++------------------------ 1 file changed, 51 insertions(+), 45 deletions(-) diff --git a/CITATION.cff b/CITATION.cff index ff196bab..f03f941c 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -4,7 +4,7 @@ message: | Authors are listed in alphabetical order. title: "earthaccess" -doi: "https://doi.org/10.5281/zenodo.8365009" +doi: "10.5281/zenodo.8365009" abstract: "Python Library for NASA Earthdata APIs" contact: - name: "The earthaccess community" @@ -30,51 +30,57 @@ version: "0.8.2" date-released: "2023-12-06" authors: -- family-names: "Barrett" - given-names: "Andrew" - orcid: "https://orcid.org/0000-0003-4394-5445" - website: "https://github.com/andypbarrett" -- family-names: "Battisto" - given-names: "Chris" - orcid: "https://orcid.org//0000-0002-9608-3634" - website: "https://github.com/battistowx" -- family-names: "Bourbeau" - given-names: "James" - orcid: "https://orcid.org/0000-0003-2164-7789" - website: "https://github.com/jrbourbeau" -- family-names: "Fisher" - given-names: "Matt" - orcid: "https://orcid.org/0000-0003-3260-5445" - website: "https://mfisher87.github.io/" -- family-names: "Kaufman" - given-names: "Daniel" - orcid: "https://orcid.org/0000-0002-1487-7298" - website: "https://github.com/danielfromearth" -- family-names: "Kennedy" - given-names: "Joseph" - orcid: "https://orcid.org/0000-0002-9348-693X" - website: "https://github.com/jhkennedy" -- family-names: "Lopez" - given-names: "Luis" - orcid: "https://orcid.org/0000-0003-4896-3263" - website: "https://github.com/betolink" -- family-names: "Lowndes" - given-names: "Julia" - orcid: "https://orcid.org/0000-0003-1682-3872" - website: "https://github.com/jules32" -- family-names: "Scheick" - given-names: "Jessica" - orcid: "https://orcid.org/0000-0002-3421-4459" - website: "https://github.com/JessicaS11" -- family-names: "Steiker" - given-names: "Amy" - orcid: "https://orcid.org/0000-0002-3039-0260" - website: "https://github.com/asteiker" + - family-names: "Barrett" + given-names: "Andrew" + orcid: "https://orcid.org/0000-0003-4394-5445" + website: "https://github.com/andypbarrett" + - family-names: "Battisto" + given-names: "Chris" + orcid: "https://orcid.org/0000-0002-9608-3634" + website: "https://github.com/battistowx" + - family-names: "Bourbeau" + given-names: "James" + orcid: "https://orcid.org/0000-0003-2164-7789" + website: "https://github.com/jrbourbeau" + - family-names: "Fisher" + given-names: "Matt" + orcid: "https://orcid.org/0000-0003-3260-5445" + website: "https://mfisher87.github.io/" + - family-names: "Kaufman" + given-names: "Daniel" + orcid: "https://orcid.org/0000-0002-1487-7298" + website: "https://github.com/danielfromearth" + - family-names: "Kennedy" + given-names: "Joseph" + orcid: "https://orcid.org/0000-0002-9348-693X" + website: "https://github.com/jhkennedy" + - family-names: "Lopez" + given-names: "Luis" + orcid: "https://orcid.org/0000-0003-4896-3263" + website: "https://github.com/betolink" + - family-names: "Lowndes" + given-names: "Julia" + orcid: "https://orcid.org/0000-0003-1682-3872" + website: "https://github.com/jules32" + - family-names: "Scheick" + given-names: "Jessica" + orcid: "https://orcid.org/0000-0002-3421-4459" + website: "https://github.com/JessicaS11" + - family-names: "Steiker" + given-names: "Amy" + orcid: "https://orcid.org/0000-0002-3039-0260" + website: "https://github.com/asteiker" references: -- type: "grant" - institution: - name: "National Aeronautics and Space Administration" - number: "20-TWSC20-2-0003" + - type: "grant" + title: "Openscapes: Supporting better science for future us" + institution: + name: "National Aeronautics and Space Administration" + number: "20-TWSC20-2-0003" + authors: + - family-names: "Lowndes" + given-names: "Julia" + orcid: "https://orcid.org/0000-0003-1682-3872" + website: "https://github.com/jules32" From d9994e175f38757a08101fbcb07433bf2b7dbc24 Mon Sep 17 00:00:00 2001 From: Matt Fisher Date: Thu, 7 Dec 2023 16:43:18 -0700 Subject: [PATCH 4/4] Add Erin Robinson author to grant reference --- CITATION.cff | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CITATION.cff b/CITATION.cff index f03f941c..dac47250 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -84,3 +84,7 @@ references: given-names: "Julia" orcid: "https://orcid.org/0000-0003-1682-3872" website: "https://github.com/jules32" + - family-names: "Robinson" + given-names: "Erin" + orcid: "https://orcid.org/0000-0001-9998-0114" + website: "https://erinrobinson.info/"