From ea8e60a216016331e00be713083cbc49939f1573 Mon Sep 17 00:00:00 2001
From: Josh Moore <josh@openmicroscopy.org>
Date: Mon, 26 Sep 2022 13:42:17 +0200
Subject: [PATCH 1/4] 2.13.1: generate fixture/meta in conda tests

Following the pattern from #824, this generates the
fixture test if it does not exist so that tests will
pass on conda-forge.

see: https://github.com/conda-forge/zarr-feedstock/pull/65
---
 docs/release.rst           | 16 ++++++++++++----
 fixture/meta/.zarray       |  2 +-
 zarr/tests/test_storage.py |  6 ++++++
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/docs/release.rst b/docs/release.rst
index e963b5b509..1bad7f4c5a 100644
--- a/docs/release.rst
+++ b/docs/release.rst
@@ -10,16 +10,24 @@ Release notes
 
     Unreleased
     ----------
+..
+    # .. warning::
+    #    Pre-release! Use :command:`pip install --pre zarr` to evaluate this release.
+
+.. _release_2.13.1:
+
+2.13.1
+------
+
+* Fix test failure on conda-forge builds.
+  By :user:`Josh Moore <joshmoore>`; see `zarr-feedstock#65
+  <https://github.com/conda-forge/zarr-feedstock/pull/65>`.
 
 .. _release_2.13.0:
 
 2.13.0
 ------
 
-..
-    # .. warning::
-    #    Pre-release! Use :command:`pip install --pre zarr` to evaluate this release.
-
 Major changes
 ~~~~~~~~~~~~~
 
diff --git a/fixture/meta/.zarray b/fixture/meta/.zarray
index f265bb0674..d1acce7665 100644
--- a/fixture/meta/.zarray
+++ b/fixture/meta/.zarray
@@ -20,4 +20,4 @@
         2
     ],
     "zarr_format": 2
-}
+}
\ No newline at end of file
diff --git a/zarr/tests/test_storage.py b/zarr/tests/test_storage.py
index d0f518dd05..2bea0da3e7 100644
--- a/zarr/tests/test_storage.py
+++ b/zarr/tests/test_storage.py
@@ -2563,5 +2563,11 @@ def test_normalize_store_arg(tmpdir):
 
 def test_meta_prefix_6853():
 
+    meta = pathlib.Path(zarr.__file__).resolve().parent.parent / "fixture" / "meta"
+    if not meta.exists():
+        s = DirectoryStore(str(meta), dimension_separator=".")
+        a = zarr.open(store=s, mode="w", shape=(2, 2), dtype="<i8")
+        a[:] = [[1, 2], [3, 4]]
+
     fixture = group(store=DirectoryStore('fixture'))
     assert list(fixture.arrays())

From 51f850b1aee60010c470f861eea20f67650de601 Mon Sep 17 00:00:00 2001
From: Josh Moore <josh@openmicroscopy.org>
Date: Mon, 26 Sep 2022 13:48:54 +0200
Subject: [PATCH 2/4] Fix rst link

---
 docs/release.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/release.rst b/docs/release.rst
index 1bad7f4c5a..ebc25e3627 100644
--- a/docs/release.rst
+++ b/docs/release.rst
@@ -20,8 +20,8 @@ Release notes
 ------
 
 * Fix test failure on conda-forge builds.
-  By :user:`Josh Moore <joshmoore>`; see `zarr-feedstock#65
-  <https://github.com/conda-forge/zarr-feedstock/pull/65>`.
+  By :user:`Josh Moore <joshmoore>`; see
+  `zarr-feedstock#65 <https://github.com/conda-forge/zarr-feedstock/pull/65>`.
 
 .. _release_2.13.0:
 

From 7b460568161f318b862b25adaddd3e2595bcc68b Mon Sep 17 00:00:00 2001
From: Josh Moore <josh@openmicroscopy.org>
Date: Mon, 26 Sep 2022 13:50:44 +0200
Subject: [PATCH 3/4] Fix rst link again

---
 docs/release.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/release.rst b/docs/release.rst
index ebc25e3627..8488aa01ed 100644
--- a/docs/release.rst
+++ b/docs/release.rst
@@ -21,7 +21,7 @@ Release notes
 
 * Fix test failure on conda-forge builds.
   By :user:`Josh Moore <joshmoore>`; see
-  `zarr-feedstock#65 <https://github.com/conda-forge/zarr-feedstock/pull/65>`.
+  `zarr-feedstock#65 <https://github.com/conda-forge/zarr-feedstock/pull/65>`_.
 
 .. _release_2.13.0:
 

From 37c1f9aaa133fcc77f7e2521646688e39d0a8816 Mon Sep 17 00:00:00 2001
From: Josh Moore <josh@openmicroscopy.org>
Date: Mon, 26 Sep 2022 14:07:53 +0200
Subject: [PATCH 4/4] Add pragma: no cover

---
 zarr/tests/test_storage.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zarr/tests/test_storage.py b/zarr/tests/test_storage.py
index 2bea0da3e7..d61216927c 100644
--- a/zarr/tests/test_storage.py
+++ b/zarr/tests/test_storage.py
@@ -2564,7 +2564,7 @@ def test_normalize_store_arg(tmpdir):
 def test_meta_prefix_6853():
 
     meta = pathlib.Path(zarr.__file__).resolve().parent.parent / "fixture" / "meta"
-    if not meta.exists():
+    if not meta.exists():   # pragma: no cover
         s = DirectoryStore(str(meta), dimension_separator=".")
         a = zarr.open(store=s, mode="w", shape=(2, 2), dtype="<i8")
         a[:] = [[1, 2], [3, 4]]