From 372bc906c1f2bb8f37d9c1452a746c6afa4fc653 Mon Sep 17 00:00:00 2001 From: whitequark Date: Mon, 26 Oct 2015 15:10:46 +0300 Subject: [PATCH] Revert "conda: work around conda/conda#1740." This just made conda recurse forever. This reverts commit f384142869279fabf39dca134e1f4ffc8c677870. --- conda/artiq-kc705-nist_qc1/meta.yaml | 1 - conda/artiq-kc705-nist_qc2/meta.yaml | 1 - conda/artiq-pipistrello-nist_qc1/meta.yaml | 1 - 3 files changed, 3 deletions(-) diff --git a/conda/artiq-kc705-nist_qc1/meta.yaml b/conda/artiq-kc705-nist_qc1/meta.yaml index 9a4bc6d45..0b19cbb9d 100644 --- 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 index 23af79a0c..6ab132bba 100644 --- 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 index ad31d31cc..64988647d 100644 --- 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: