M-Labs
/
artiq
mirror of https://github.com/m-labs/artiq.git
2
0
Fork 1
Code Issues Projects Releases Wiki Activity

pxi6733: add pydaqmx dependency + controller in entry points

This commit is contained in:
Yann Sionneau 2015-04-21 12:54:07 +02:00 committed by Sebastien Bourdeauducq
parent a642a6bf01
commit 979cd14547
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
conda/artiq/meta.yaml
View File

@ -20,6 +20,7 @@ build:
- pdq2_client = artiq.frontend.pdq2_client:main - pdq2_client = artiq.frontend.pdq2_client:main
- pdq2_controller = artiq.frontend.pdq2_controller:main - pdq2_controller = artiq.frontend.pdq2_controller:main
- thorlabs_tcube_controller = artiq.frontend.thorlabs_tcube_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] - artiq_gui = artiq.frontend.artiq_gui:main # [not win]
requirements: requirements:
@ -39,6 +40,7 @@ requirements:
- sphinx-argparse - sphinx-argparse
- h5py - h5py
- dateutil - dateutil
- pydaqmx
- gbulb-artiq # [not win] - gbulb-artiq # [not win]
- cairoplot3-artiq # [not win] - cairoplot3-artiq # [not win]

3
setup.py
View File

@ -6,7 +6,7 @@ import os
requirements = [ requirements = [
"sphinx", "sphinx-argparse", "pyserial", "numpy", "scipy", "sphinx", "sphinx-argparse", "pyserial", "numpy", "scipy",
"python-dateutil", "prettytable", "h5py" "python-dateutil", "prettytable", "h5py", "pydaqmx"
] ]
scripts = [ scripts = [
@ -21,6 +21,7 @@ scripts = [
"pdq2_client=artiq.frontend.pdq2_client:main", "pdq2_client=artiq.frontend.pdq2_client:main",
"pdq2_controller=artiq.frontend.pdq2_controller:main", "pdq2_controller=artiq.frontend.pdq2_controller:main",
"thorlabs_tcube_controller=artiq.frontend.thorlabs_tcube_controller:main", "thorlabs_tcube_controller=artiq.frontend.thorlabs_tcube_controller:main",
"pxi6733_controller=artiq.frontend.pxi6733_controller:main"
] ]
if os.getenv("ARTIQ_GUI") == "1": if os.getenv("ARTIQ_GUI") == "1":