From 94c58551b2396811a932a3507bcbb2145f4d3ae3 Mon Sep 17 00:00:00 2001 From: Jean Connelly Date: Fri, 13 Jul 2018 12:43:12 -0400 Subject: [PATCH] Build the ska3* packages as noarch --- ska_conda/pkg_defs/ska3-core/meta.yaml | 3 +++ ska_conda/pkg_defs/ska3-dev/meta.yaml | 3 +++ ska_conda/pkg_defs/ska3-flight/meta.yaml | 3 +++ ska_conda/pkg_defs/ska3-pinned/meta.yaml | 3 +++ ska_conda/pkg_defs/ska3-template/meta.yaml | 7 ++----- ska_conda/pkg_defs/ska3_builder/meta.yaml | 1 + 6 files changed, 15 insertions(+), 5 deletions(-) diff --git a/ska_conda/pkg_defs/ska3-core/meta.yaml b/ska_conda/pkg_defs/ska3-core/meta.yaml index 61403be4..23a45548 100644 --- a/ska_conda/pkg_defs/ska3-core/meta.yaml +++ b/ska_conda/pkg_defs/ska3-core/meta.yaml @@ -2,6 +2,9 @@ package: name: ska3-core version: 0.1 +build: + noarch: generic + requirements: # Packages required to run the package. These are the dependencies that # will be installed automatically whenever the package is installed. diff --git a/ska_conda/pkg_defs/ska3-dev/meta.yaml b/ska_conda/pkg_defs/ska3-dev/meta.yaml index bc40e948..91091c18 100644 --- a/ska_conda/pkg_defs/ska3-dev/meta.yaml +++ b/ska_conda/pkg_defs/ska3-dev/meta.yaml @@ -2,6 +2,9 @@ package: name: ska3-dev version: 0.1 +build: + noarch: generic + requirements: # Packages required to run the package. These are the dependencies that # will be installed automatically whenever the package is installed. diff --git a/ska_conda/pkg_defs/ska3-flight/meta.yaml b/ska_conda/pkg_defs/ska3-flight/meta.yaml index 2fae1094..73aed7a9 100644 --- a/ska_conda/pkg_defs/ska3-flight/meta.yaml +++ b/ska_conda/pkg_defs/ska3-flight/meta.yaml @@ -2,6 +2,9 @@ package: name: ska3-flight version: 0.1 +build: + noarch: generic + requirements: # Packages required to run the package. These are the dependencies that # will be installed automatically whenever the package is installed. diff --git a/ska_conda/pkg_defs/ska3-pinned/meta.yaml b/ska_conda/pkg_defs/ska3-pinned/meta.yaml index 33c114ff..92a1bff3 100644 --- a/ska_conda/pkg_defs/ska3-pinned/meta.yaml +++ b/ska_conda/pkg_defs/ska3-pinned/meta.yaml @@ -2,6 +2,9 @@ package: name: ska3-pinned version: 0.1 +build: + noarch: generic + requirements: # Packages required to run the package. These are the dependencies that # will be installed automatically whenever the package is installed. diff --git a/ska_conda/pkg_defs/ska3-template/meta.yaml b/ska_conda/pkg_defs/ska3-template/meta.yaml index eb7131a8..34e1ca67 100644 --- a/ska_conda/pkg_defs/ska3-template/meta.yaml +++ b/ska_conda/pkg_defs/ska3-template/meta.yaml @@ -2,8 +2,5 @@ package: name: ska3-template version: 0.1 -requirements: - build: - - python - run: - - python +build: + noarch: generic diff --git a/ska_conda/pkg_defs/ska3_builder/meta.yaml b/ska_conda/pkg_defs/ska3_builder/meta.yaml index c321f4f8..2170a49e 100644 --- a/ska_conda/pkg_defs/ska3_builder/meta.yaml +++ b/ska_conda/pkg_defs/ska3_builder/meta.yaml @@ -3,6 +3,7 @@ package: version: {{ GIT_DESCRIBE_TAG }} build: + noarch: python script_env: - SKA_TOP_SRC_DIR