m-labs · Apr 2, 2016 · Apr 2, 2016 · Apr 2, 2016 · Apr 2, 2016
Showing with 3 additions and 5 deletions.

+2 −2 RELEASE_NOTES.rst

+0 −1 artiq/test/lit/devirtualization/function.py

+0 −1 artiq/test/lit/devirtualization/method.py

+1 −1 conda/artiq/meta.yaml
diff --git a/RELEASE_NOTES.rst b/RELEASE_NOTES.rst
@@ -3,8 +3,8 @@
 Release notes
 =============
 
-unreleased
-----------
+1.0rc2
+------
 
 * The CPU speed in the pipistrello gateware has been reduced from 83 1/3 MHz to
   75 MHz. This will reduce the achievable sustained pulse rate and latency

diff --git a/artiq/test/lit/devirtualization/function.py b/artiq/test/lit/devirtualization/function.py
@@ -1,6 +1,5 @@
 # RUN: env ARTIQ_DUMP_IR=%t %python -m artiq.compiler.testbench.embedding +compile %s
 # RUN: OutputCheck %s --file-to-check=%t.txt
-# XFAIL: *
 
 from artiq.language.core import *
 from artiq.language.types import *

diff --git a/artiq/test/lit/devirtualization/method.py b/artiq/test/lit/devirtualization/method.py
@@ -1,6 +1,5 @@
 # RUN: env ARTIQ_DUMP_IR=%t %python -m artiq.compiler.testbench.embedding +compile %s 2>%t
 # RUN: OutputCheck %s --file-to-check=%t.txt
-# XFAIL: *
 
 from artiq.language.core import *
 from artiq.language.types import *

diff --git a/conda/artiq/meta.yaml b/conda/artiq/meta.yaml
@@ -37,7 +37,7 @@ requirements:
     - binutils-or1k-linux
   run:
     - python >=3.5.1
-    - llvmlite-artiq 0.5.1
+    - llvmlite-artiq 0.5.1 py35_17
     - scipy
     - numpy
     - prettytable