From 979cd14547b67efd0a1357af7453143786698911 Mon Sep 17 00:00:00 2001
From: Yann Sionneau <ys@m-labs.hk>
Date: Tue, 21 Apr 2015 12:54:07 +0200
Subject: [PATCH] pxi6733: add pydaqmx dependency + controller in entry points

---
 conda/artiq/meta.yaml | 2 ++
 setup.py              | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/conda/artiq/meta.yaml b/conda/artiq/meta.yaml
index 79d735d56..72c7bfb2d 100644
--- a/conda/artiq/meta.yaml
+++ b/conda/artiq/meta.yaml
@@ -20,6 +20,7 @@ build:
         - pdq2_client = artiq.frontend.pdq2_client:main
         - pdq2_controller = artiq.frontend.pdq2_controller:main
         - thorlabs_tcube_controller = artiq.frontend.thorlabs_tcube_controller:main
+        - pxi6733_controller = artiq.frontend.pxi6733_controller:main
         - artiq_gui = artiq.frontend.artiq_gui:main # [not win]
 
 requirements:
@@ -39,6 +40,7 @@ requirements:
         - sphinx-argparse
         - h5py
         - dateutil
+        - pydaqmx
         - gbulb-artiq # [not win]
         - cairoplot3-artiq # [not win]
 
diff --git a/setup.py b/setup.py
index b2465cb6b..d37d9a237 100755
--- a/setup.py
+++ b/setup.py
@@ -6,7 +6,7 @@ import os
 
 requirements = [
     "sphinx", "sphinx-argparse", "pyserial", "numpy", "scipy",
-    "python-dateutil", "prettytable", "h5py"
+    "python-dateutil", "prettytable", "h5py", "pydaqmx"
 ]
 
 scripts = [
@@ -21,6 +21,7 @@ scripts = [
     "pdq2_client=artiq.frontend.pdq2_client:main",
     "pdq2_controller=artiq.frontend.pdq2_controller:main",
     "thorlabs_tcube_controller=artiq.frontend.thorlabs_tcube_controller:main",
+    "pxi6733_controller=artiq.frontend.pxi6733_controller:main"
 ]
 
 if os.getenv("ARTIQ_GUI") == "1":