Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: m-labs/artiq
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 18106cc0142a
Choose a base ref
...
head repository: m-labs/artiq
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 541324258757
Choose a head ref
  • 3 commits
  • 5 files changed
  • 2 contributors

Commits on Apr 22, 2015

  1. conda: add recipe for pydaqmx

    fallen authored and sbourdeauducq committed Apr 22, 2015
    Copy the full SHA
    a642a6b View commit details
  2. Copy the full SHA
    979cd14 View commit details
  3. minor cleanups

    sbourdeauducq committed Apr 22, 2015
    Copy the full SHA
    5413242 View commit details
Showing with 30 additions and 1 deletion.
  1. +2 −0 conda/artiq/meta.yaml
  2. +2 −0 conda/pydaqmx/bld.bat
  3. +2 −0 conda/pydaqmx/build.sh
  4. +22 −0 conda/pydaqmx/meta.yaml
  5. +2 −1 setup.py
2 changes: 2 additions & 0 deletions conda/artiq/meta.yaml
Original file line number Diff line number Diff line change
@@ -19,6 +19,7 @@ build:
- novatech409b_controller = artiq.frontend.novatech409b_controller:main
- pdq2_client = artiq.frontend.pdq2_client:main
- pdq2_controller = artiq.frontend.pdq2_controller:main
- pxi6733_controller = artiq.frontend.pxi6733_controller:main
- thorlabs_tcube_controller = artiq.frontend.thorlabs_tcube_controller:main
- artiq_gui = artiq.frontend.artiq_gui:main # [not win]

@@ -39,6 +40,7 @@ requirements:
- sphinx-argparse
- h5py
- dateutil
- pydaqmx
- gbulb-artiq # [not win]
- cairoplot3-artiq # [not win]

2 changes: 2 additions & 0 deletions conda/pydaqmx/bld.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
"%PYTHON%" setup.py build
"%PYTHON%" setup.py install
2 changes: 2 additions & 0 deletions conda/pydaqmx/build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
$PYTHON setup.py build
$PYTHON setup.py install
22 changes: 22 additions & 0 deletions conda/pydaqmx/meta.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
package:
name: pydaqmx
version: "1.3.1"

source:
git_url: https://github.com/clade/pydaqmx
git_tag: master

build:
number: 0

requirements:
build:
- python
- setuptools
run:
- python

about:
home: http://pythonhosted.org/PyDAQmx/
license: BSD
summary: PyDAQmx allows users to use data acquisition hardware from National Instruments with Python. It provides an interface between the NIDAQmx driver and Python. The package works on Windows and Linux.'
3 changes: 2 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@

requirements = [
"sphinx", "sphinx-argparse", "pyserial", "numpy", "scipy",
"python-dateutil", "prettytable", "h5py"
"python-dateutil", "prettytable", "h5py", "pydaqmx"
]

scripts = [
@@ -20,6 +20,7 @@
"novatech409b_controller=artiq.frontend.novatech409b_controller:main",
"pdq2_client=artiq.frontend.pdq2_client:main",
"pdq2_controller=artiq.frontend.pdq2_controller:main",
"pxi6733_controller=artiq.frontend.pxi6733_controller:main"
"thorlabs_tcube_controller=artiq.frontend.thorlabs_tcube_controller:main",
]