Revert "conda: work around conda/conda#1740."

This just made conda recurse forever. This reverts commit f384142.
m-labs · Oct 26, 2015 · 372bc90 · 372bc90
1 parent f384142
commit 372bc90
Showing 3 changed files with 0 additions and 3 deletions.
diff --git a/conda/artiq-kc705-nist_qc1/meta.yaml b/conda/artiq-kc705-nist_qc1/meta.yaml
@@ -19,7 +19,6 @@ requirements:
     - llvm-or1k
     - binutils-or1k-linux
   run:
-    - artiq
     - artiq {{ "{tag} py_{number}+git{hash}".format(tag=environ.get("GIT_DESCRIBE_TAG"), number=environ.get("GIT_DESCRIBE_NUMBER"), hash=environ.get("GIT_DESCRIBE_HASH")[1:]) if "GIT_DESCRIBE_TAG" in environ else "" }}
 
 about:

diff --git a/conda/artiq-kc705-nist_qc2/meta.yaml b/conda/artiq-kc705-nist_qc2/meta.yaml
@@ -19,7 +19,6 @@ requirements:
     - llvm-or1k
     - binutils-or1k-linux
   run:
-    - artiq
     - artiq {{ "{tag} py_{number}+git{hash}".format(tag=environ.get("GIT_DESCRIBE_TAG"), number=environ.get("GIT_DESCRIBE_NUMBER"), hash=environ.get("GIT_DESCRIBE_HASH")[1:]) if "GIT_DESCRIBE_TAG" in environ else "" }}
 
 about:

diff --git a/conda/artiq-pipistrello-nist_qc1/meta.yaml b/conda/artiq-pipistrello-nist_qc1/meta.yaml
@@ -19,7 +19,6 @@ requirements:
     - llvm-or1k
     - binutils-or1k-linux
   run:
-    - artiq
     - artiq {{ "{tag} py_{number}+git{hash}".format(tag=environ.get("GIT_DESCRIBE_TAG"), number=environ.get("GIT_DESCRIBE_NUMBER"), hash=environ.get("GIT_DESCRIBE_HASH")[1:]) if "GIT_DESCRIBE_TAG" in environ else "" }}
 
 about: