srenblad
/
artiq
forked from M-Labs/artiq
1
0
Fork 0
Code Pull Requests Activity

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

This just made conda recurse forever.

This reverts commit f384142869.
This commit is contained in:
whitequark 2015-10-26 15:10:46 +03:00
parent f384142869
commit 372bc906c1
3 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
conda/artiq-kc705-nist_qc1/meta.yaml
View File

@ -19,7 +19,6 @@ requirements:
- llvm-or1k - llvm-or1k
- binutils-or1k-linux - binutils-or1k-linux
run: 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 "" }} - 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: about:

1
conda/artiq-kc705-nist_qc2/meta.yaml
View File

@ -19,7 +19,6 @@ requirements:
- llvm-or1k - llvm-or1k
- binutils-or1k-linux - binutils-or1k-linux
run: 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 "" }} - 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: about:

1
conda/artiq-pipistrello-nist_qc1/meta.yaml
View File

@ -19,7 +19,6 @@ requirements:
- llvm-or1k - llvm-or1k
- binutils-or1k-linux - binutils-or1k-linux
run: 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 "" }} - 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: about: