From 78d99cd8fd87c1bbde5f22f563a78e2d36dca168 Mon Sep 17 00:00:00 2001
From: Metin San <metinisan@gmail.com>
Date: Fri, 1 Jul 2022 11:46:08 +0200
Subject: [PATCH 1/3] Proposal to add ZodiPy to affiliated packages

---
 affiliated/registry.json | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/affiliated/registry.json b/affiliated/registry.json
index c3c73997..fa0bffa6 100644
--- a/affiliated/registry.json
+++ b/affiliated/registry.json
@@ -1,5 +1,23 @@
 {
     "packages": [
+        {
+            "name": "ZodiPy",
+            "maintainer": "Metin San <metin.san@astro.uio.no>",
+            "stable": true,
+            "home_url": "https://cosmoglobe.github.io/zodipy/",
+            "repo_url": "https://github.com/cosmoglobe/zodipy",
+            "pypi_name": "zodipy",
+            "description": "ZodiPy is a Python tool for simulating the zodiacal emission that a solar system observer sees, either in the form of timestreams or binned HEALPix maps.",
+            "review": {
+               "functionality": "To be filled out by the reviewer",
+               "ecointegration": "To be filled out by the reviewer",
+               "documentation": "To be filled out by the reviewer",
+               "testing": "To be filled out by the reviewer",
+               "devstatus": "To be filled out by the reviewer",
+               "python3": "To be filled out by the reviewer",
+               "last-updated": "To be filled out by the reviewer"
+            }
+          },
         {
           "name": "BayesicFitting",
           "maintainer": "Do Kester <dokester@home.nl> and Migo Mueller",

From 2fa27036a9b94f84995c7f231c2f7367911ed6a7 Mon Sep 17 00:00:00 2001
From: Metin San <metinisan@gmail.com>
Date: Mon, 4 Jul 2022 16:04:45 +0200
Subject: [PATCH 2/3] Update affiliated/registry.json

Co-authored-by: Derek Homeier <dhomeie@gwdg.de>
---
 affiliated/registry.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/affiliated/registry.json b/affiliated/registry.json
index fa0bffa6..99518c79 100644
--- a/affiliated/registry.json
+++ b/affiliated/registry.json
@@ -8,6 +8,7 @@
             "repo_url": "https://github.com/cosmoglobe/zodipy",
             "pypi_name": "zodipy",
             "description": "ZodiPy is a Python tool for simulating the zodiacal emission that a solar system observer sees, either in the form of timestreams or binned HEALPix maps.",
+            "coordinated": false,
             "review": {
                "functionality": "To be filled out by the reviewer",
                "ecointegration": "To be filled out by the reviewer",

From a7fbb496a5bb237438716cce8ff020991ed6210b Mon Sep 17 00:00:00 2001
From: Derek Homeier <709020+dhomeier@users.noreply.github.com>
Date: Wed, 6 Mar 2024 01:42:14 +0100
Subject: [PATCH 3/3] Resolve merge conflict

---
 affiliated/registry.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/affiliated/registry.json b/affiliated/registry.json
index 0dd3c460..e79cc5b9 100644
--- a/affiliated/registry.json
+++ b/affiliated/registry.json
@@ -19,6 +19,7 @@
                "last-updated": "2024-02-24"
             }
           },
+          {
           "name": "regularizePSF",
           "maintainer": "Marcus Hughes <marcus.hughes@swri.org>",
           "stable": true,