Merge pull request #101 from minrk/rerender-error

remove workaround for unused jinja vars
conda-forge · Sep 27, 2024 · 9bd33b7 · 9bd33b7
2 parents d187d6d + 4ff24f2
commit 9bd33b7
Show file tree

Hide file tree

Showing 14 changed files with 42 additions and 46 deletions.
diff --git a/.ci_support/linux_64_mpi_typeconda.yaml b/.ci_support/linux_64_mpi_typeconda.yaml
@@ -1,7 +1,7 @@
 c_compiler:
 - gcc
 c_compiler_version:
-- '12'
+- '13'
 c_stdlib:
 - sysroot
 c_stdlib_version:
@@ -15,13 +15,13 @@ channel_targets:
 cxx_compiler:
 - gxx
 cxx_compiler_version:
-- '12'
+- '13'
 docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
 fortran_compiler:
 - gfortran
 fortran_compiler_version:
-- '12'
+- '13'
 mpi_type:
 - conda
 target_platform:

diff --git a/.ci_support/linux_64_mpi_typeexternal.yaml b/.ci_support/linux_64_mpi_typeexternal.yaml
@@ -1,7 +1,7 @@
 c_compiler:
 - gcc
 c_compiler_version:
-- '12'
+- '13'
 c_stdlib:
 - sysroot
 c_stdlib_version:
@@ -15,13 +15,13 @@ channel_targets:
 cxx_compiler:
 - gxx
 cxx_compiler_version:
-- '12'
+- '13'
 docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
 fortran_compiler:
 - gfortran
 fortran_compiler_version:
-- '12'
+- '13'
 mpi_type:
 - external
 target_platform:

diff --git a/.ci_support/linux_aarch64_mpi_typeconda.yaml b/.ci_support/linux_aarch64_mpi_typeconda.yaml
@@ -3,7 +3,7 @@ BUILD:
 c_compiler:
 - gcc
 c_compiler_version:
-- '12'
+- '13'
 c_stdlib:
 - sysroot
 c_stdlib_version:
@@ -19,13 +19,13 @@ channel_targets:
 cxx_compiler:
 - gxx
 cxx_compiler_version:
-- '12'
+- '13'
 docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
 fortran_compiler:
 - gfortran
 fortran_compiler_version:
-- '12'
+- '13'
 mpi_type:
 - conda
 target_platform:

diff --git a/.ci_support/linux_aarch64_mpi_typeexternal.yaml b/.ci_support/linux_aarch64_mpi_typeexternal.yaml
@@ -3,7 +3,7 @@ BUILD:
 c_compiler:
 - gcc
 c_compiler_version:
-- '12'
+- '13'
 c_stdlib:
 - sysroot
 c_stdlib_version:
@@ -19,13 +19,13 @@ channel_targets:
 cxx_compiler:
 - gxx
 cxx_compiler_version:
-- '12'
+- '13'
 docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
 fortran_compiler:
 - gfortran
 fortran_compiler_version:
-- '12'
+- '13'
 mpi_type:
 - external
 target_platform:

diff --git a/.ci_support/linux_ppc64le_mpi_typeconda.yaml b/.ci_support/linux_ppc64le_mpi_typeconda.yaml
@@ -1,7 +1,7 @@
 c_compiler:
 - gcc
 c_compiler_version:
-- '12'
+- '13'
 c_stdlib:
 - sysroot
 c_stdlib_version:
@@ -15,13 +15,13 @@ channel_targets:
 cxx_compiler:
 - gxx
 cxx_compiler_version:
-- '12'
+- '13'
 docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
 fortran_compiler:
 - gfortran
 fortran_compiler_version:
-- '12'
+- '13'
 mpi_type:
 - conda
 target_platform:

diff --git a/.ci_support/linux_ppc64le_mpi_typeexternal.yaml b/.ci_support/linux_ppc64le_mpi_typeexternal.yaml
@@ -1,7 +1,7 @@
 c_compiler:
 - gcc
 c_compiler_version:
-- '12'
+- '13'
 c_stdlib:
 - sysroot
 c_stdlib_version:
@@ -15,13 +15,13 @@ channel_targets:
 cxx_compiler:
 - gxx
 cxx_compiler_version:
-- '12'
+- '13'
 docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
 fortran_compiler:
 - gfortran
 fortran_compiler_version:
-- '12'
+- '13'
 mpi_type:
 - external
 target_platform:

