From 5c6276c78f0527bfcd9c51e2ebfb0c8dde1c9b89 Mon Sep 17 00:00:00 2001 From: whitequark Date: Wed, 17 Jan 2018 02:09:53 +0000 Subject: [PATCH] conda: build artiq-$BOARD as noarch: python, like artiq itself. Fixes #894. --- conda/artiq-kasli-opticlock/meta.yaml | 2 +- conda/artiq-kc705-nist_clock/meta.yaml | 2 +- conda/artiq-kc705-nist_qc2/meta.yaml | 2 +- conda/artiq-sayma_amc-standalone/meta.yaml | 2 +- conda/artiq-sayma_rtm/meta.yaml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/conda/artiq-kasli-opticlock/meta.yaml b/conda/artiq-kasli-opticlock/meta.yaml index 57acc34f7..9d1367546 100644 --- a/conda/artiq-kasli-opticlock/meta.yaml +++ b/conda/artiq-kasli-opticlock/meta.yaml @@ -6,7 +6,7 @@ source: git_url: ../.. build: - noarch: generic + noarch: python ignore_prefix_files: True number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }} string: py_{{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}+git{{ environ.get("GIT_FULL_HASH", "")[:8] }} diff --git a/conda/artiq-kc705-nist_clock/meta.yaml b/conda/artiq-kc705-nist_clock/meta.yaml index f6aebd686..1db897a6d 100644 --- a/conda/artiq-kc705-nist_clock/meta.yaml +++ b/conda/artiq-kc705-nist_clock/meta.yaml @@ -6,7 +6,7 @@ source: git_url: ../.. build: - noarch: generic + noarch: python ignore_prefix_files: True number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }} string: py_{{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}+git{{ environ.get("GIT_FULL_HASH", "")[:8] }} diff --git a/conda/artiq-kc705-nist_qc2/meta.yaml b/conda/artiq-kc705-nist_qc2/meta.yaml index 7caf0169a..009f0b630 100644 --- a/conda/artiq-kc705-nist_qc2/meta.yaml +++ b/conda/artiq-kc705-nist_qc2/meta.yaml @@ -6,7 +6,7 @@ source: git_url: ../.. build: - noarch: generic + noarch: python ignore_prefix_files: True number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }} string: py_{{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}+git{{ environ.get("GIT_FULL_HASH", "")[:8] }} diff --git a/conda/artiq-sayma_amc-standalone/meta.yaml b/conda/artiq-sayma_amc-standalone/meta.yaml index 543c04bed..832f7326a 100644 --- a/conda/artiq-sayma_amc-standalone/meta.yaml +++ b/conda/artiq-sayma_amc-standalone/meta.yaml @@ -6,7 +6,7 @@ source: git_url: ../.. build: - noarch: generic + noarch: python ignore_prefix_files: True number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }} string: py_{{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}+git{{ environ.get("GIT_FULL_HASH", "")[:8] }} diff --git a/conda/artiq-sayma_rtm/meta.yaml b/conda/artiq-sayma_rtm/meta.yaml index a792ba439..0aed97148 100644 --- a/conda/artiq-sayma_rtm/meta.yaml +++ b/conda/artiq-sayma_rtm/meta.yaml @@ -6,7 +6,7 @@ source: git_url: ../.. build: - noarch: generic + noarch: python ignore_prefix_files: True number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }} string: py_{{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}+git{{ environ.get("GIT_FULL_HASH", "")[:8] }}