M-Labs
/
artiq
mirror of https://github.com/m-labs/artiq.git
2
0
Fork 2
Code Issues Projects Releases Wiki Activity

conda: simplify recipes. 

conda-build appears to no longer require the workaround with
environ.get("GIT_*", "") to work.
This commit is contained in:
whitequark 2018-02-22 12:45:22 +00:00
parent d4a10dcbd4
commit 8938b69559
4 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
conda/artiq-board/meta.yaml
View File

@ -1,6 +1,6 @@
package: package:
name: artiq-build name: artiq-board
version: {{ environ.get("GIT_DESCRIBE_TAG", "") }} version: {{ environ["GIT_DESCRIBE_TAG"] }}
source: source:
git_url: ../.. git_url: ../..
@ -8,20 +8,20 @@ source:
build: build:
noarch: python noarch: python
ignore_prefix_files: True ignore_prefix_files: True
number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }} number: {{ environ["GIT_DESCRIBE_NUMBER"] }}
string: py_{{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}+git{{ environ.get("GIT_FULL_HASH", "")[:8] }} string: {{ environ["GIT_DESCRIBE_NUMBER"] }}+git{{ environ["GIT_FULL_HASH"][:8] }}
script_env: script_env:
- ARTIQ_TARGET - ARTIQ_TARGET
- ARTIQ_VARIANT - ARTIQ_VARIANT
outputs: outputs:
- name: artiq-{{ environ.get("ARTIQ_TARGET") }}-{{ environ.get("ARTIQ_VARIANT") }} - name: artiq-{{ environ["ARTIQ_TARGET"] }}-{{ environ["ARTIQ_VARIANT"] }}
requirements: requirements:
build: build:
- artiq-dev {{ "{tag} py_{number}+git{hash}".format(tag=environ.get("GIT_DESCRIBE_TAG"), number=environ.get("GIT_DESCRIBE_NUMBER"), hash=environ.get("GIT_FULL_HASH", "")[:8]) if "GIT_DESCRIBE_TAG" in environ else "" }} - artiq-dev {{ "{tag} {number}+git{hash}".format(tag=environ["GIT_DESCRIBE_TAG"], number=environ["GIT_DESCRIBE_NUMBER"], hash=environ["GIT_FULL_HASH"][:8]) }}
run: run:
- artiq {{ "{tag} py_{number}+git{hash}".format(tag=environ.get("GIT_DESCRIBE_TAG"), number=environ.get("GIT_DESCRIBE_NUMBER"), hash=environ.get("GIT_FULL_HASH", "")[:8]) if "GIT_DESCRIBE_TAG" in environ else "" }} - artiq {{ "{tag} {number}+git{hash}".format(tag=environ["GIT_DESCRIBE_TAG"], number=environ["GIT_DESCRIBE_NUMBER"], hash=environ["GIT_FULL_HASH"][:8]) }}
about: about:
home: https://m-labs.hk/artiq home: https://m-labs.hk/artiq

6
conda/artiq-dev/meta.yaml
View File

@ -1,14 +1,14 @@
package: package:
name: artiq-dev name: artiq-dev
version: {{ environ.get("GIT_DESCRIBE_TAG", "") }} version: {{ environ["GIT_DESCRIBE_TAG"] }}
source: source:
git_url: ../.. git_url: ../..
build: build:
noarch: python noarch: python
number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }} number: {{ environ["GIT_DESCRIBE_NUMBER"] }}
string: py_{{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}+git{{ environ.get("GIT_FULL_HASH", "")[:8] }} string: {{ environ["GIT_DESCRIBE_NUMBER"] }}+git{{ environ["GIT_FULL_HASH"][:8] }}
requirements: requirements:
run: run:

10
conda/artiq-sayma_rtm/meta.yaml
View File

@ -1,6 +1,6 @@
package: package:
name: artiq-sayma_rtm name: artiq-sayma_rtm
version: {{ environ.get("GIT_DESCRIBE_TAG", "") }} version: {{ environ["GIT_DESCRIBE_TAG"] }}
source: source:
git_url: ../.. git_url: ../..
@ -8,14 +8,14 @@ source:
build: build:
noarch: python noarch: python
ignore_prefix_files: True ignore_prefix_files: True
number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }} number: {{ environ["GIT_DESCRIBE_NUMBER"] }}
string: py_{{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}+git{{ environ.get("GIT_FULL_HASH", "")[:8] }} string: {{ environ["GIT_DESCRIBE_NUMBER"] }}+git{{ environ["GIT_FULL_HASH"][:8] }}
requirements: requirements:
build: build:
- artiq-dev {{ "{tag} py_{number}+git{hash}".format(tag=environ.get("GIT_DESCRIBE_TAG"), number=environ.get("GIT_DESCRIBE_NUMBER"), hash=environ.get("GIT_FULL_HASH", "")[:8]) if "GIT_DESCRIBE_TAG" in environ else "" }} - artiq-dev {{ "{tag} {number}+git{hash}".format(tag=environ["GIT_DESCRIBE_TAG"], number=environ["GIT_DESCRIBE_NUMBER"], hash=environ["GIT_FULL_HASH"][:8]) }}
run: run:
- artiq {{ "{tag} py_{number}+git{hash}".format(tag=environ.get("GIT_DESCRIBE_TAG"), number=environ.get("GIT_DESCRIBE_NUMBER"), hash=environ.get("GIT_FULL_HASH", "")[:8]) if "GIT_DESCRIBE_TAG" in environ else "" }} - artiq {{ "{tag} {number}+git{hash}".format(tag=environ["GIT_DESCRIBE_TAG"], number=environ["GIT_DESCRIBE_NUMBER"], hash=environ["GIT_FULL_HASH"][:8]) }}
about: about:
home: https://m-labs.hk/artiq home: https://m-labs.hk/artiq

6
conda/artiq/meta.yaml
View File

@ -1,6 +1,6 @@
package: package:
name: artiq name: artiq
version: {{ environ.get("GIT_DESCRIBE_TAG", "") }} version: {{ environ["GIT_DESCRIBE_TAG"] }}
source: source:
git_url: ../.. git_url: ../..
@ -9,8 +9,8 @@ source:
build: build:
noarch: python noarch: python
number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }} number: {{ environ["GIT_DESCRIBE_NUMBER"] }}
string: py_{{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}+git{{ environ.get("GIT_FULL_HASH", "")[:8] }} string: {{ environ["GIT_DESCRIBE_NUMBER"] }}+git{{ environ["GIT_FULL_HASH"][:8] }}
entry_points: entry_points:
# NOTE: conda-build cannot distinguish between console and gui scripts # NOTE: conda-build cannot distinguish between console and gui scripts
{% for entry_point_type, entry_points in data.get("entry_points", dict()).items() -%} {% for entry_point_type, entry_points in data.get("entry_points", dict()).items() -%}