From c529cefc891d851a52adc2cbe4df92450c1225bd Mon Sep 17 00:00:00 2001 From: whitequark Date: Fri, 27 Jan 2017 11:14:53 +0000 Subject: [PATCH] conda: bump llvmlite-artiq dependency. --- artiq/test/coredevice/test_rtio.py | 1 - conda/artiq-dev.yml | 2 +- conda/artiq/meta.yaml | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/artiq/test/coredevice/test_rtio.py b/artiq/test/coredevice/test_rtio.py index b8dc510c1..f79d4bff1 100644 --- a/artiq/test/coredevice/test_rtio.py +++ b/artiq/test/coredevice/test_rtio.py @@ -355,7 +355,6 @@ class CoredeviceTest(ExperimentCase): self.assertGreater(rate, 100*ns) self.assertLess(rate, 700*ns) - @unittest.skip("fails on CI for unknown reasons") def test_pulse_rate_dds(self): """Minimum interval for sustained DDS frequency switching""" self.execute(PulseRateDDS) diff --git a/conda/artiq-dev.yml b/conda/artiq-dev.yml index 4cbd1b350..18ca703b0 100644 --- a/conda/artiq-dev.yml +++ b/conda/artiq-dev.yml @@ -8,7 +8,7 @@ channels: dependencies: - python=3.5.2 - setuptools - - llvmlite-artiq=0.12.0.dev=py35_29 + - llvmlite-artiq=0.12.0.dev=py35_30 - lit - outputcheck - scipy diff --git a/conda/artiq/meta.yaml b/conda/artiq/meta.yaml index 923bb6706..9c3a841b3 100644 --- a/conda/artiq/meta.yaml +++ b/conda/artiq/meta.yaml @@ -18,7 +18,7 @@ requirements: - binutils-or1k-linux run: - python >=3.5.2 - - llvmlite-artiq 0.12.0.dev py35_29 + - llvmlite-artiq 0.12.0.dev py35_30 - lit - outputcheck - scipy