From b9aa86a6f8539c3f6e7a25b11f94588d86a7975f Mon Sep 17 00:00:00 2001
From: Theresa Mieslinger <41184617+tmieslinger@users.noreply.github.com>
Date: Fri, 11 Dec 2020 15:01:22 +0100
Subject: [PATCH] Dropsonde updates (#20)

* updated JOANNE to version 0.7.0 via IPFS
* add ipfsspec dependency
* add IPFS info to README
* link dropsonde dataset JOANNE also in the main catalog so that it
can be accessed by cat.dropsondes.JOANNE
---
 JOANNE/main.yaml | 12 ++++++++++++
 README.md        |  2 +-
 catalog.yml      | 19 +++++++------------
 dropsondes.yaml  | 11 +++++++++++
 requirements.txt |  1 +
 5 files changed, 32 insertions(+), 13 deletions(-)
 create mode 100644 JOANNE/main.yaml
 create mode 100644 dropsondes.yaml

diff --git a/JOANNE/main.yaml b/JOANNE/main.yaml
new file mode 100644
index 0000000..8f050f5
--- /dev/null
+++ b/JOANNE/main.yaml
@@ -0,0 +1,12 @@
+plugins:
+  source:
+    - module: intake_xarray
+    - module: ipfsspec
+
+sources:
+  level3:
+    args:
+      consolidated: true
+      urlpath: ipfs://QmWcdcXqTQhyfwtttqh2DT2BiEk67uXxuGdskghDpuXYUw
+    description: EUREC4A/ATOMIC JOANNE Level-3 gridded dropsonde dataset
+    driver: zarr
diff --git a/README.md b/README.md
index 3bb252b..201d4ac 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@ campaign](http://eurec4a.eu/) stored on: 1)
 University (via OPeNDAP) and 3) a zarr-backed
 object-store (using [minio](https://min.io)) at https://minio.denby.eu
 and 4) OPeNDAP access to files at
-[NOAA's Physical Sciences Lab](https://psl.noaa.gov/thredds/catalog/Datasets/ATOMIC/data/catalog.html).
+[NOAA's Physical Sciences Lab](https://psl.noaa.gov/thredds/catalog/Datasets/ATOMIC/data/catalog.html) and 5) data linked via [IPFS](https://ipfs.io/).
 
 
 ## Usage
diff --git a/catalog.yml b/catalog.yml
index 78a4b78..3c70854 100644
--- a/catalog.yml
+++ b/catalog.yml
@@ -21,18 +21,6 @@ sources:
     driver: intake.catalog.local.YAMLFileCatalog
     metadata: {}
 
-  dropsondes:
-    args:
-      consolidated: true
-      storage_options:
-        s3:
-          anon: true
-          client_kwargs:
-            endpoint_url: https://minio.denby.eu
-      urlpath: simplecache::s3://eurec4a-environment/dropsondes
-    description: JOANNE Gridded sounding dataset
-    driver: zarr
-
   halo:
     args:
       path: "{{CATALOG_DIR}}/halo/main.yaml"
@@ -60,3 +48,10 @@ sources:
       path: "{{CATALOG_DIR}}/swifts.yml"
     driver: intake.catalog.local.YAMLFileCatalog
     metadata: {}
+
+  dropsondes:
+    args:
+      path: "{{CATALOG_DIR}}/dropsondes.yaml"
+    description: 'Dropsonde dataset JOANNE.'
+    driver: intake.catalog.local.YAMLFileCatalog
+    metadata: {}
diff --git a/dropsondes.yaml b/dropsondes.yaml
new file mode 100644
index 0000000..4e901f7
--- /dev/null
+++ b/dropsondes.yaml
@@ -0,0 +1,11 @@
+plugins:
+  source:
+    - module: intake_xarray
+
+sources:
+  JOANNE:
+    args:
+      path: "{{CATALOG_DIR}}/JOANNE/main.yaml"
+    description: The EUREC4A dropsonde dataset JOANNE contains HALO and P3 dropsonde data.
+    driver: intake.catalog.local.YAMLFileCatalog
+    metadata: {}
diff --git a/requirements.txt b/requirements.txt
index 2e9f25d..b4ff600 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -6,5 +6,6 @@ zarr
 fsspec>=0.7.4
 pydap
 s3fs
+ipfsspec
 requests
 intake-xarray>=0.3.2