From 8938b6955921a70906bb217dbca8ac23e95bf612 Mon Sep 17 00:00:00 2001
From: whitequark <whitequark@whitequark.org>
Date: Thu, 22 Feb 2018 12:45:22 +0000
Subject: [PATCH] conda: simplify recipes.

conda-build appears to no longer require the workaround with
environ.get("GIT_*", "") to work.
---
 conda/artiq-board/meta.yaml     | 14 +++++++-------
 conda/artiq-dev/meta.yaml       |  6 +++---
 conda/artiq-sayma_rtm/meta.yaml | 10 +++++-----
 conda/artiq/meta.yaml           |  6 +++---
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/conda/artiq-board/meta.yaml b/conda/artiq-board/meta.yaml
index 8662e90f5..d2ce3bdcf 100644
--- a/conda/artiq-board/meta.yaml
+++ b/conda/artiq-board/meta.yaml
@@ -1,6 +1,6 @@
 package:
-  name: artiq-build
-  version: {{ environ.get("GIT_DESCRIBE_TAG", "") }}
+  name: artiq-board
+  version: {{ environ["GIT_DESCRIBE_TAG"] }}
 
 source:
   git_url: ../..
@@ -8,20 +8,20 @@ source:
 build:
   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] }}
+  number: {{ environ["GIT_DESCRIBE_NUMBER"] }}
+  string: {{ environ["GIT_DESCRIBE_NUMBER"] }}+git{{ environ["GIT_FULL_HASH"][:8] }}
   script_env:
     - ARTIQ_TARGET
     - ARTIQ_VARIANT
 
 outputs:
-  - name: artiq-{{ environ.get("ARTIQ_TARGET") }}-{{ environ.get("ARTIQ_VARIANT") }}
+  - name: artiq-{{ environ["ARTIQ_TARGET"] }}-{{ environ["ARTIQ_VARIANT"] }}
 
 requirements:
   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:
-    - 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:
   home: https://m-labs.hk/artiq
diff --git a/conda/artiq-dev/meta.yaml b/conda/artiq-dev/meta.yaml
index 47e4deae4..a3eebabac 100644
--- a/conda/artiq-dev/meta.yaml
+++ b/conda/artiq-dev/meta.yaml
@@ -1,14 +1,14 @@
 package:
   name: artiq-dev
-  version: {{ environ.get("GIT_DESCRIBE_TAG", "") }}
+  version: {{ environ["GIT_DESCRIBE_TAG"] }}
 
 source:
   git_url: ../..
 
 build:
   noarch: python
-  number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
-  string: py_{{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}+git{{ environ.get("GIT_FULL_HASH", "")[:8] }}
+  number: {{ environ["GIT_DESCRIBE_NUMBER"] }}
+  string: {{ environ["GIT_DESCRIBE_NUMBER"] }}+git{{ environ["GIT_FULL_HASH"][:8] }}
 
 requirements:
   run:
diff --git a/conda/artiq-sayma_rtm/meta.yaml b/conda/artiq-sayma_rtm/meta.yaml
index 0aed97148..0ef011026 100644
--- a/conda/artiq-sayma_rtm/meta.yaml
+++ b/conda/artiq-sayma_rtm/meta.yaml
@@ -1,6 +1,6 @@
 package:
   name: artiq-sayma_rtm
-  version: {{ environ.get("GIT_DESCRIBE_TAG", "") }}
+  version: {{ environ["GIT_DESCRIBE_TAG"] }}
 
 source:
   git_url: ../..
@@ -8,14 +8,14 @@ source:
 build:
   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] }}
+  number: {{ environ["GIT_DESCRIBE_NUMBER"] }}
+  string: {{ environ["GIT_DESCRIBE_NUMBER"] }}+git{{ environ["GIT_FULL_HASH"][:8] }}
 
 requirements:
   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:
-    - 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:
   home: https://m-labs.hk/artiq
diff --git a/conda/artiq/meta.yaml b/conda/artiq/meta.yaml
index 727c07130..bbbaba571 100644
--- a/conda/artiq/meta.yaml
+++ b/conda/artiq/meta.yaml
@@ -1,6 +1,6 @@
 package:
   name: artiq
-  version: {{ environ.get("GIT_DESCRIBE_TAG", "") }}
+  version: {{ environ["GIT_DESCRIBE_TAG"] }}
 
 source:
   git_url: ../..
@@ -9,8 +9,8 @@ source:
 
 build:
   noarch: python
-  number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
-  string: py_{{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}+git{{ environ.get("GIT_FULL_HASH", "")[:8] }}
+  number: {{ environ["GIT_DESCRIBE_NUMBER"] }}
+  string: {{ environ["GIT_DESCRIBE_NUMBER"] }}+git{{ environ["GIT_FULL_HASH"][:8] }}
   entry_points:
     # NOTE: conda-build cannot distinguish between console and gui scripts
     {% for entry_point_type, entry_points in data.get("entry_points", dict()).items() -%}