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

conda: bump llvmlite-artiq dependency.

This commit is contained in:
whitequark 2017-01-27 11:14:53 +00:00
parent c659c2e551
commit c529cefc89
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
artiq/test/coredevice/test_rtio.py
View File

@ -355,7 +355,6 @@ class CoredeviceTest(ExperimentCase):
self.assertGreater(rate, 100*ns) self.assertGreater(rate, 100*ns)
self.assertLess(rate, 700*ns) self.assertLess(rate, 700*ns)
@unittest.skip("fails on CI for unknown reasons")
def test_pulse_rate_dds(self): def test_pulse_rate_dds(self):
"""Minimum interval for sustained DDS frequency switching""" """Minimum interval for sustained DDS frequency switching"""
self.execute(PulseRateDDS) self.execute(PulseRateDDS)

2
conda/artiq-dev.yml
View File

@ -8,7 +8,7 @@ channels:
dependencies: dependencies:
- python=3.5.2 - python=3.5.2
- setuptools - setuptools
- llvmlite-artiq=0.12.0.dev=py35_29 - llvmlite-artiq=0.12.0.dev=py35_30
- lit - lit
- outputcheck - outputcheck
- scipy - scipy

2
conda/artiq/meta.yaml
View File

@ -18,7 +18,7 @@ requirements:
- binutils-or1k-linux - binutils-or1k-linux
run: run:
- python >=3.5.2 - python >=3.5.2
- llvmlite-artiq 0.12.0.dev py35_29 - llvmlite-artiq 0.12.0.dev py35_30
- lit - lit
- outputcheck - outputcheck
- scipy - scipy