From e8d21adf303f9b82feddf60ae20f306e2940a0fe Mon Sep 17 00:00:00 2001 From: whitequark Date: Thu, 22 Feb 2018 12:55:47 +0000 Subject: [PATCH] conda: turn off binary prefix detection everywhere. This just adds garbage to logs and serves no useful purpose. --- conda/artiq-board/meta.yaml | 2 +- conda/artiq-sayma_rtm/meta.yaml | 2 +- conda/artiq/meta.yaml | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/conda/artiq-board/meta.yaml b/conda/artiq-board/meta.yaml index d2ce3bdcf..93aeb6ec6 100644 --- a/conda/artiq-board/meta.yaml +++ b/conda/artiq-board/meta.yaml @@ -7,12 +7,12 @@ source: build: noarch: python - ignore_prefix_files: True number: {{ environ["GIT_DESCRIBE_NUMBER"] }} string: {{ environ["GIT_DESCRIBE_NUMBER"] }}+git{{ environ["GIT_FULL_HASH"][:8] }} script_env: - ARTIQ_TARGET - ARTIQ_VARIANT + detect_binary_files_with_prefix: False outputs: - name: artiq-{{ environ["ARTIQ_TARGET"] }}-{{ environ["ARTIQ_VARIANT"] }} diff --git a/conda/artiq-sayma_rtm/meta.yaml b/conda/artiq-sayma_rtm/meta.yaml index 0ef011026..89d0c371d 100644 --- a/conda/artiq-sayma_rtm/meta.yaml +++ b/conda/artiq-sayma_rtm/meta.yaml @@ -7,9 +7,9 @@ source: build: noarch: python - ignore_prefix_files: True number: {{ environ["GIT_DESCRIBE_NUMBER"] }} string: {{ environ["GIT_DESCRIBE_NUMBER"] }}+git{{ environ["GIT_FULL_HASH"][:8] }} + detect_binary_files_with_prefix: False requirements: build: diff --git a/conda/artiq/meta.yaml b/conda/artiq/meta.yaml index bbbaba571..f538f4b45 100644 --- a/conda/artiq/meta.yaml +++ b/conda/artiq/meta.yaml @@ -19,6 +19,7 @@ build: {% endfor %} {% endfor %} script: $PYTHON setup.py install --no-compile --single-version-externally-managed --record=record.txt + detect_binary_files_with_prefix: False requirements: build: