From 6bcb545a6b4307b78548ac39ef6aec8a749be0b1 Mon Sep 17 00:00:00 2001
From: Alex Lancaster <alexlancaster@users.noreply.github.com>
Date: Tue, 10 Oct 2023 19:35:09 -0400
Subject: [PATCH] metadata updates: authors, grants, affiliations

update Michael Mariani's affilation
add more grant metadata, still needs checking (#134)
add @jspaaks to `AUTHORS.rst`
---
 .zenodo.json | 19 ++++++++++++++++---
 AUTHORS.rst  |  5 ++++-
 CITATION.cff |  2 +-
 3 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/.zenodo.json b/.zenodo.json
index 0f4c500ff..323ca28f5 100644
--- a/.zenodo.json
+++ b/.zenodo.json
@@ -34,7 +34,7 @@
       "orcid": "0009-0009-2862-0467"
     },
     {
-      "affiliation": "University of Vermont",
+      "affiliation": "Mariani Systems LLC and University of Vermont",
       "name": "Mariani, Michael P.",
       "orcid": "0000-0001-5852-0517"
     },
@@ -86,7 +86,20 @@
     {
       "id": "10.13039/100000002::2R01GM035326-13A1",
       "_comment": "Population genetics of the HLA region - RO1 grant"
-    }
+    },
+    {
+      "id": "10.13039/100000002::N01AI40076-11-0-2",
+      "_comment": "BISC Support Contract HHSN266200400076C"
+    },
+    {
+      "code": "",
+      "title": "University of Vermont REACH 2014", 
+      "acronym": "REACH", 
+      "program": "REACH", 
+        "funder": {
+          "name": "University of Vermont", 
+       }
+    }      
   ],
   "related_identifiers": [
     {
@@ -129,5 +142,5 @@
   "notes": "  If you use this software, please cite both the software itself, as well as the the article Lancaster AK et al. (2007) 'PyPop update – a software pipeline for large-scale multilocus population genomics' Tissue Antigens 69(1):192-197 10.1111/j.1399-0039.2006.00769.x https://www.ncbi.nlm.nih.gov/pmc/articles/PMC4369784/",
   "title": "PyPop: Python for Population Genomics",
   "upload_type": "software",
-  "version": "v1.0.0-b1"
+  "version": "v1.0.0-b2"
 }
diff --git a/AUTHORS.rst b/AUTHORS.rst
index 258c3c28a..23ae3454b 100644
--- a/AUTHORS.rst
+++ b/AUTHORS.rst
@@ -33,7 +33,10 @@ Richard M. Single | `0000-0001-6054-6505 <https://orcid.org/0000-0001-6054-6505>
    module ``emhaplofreq``.  Contributed documentation and testing/reviewing PRs.
 
 Vanessa Sochat | `0000-0002-4387-3819 <https://orcid.org/0000-0002-4387-3819>`__ | Lawrence Livermore National Laboratory
-   Contributed to the Python 3 port. 
+   Contributed to the Python 3 port.
+
+Jurriaan H. Spaaks | `0000-0002-7064-4069 <https://orcid.org/0000-0002-7064-4069>`__ | Netherlands eScience Center
+   Contributed to Zenodo upload GitHub action 
 
 Owen Solberg  | `0000-0003-3060-9709 <https://orcid.org/0000-0003-3060-9709>`__ 
    Implemented filter modules, including conversion to allele name
diff --git a/CITATION.cff b/CITATION.cff
index 663697083..5d5db4d9c 100644
--- a/CITATION.cff
+++ b/CITATION.cff
@@ -41,7 +41,7 @@ authors:
   - family-names: Mariani
     given-names: Michael P.
     orcid: https://orcid.org/0000-0001-5852-0517
-    affiliation: University of Vermont
+    affiliation: Mariani Systems LLC and University of Vermont
   - family-names: Sochat
     given-names: Vanessa
     orcid: https://orcid.org/0000-0002-4387-3819