From d0d150d974a9386e16701c1bfcb0bb14846259fc Mon Sep 17 00:00:00 2001 From: whitequark Date: Mon, 26 Feb 2018 15:48:31 +0000 Subject: [PATCH] conda: add back py_ prefix in dependencies. --- conda/artiq-board/meta.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/conda/artiq-board/meta.yaml b/conda/artiq-board/meta.yaml index e182bd0d0..1bf0c1249 100644 --- a/conda/artiq-board/meta.yaml +++ b/conda/artiq-board/meta.yaml @@ -8,7 +8,7 @@ source: build: noarch: python number: {{ environ["GIT_DESCRIBE_NUMBER"] }} - string: {{ environ["GIT_DESCRIBE_NUMBER"] }}+git{{ environ["GIT_FULL_HASH"][:8] }} + string: py_{{ environ["GIT_DESCRIBE_NUMBER"] }}+git{{ environ["GIT_FULL_HASH"][:8] }} script_env: - ARTIQ_TARGET - ARTIQ_VARIANT @@ -19,9 +19,9 @@ outputs: requirements: build: - - artiq-dev {{ "{tag} {number}+git{hash}".format(tag=environ["GIT_DESCRIBE_TAG"], number=environ["GIT_DESCRIBE_NUMBER"], hash=environ["GIT_FULL_HASH"][:8]) }} + - artiq-dev {{ "{tag} py_{number}+git{hash}".format(tag=environ["GIT_DESCRIBE_TAG"], number=environ["GIT_DESCRIBE_NUMBER"], hash=environ["GIT_FULL_HASH"][:8]) }} run: - - artiq {{ "{tag} {number}+git{hash}".format(tag=environ["GIT_DESCRIBE_TAG"], number=environ["GIT_DESCRIBE_NUMBER"], hash=environ["GIT_FULL_HASH"][:8]) }} + - artiq {{ "{tag} py_{number}+git{hash}".format(tag=environ["GIT_DESCRIBE_TAG"], number=environ["GIT_DESCRIBE_NUMBER"], hash=environ["GIT_FULL_HASH"][:8]) }} about: home: https://m-labs.hk/artiq