From b81b20caf8361c13f091ad85dcee31dd37d11d72 Mon Sep 17 00:00:00 2001
From: Sebastien Bourdeauducq <sb@m-labs.hk>
Date: Wed, 16 May 2018 16:25:44 +0800
Subject: [PATCH] conda: use h5py 2.8

For some reason, conda installs 2.7 by default, which causes messages such as:
/home/sb/miniconda3/envs/py35/lib/python3.5/site-packages/h5py/__init__.py:36: FutureWarning: Conversion of the second argument of issubdtype from `float` to `np.floating` is deprecated. In future, it will be treated as `np.float64 == np.dtype(float).type`.
---
 conda/artiq-dev/meta.yaml | 2 +-
 conda/artiq/meta.yaml     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/conda/artiq-dev/meta.yaml b/conda/artiq-dev/meta.yaml
index 62629e2a2..ec43ce29c 100644
--- a/conda/artiq-dev/meta.yaml
+++ b/conda/artiq-dev/meta.yaml
@@ -34,7 +34,7 @@ requirements:
     - sphinx-argparse
     - sphinxcontrib-wavedrom
     - sphinx_rtd_theme
-    - h5py
+    - h5py 2.8
     - python-dateutil
     - pyqt >=5.5
     - quamash
diff --git a/conda/artiq/meta.yaml b/conda/artiq/meta.yaml
index 192f79e40..8f699ec5b 100644
--- a/conda/artiq/meta.yaml
+++ b/conda/artiq/meta.yaml
@@ -37,7 +37,7 @@ requirements:
     - numpy
     - prettytable
     - asyncserial
-    - h5py
+    - h5py 2.8
     - python-dateutil
     - pyqt >=5.5
     - quamash