BUG fix keys zipped with docker image

.github/workflows/tests.yml

@@ -1,7 +1,9 @@
 name: tests
 
 on:
-  push: null
+  push:
+    branches:
+      - master
   pull_request: null
 
 jobs:
@@ -37,5 +39,5 @@ jobs:
         run: |
           coverage combine || echo "no coverage data to combine maybe"
           coveralls
-        env: 
+        env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

conda_smithy/configure_feedstock.py

@@ -398,6 +398,14 @@ def finalize_config(config, platform, arch, forge_config):
             config["docker_image"] = [config["docker_image"][0]]
         else:
             config["docker_image"] = [forge_config["docker"]["fallback_image"]]
+
+        if "zip_keys" in config:
+            for ziplist in config["zip_keys"]:
+                if "docker_image" in ziplist:
+                    for key in ziplist:
+                        if key != "docker_image":
+                            config[key] = [config[key][0]]
+
     return config
 
 

news/cdt_name.rst

@@ -0,0 +1,25 @@
+**Added:**
+
+* <news item>
+
+**Changed:**
+
+* <news item>
+
+**Deprecated:**
+
+* <news item>
+
+**Removed:**
+
+* <news item>
+
+**Fixed:**
+
+* All keys zipped with ``docker_image`` are now handled properly.
+* Changed CI configuration to not run tests on ``push`` events to branches that
+  are not ``master``.
+
+**Security:**
+
+* <news item>

tests/recipes/cuda_docker_images/conda_build_config.yaml

@@ -1,18 +1,31 @@
+cdt_name:                               # [linux64]
+  - cos6                                # [linux64]
+  - cos6                                # [linux64]
+  - cos6                                # [linux64]
+  - cos6                                # [linux64]
+  - cos6                                # [linux64]
+  - cos7                                # [linux64]
+
 cuda_compiler:                          # [linux64]
   - nvcc                                # [linux64]
 cuda_compiler_version:                  # [linux64]
   - None                                # [linux64]
   - 9.2                                 # [linux64]
   - 10.0                                # [linux64]
   - 10.1                                # [linux64]
+  - 10.2                                # [linux64]
+  - 11.0                                # [linux64]
 
 docker_image:                           # [linux64]
   - condaforge/linux-anvil-comp7        # [linux64]
   - condaforge/linux-anvil-cuda:9.2     # [linux64]
   - condaforge/linux-anvil-cuda:10.0    # [linux64]
   - condaforge/linux-anvil-cuda:10.1    # [linux64]
+  - condaforge/linux-anvil-cuda:10.2    # [linux64]
+  - condaforge/linux-anvil-cuda:11.0    # [linux64]
 
 zip_keys:                               # [linux64]
   -                                     # [linux64]
+    - cdt_name                          # [linux64]
     - cuda_compiler_version             # [linux64]
     - docker_image                      # [linux64]

tests/recipes/multiple_docker_images/conda_build_config.yaml

@@ -2,3 +2,11 @@ docker_image:                           # [linux64]
   - pickme_a                            # [linux64]
   - pickme_b                            # [linux64]
   - pickme_c                            # [linux64]
+cdt_name:                               # [linux64]
+  - pickme_1                            # [linux64]
+  - pickme_2                            # [linux64]
+  - pickme_3                            # [linux64]
+zip_keys:                               # [linux64]
+  -                                     # [linux64]
+    - docker_image                      # [linux64]
+    - cdt_name                          # [linux64]

tests/test_cli.py

@@ -1,7 +1,6 @@
 import argparse
 import collections
 import os
-import pytest
 import subprocess
 import yaml
 import shutil
@@ -131,8 +130,8 @@ def test_init_cuda_docker_images(testing_workdir):
     # files, though - loops within outputs are contained in those top-level
     # configs.
     matrix_dir_len = len(os.listdir(matrix_dir))
-    assert matrix_dir_len == 5
-    for v in [None, "9.2", "10.0", "10.1"]:
+    assert matrix_dir_len == 7  # 6 docker images plus the README
+    for v in [None, "9.2", "10.0", "10.1", "10.2", "11.0"]:
         fn = os.path.join(
             matrix_dir, f"linux_64_cuda_compiler_version{v}.yaml"
         )
@@ -146,6 +145,10 @@ def test_init_cuda_docker_images(testing_workdir):
         else:
             docker_image = f"condaforge/linux-anvil-cuda:{v}"
         assert config["docker_image"] == [docker_image]
+        if v == "11.0":
+            assert config["cdt_name"] == ["cos7"]
+        else:
+            assert config["cdt_name"] == ["cos6"]
 
 
 def test_init_multiple_docker_images(testing_workdir):
@@ -186,6 +189,7 @@ def test_init_multiple_docker_images(testing_workdir):
     with open(fn) as fh:
         config = yaml.load(fh)
     assert config["docker_image"] == ["pickme_a"]
+    assert config["cdt_name"] == ["pickme_1"]
 
 
 def test_regenerate(py_recipe, testing_workdir):