From 8cf62bf85c0735e2179942e796b13be961da5347 Mon Sep 17 00:00:00 2001
From: Josh Moore <josh@openmicroscopy.org>
Date: Wed, 3 May 2023 09:09:56 +0200
Subject: [PATCH 1/2] Revert "Deactivate Zarr dev build"

This reverts commit e89e79bdba9a1395263fcb3dfb1f5c8892c7dd9c.
---
 .github/workflows/zarr-dev.yml | 47 ++++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 .github/workflows/zarr-dev.yml

diff --git a/.github/workflows/zarr-dev.yml b/.github/workflows/zarr-dev.yml
new file mode 100644
index 00000000..6f6be385
--- /dev/null
+++ b/.github/workflows/zarr-dev.yml
@@ -0,0 +1,47 @@
+---
+name: Build using Zarr development branch
+
+on: [push, pull_request]
+
+jobs:
+  test:
+    name: ${{ matrix.platform }} ${{ matrix.python-version }}
+    runs-on: ${{ matrix.platform }}
+
+    strategy:
+      fail-fast: true
+      matrix:
+        platform: [ubuntu-latest]
+        python-version: [3.8]
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Setup miniconda
+        uses: conda-incubator/setup-miniconda@v2
+        with:
+          auto-update-conda: true
+          channels: conda-forge,ome
+          environment-file: environment.yml
+          python-version: ${{ matrix.python-version }}
+
+      - name: Install Linux dependencies
+        if: matrix.platform == 'ubuntu-latest'
+        run: |
+          sudo apt install libxkbcommon-x11-0
+          /sbin/start-stop-daemon --start --quiet \
+            --pidfile /tmp/custom_xvfb_99.pid --make-pidfile \
+            --background --exec /usr/bin/Xvfb \
+            -- :99 -screen 0 1920x1200x24 -ac +extension GLX
+
+      - name: Install dependencies
+        shell: bash -l {0}
+        run: |
+          python -m pip install --upgrade pip wheel pytest tox
+          python -m pip install \
+          git+https://github.com/zarr-developers/zarr-python.git
+
+      - name: Run pytest
+        shell: bash -l {0}
+        run: pytest

From fa5021ce1c1c558a0cb482682fb67f8a02fdcf2e Mon Sep 17 00:00:00 2001
From: Josh Moore <josh@openmicroscopy.org>
Date: Wed, 3 May 2023 09:11:59 +0200
Subject: [PATCH 2/2] Update zarr-dev.yml from #174

---
 .github/workflows/zarr-dev.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/zarr-dev.yml b/.github/workflows/zarr-dev.yml
index 6f6be385..b2ed02c2 100644
--- a/.github/workflows/zarr-dev.yml
+++ b/.github/workflows/zarr-dev.yml
@@ -38,7 +38,7 @@ jobs:
       - name: Install dependencies
         shell: bash -l {0}
         run: |
-          python -m pip install --upgrade pip wheel pytest tox
+          python -m pip install -r requirements/requirements-dev.txt
           python -m pip install \
           git+https://github.com/zarr-developers/zarr-python.git