diff --git a/.ci_support/osx_64_mpi_typeconda.yaml b/.ci_support/osx_64_mpi_typeconda.yaml
@@ -5,7 +5,7 @@ MACOSX_SDK_VERSION:
 c_compiler:
 - clang
 c_compiler_version:
-- '16'
+- '17'
 c_stdlib:
 - macosx_deployment_target
 c_stdlib_version:
@@ -17,11 +17,11 @@ channel_targets:
 cxx_compiler:
 - clangxx
 cxx_compiler_version:
-- '16'
+- '17'
 fortran_compiler:
 - gfortran
 fortran_compiler_version:
-- '12'
+- '13'
 macos_machine:
 - x86_64-apple-darwin13.4.0
 mpi_type:

diff --git a/.ci_support/osx_64_mpi_typeexternal.yaml b/.ci_support/osx_64_mpi_typeexternal.yaml
@@ -5,7 +5,7 @@ MACOSX_SDK_VERSION:
 c_compiler:
 - clang
 c_compiler_version:
-- '16'
+- '17'
 c_stdlib:
 - macosx_deployment_target
 c_stdlib_version:
@@ -17,11 +17,11 @@ channel_targets:
 cxx_compiler:
 - clangxx
 cxx_compiler_version:
-- '16'
+- '17'
 fortran_compiler:
 - gfortran
 fortran_compiler_version:
-- '12'
+- '13'
 macos_machine:
 - x86_64-apple-darwin13.4.0
 mpi_type:

diff --git a/.ci_support/osx_arm64_mpi_typeconda.yaml b/.ci_support/osx_arm64_mpi_typeconda.yaml
@@ -5,7 +5,7 @@ MACOSX_SDK_VERSION:
 c_compiler:
 - clang
 c_compiler_version:
-- '16'
+- '17'
 c_stdlib:
 - macosx_deployment_target
 c_stdlib_version:
@@ -17,11 +17,11 @@ channel_targets:
 cxx_compiler:
 - clangxx
 cxx_compiler_version:
-- '16'
+- '17'
 fortran_compiler:
 - gfortran
 fortran_compiler_version:
-- '12'
+- '13'
 macos_machine:
 - arm64-apple-darwin20.0.0
 mpi_type:

diff --git a/.ci_support/osx_arm64_mpi_typeexternal.yaml b/.ci_support/osx_arm64_mpi_typeexternal.yaml
@@ -5,7 +5,7 @@ MACOSX_SDK_VERSION:
 c_compiler:
 - clang
 c_compiler_version:
-- '16'
+- '17'
 c_stdlib:
 - macosx_deployment_target
 c_stdlib_version:
@@ -17,11 +17,11 @@ channel_targets:
 cxx_compiler:
 - clangxx
 cxx_compiler_version:
-- '16'
+- '17'
 fortran_compiler:
 - gfortran
 fortran_compiler_version:
-- '12'
+- '13'
 macos_machine:
 - arm64-apple-darwin20.0.0
 mpi_type:

diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh
diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh
diff --git a/build-locally.py b/build-locally.py
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -66,10 +66,7 @@ outputs:
  - name: mpich-mpicc
  build:
  script:
- - echo 'ok' # [not osx]
- # make CONDA_BUILD_SYSROOT a 'used variable'
- # so that conda-build knows to pass it to the test env
- - echo "{{ CONDA_BUILD_SYSROOT }}" # [osx]
+ - echo 'ok'
  requirements:
  run:
  - {{ pin_subpackage('mpich', exact=True) }}
@@ -84,10 +81,7 @@ outputs:
  - name: mpich-mpicxx
  build:
  script:
- - echo 'ok' # [not osx]
- # make CONDA_BUILD_SYSROOT a 'used variable'
- # so that conda-build knows to pass it to the test env
- - echo "{{ CONDA_BUILD_SYSROOT }}" # [osx]
+ - echo 'ok'
  requirements:
  run:
  - {{ pin_subpackage('mpich', exact=True) }}
@@ -102,10 +96,7 @@ outputs:
  - name: mpich-mpifort
  build:
  script:
- - echo 'ok' # [not osx]
- # make CONDA_BUILD_SYSROOT a 'used variable'
- # so that conda-build knows to pass it to the test env
- - echo "{{ CONDA_BUILD_SYSROOT }}" # [osx]
+ - echo 'ok'
  requirements:
  run:
  - {{ pin_subpackage('mpich', exact=True) }}