fix: make the recipe parsable and fix failing build (#910)

automerged PR by conda-forge/automerge-action
conda-forge · Nov 23, 2024 · b19add5 · b19add5
2 parents 9e135bc + 3e87e62
commit b19add5
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 41 deletions.
diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml
@@ -1,8 +1,8 @@
 cdt_name:
-- cos7
+- conda
 channel_sources:
 - conda-forge
 channel_targets:
 - conda-forge main
 docker_image:
-- quay.io/condaforge/linux-anvil-cos7-x86_64
+- quay.io/condaforge/linux-anvil-x86_64:alma9
diff --git a/.github/workflows/conda-build.yml b/.github/workflows/conda-build.yml
@@ -27,7 +27,7 @@ jobs:
             UPLOAD_PACKAGES: True
             os: ubuntu
             runs_on: ['ubuntu-latest']
-            DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64
+            DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9
     steps:
 
     - name: Checkout code

diff --git a/build-locally.py b/build-locally.py
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -32,9 +32,14 @@ requirements:
 
 test:
   commands:
-    {% for subdir in ("noarch", "linux-64", "linux-armv7l", "linux-ppc64le", "osx-64", "osx-arm64", "win-32", "win-64") %}
-    - test -e $PREFIX/{{ subdir }}/patch_instructions.json
-    {% endfor %}
+    - test -e $PREFIX/noarch/patch_instructions.json
+    - test -e $PREFIX/linux-64/patch_instructions.json
+    - test -e $PREFIX/linux-armv7l/patch_instructions.json
+    - test -e $PREFIX/linux-ppc64le/patch_instructions.json
+    - test -e $PREFIX/osx-64/patch_instructions.json
+    - test -e $PREFIX/osx-arm64/patch_instructions.json
+    - test -e $PREFIX/win-32/patch_instructions.json
+    - test -e $PREFIX/win-64/patch_instructions.json
 
 about:
   summary: generate tweaks to index metadata, hosted separately from anaconda.org index

diff --git a/recipe/patch_yaml_model.json b/recipe/patch_yaml_model.json
@@ -2008,65 +2008,37 @@
           "title": "Add Track Features"
         },
         "replace_depends": {
-          "allOf": [
-            {
-              "$ref": "#/$defs/_Old2New"
-            }
-          ],
+          "$ref": "#/$defs/_Old2New",
           "default": null,
           "description": "Replace 'old' dependency with 'new'."
         },
         "replace_constrains": {
-          "allOf": [
-            {
-              "$ref": "#/$defs/_Old2New"
-            }
-          ],
+          "$ref": "#/$defs/_Old2New",
           "default": null,
           "description": "Replace 'old' constraint with 'new'."
         },
         "rename_depends": {
-          "allOf": [
-            {
-              "$ref": "#/$defs/_Old2New"
-            }
-          ],
+          "$ref": "#/$defs/_Old2New",
           "default": null,
           "description": "Rename 'old' dependency as 'new', leaving version and build string fields untouched."
         },
         "rename_constrains": {
-          "allOf": [
-            {
-              "$ref": "#/$defs/_Old2New"
-            }
-          ],
+          "$ref": "#/$defs/_Old2New",
           "default": null,
           "description": "Rename 'old' constraint as 'new', leaving version and build string fields untouched."
         },
         "relax_exact_depends": {
-          "allOf": [
-            {
-              "$ref": "#/$defs/_Name_MaxPin_UpperBound"
-            }
-          ],
+          "$ref": "#/$defs/_Name_MaxPin_UpperBound",
           "default": null,
           "description": "Relax an exact pin (e.g., `blah ==1.0.0`) to something like blah `>=1.0.0` and possibly with `,<2.0a0` added if max_pin='x'"
         },
         "tighten_depends": {
-          "allOf": [
-            {
-              "$ref": "#/$defs/_Name_MaxPin_UpperBound"
-            }
-          ],
+          "$ref": "#/$defs/_Name_MaxPin_UpperBound",
           "default": null,
           "description": "Make a dependency version constraint stricter"
         },
         "loosen_depends": {
-          "allOf": [
-            {
-              "$ref": "#/$defs/_Name_MaxPin_UpperBound"
-            }
-          ],
+          "$ref": "#/$defs/_Name_MaxPin_UpperBound",
           "default": null,
           "description": "Make a dependency version constraint looser"
         }