From cddc58f9ddc34587f355e7fe8390d1c5a49a02f0 Mon Sep 17 00:00:00 2001 From: Baptiste Mouginot Date: Tue, 20 Apr 2021 17:35:03 -0500 Subject: [PATCH 1/4] re-enabling macos for testing --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 327e3bc..f4a50f3 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -34,7 +34,7 @@ build: string: {{ moab_prefix }}_{{ openmc_prefix }}py{{ CONDA_PY }}h{{ PKG_HASH }}_{{ build }} - skip: true # [win or osx] + skip: true # [win] detect_binary_files_with_prefix: true requirements: From e8fa9d78c19bcbb215c7d9bc5e1680ad23fe51ee Mon Sep 17 00:00:00 2001 From: Baptiste Mouginot Date: Tue, 20 Apr 2021 17:35:30 -0500 Subject: [PATCH 2/4] bumping build --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index f4a50f3..727da0e 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,6 +1,6 @@ {% set org = "pyne" %} {% set version = "0.7.3" %} -{% set build = 1 %} +{% set build = 2 %} # Update the SHA256: `shasum -a 256 pyne.X.Y.Z.tar.gz` {% set sha256 = "aa7abec24834c3e76acb246b8ea917095d4a30d27e80e3441afe9e089620e177" %} From 00b8bc9ee6c4354945af63f6b73629c5e4b9c6c0 Mon Sep 17 00:00:00 2001 From: conda-forge-linter Date: Tue, 20 Apr 2021 22:37:52 +0000 Subject: [PATCH 3/4] MNT: Re-rendered with conda-build 3.21.4, conda-smithy 3.10.0, and conda-forge-pinning 2021.04.20.18.36.07 --- .azure-pipelines/azure-pipelines-linux.yml | 120 ++++++------------ .azure-pipelines/azure-pipelines-osx.yml | 61 +++++++++ ..._openmcnoopenmcpython3.6.____cpython.yaml} | 6 +- ..._openmcnoopenmcpython3.7.____cpython.yaml} | 6 +- ..._openmcnoopenmcpython3.8.____cpython.yaml} | 6 +- ...le_openmcopenmcpython3.6.____cpython.yaml} | 6 +- ...le_openmcopenmcpython3.7.____cpython.yaml} | 6 +- ...le_openmcopenmcpython3.8.____cpython.yaml} | 6 +- ..._openmcnoopenmcpython3.6.____cpython.yaml} | 6 +- ..._openmcnoopenmcpython3.7.____cpython.yaml} | 6 +- ..._openmcnoopenmcpython3.8.____cpython.yaml} | 6 +- ...le_openmcopenmcpython3.6.____cpython.yaml} | 6 +- ...le_openmcopenmcpython3.7.____cpython.yaml} | 6 +- ...le_openmcopenmcpython3.8.____cpython.yaml} | 6 +- .ci_support/migrations/gcc930.yaml | 60 --------- .ci_support/migrations/hdf51106.yaml | 7 - ..._openmcnoopenmcpython3.6.____cpython.yaml} | 22 ++-- ..._openmcnoopenmcpython3.7.____cpython.yaml} | 22 ++-- ..._openmcnoopenmcpython3.8.____cpython.yaml} | 22 ++-- ...le_openmcopenmcpython3.6.____cpython.yaml} | 22 ++-- ...le_openmcopenmcpython3.7.____cpython.yaml} | 22 ++-- ...le_openmcopenmcpython3.8.____cpython.yaml} | 22 ++-- ..._openmcnoopenmcpython3.6.____cpython.yaml} | 22 ++-- ..._openmcnoopenmcpython3.7.____cpython.yaml} | 22 ++-- ..._openmcnoopenmcpython3.8.____cpython.yaml} | 22 ++-- ...le_openmcopenmcpython3.6.____cpython.yaml} | 22 ++-- ...le_openmcopenmcpython3.7.____cpython.yaml} | 22 ++-- ...le_openmcopenmcpython3.8.____cpython.yaml} | 22 ++-- .scripts/build_steps.sh | 27 +++- .scripts/logging_utils.sh | 35 +++++ .scripts/run_docker_build.sh | 25 +++- .scripts/run_osx_build.sh | 60 +++++++++ LICENSE.txt | 2 +- README.md | 101 +++++++-------- azure-pipelines.yml | 3 +- 35 files changed, 470 insertions(+), 367 deletions(-) create mode 100755 .azure-pipelines/azure-pipelines-osx.yml rename .ci_support/{linux_64_c_compiler_version9cxx_compiler_version9enable_moabmoabenable_openmcnoopenmcfortran_compiler_version9python3.6.____cpython.yaml => linux_64_enable_moabmoabenable_openmcnoopenmcpython3.6.____cpython.yaml} (87%) rename .ci_support/{linux_64_c_compiler_version9cxx_compiler_version9enable_moabmoabenable_openmcnoopenmcfortran_compiler_version9python3.7.____cpython.yaml => linux_64_enable_moabmoabenable_openmcnoopenmcpython3.7.____cpython.yaml} (87%) rename .ci_support/{linux_64_c_compiler_version9cxx_compiler_version9enable_moabmoabenable_openmcnoopenmcfortran_compiler_version9python3.8.____cpython.yaml => linux_64_enable_moabmoabenable_openmcnoopenmcpython3.8.____cpython.yaml} (87%) rename .ci_support/{linux_64_c_compiler_version9cxx_compiler_version9enable_moabmoabenable_openmcopenmcfortran_compiler_version9python3.6.____cpython.yaml => linux_64_enable_moabmoabenable_openmcopenmcpython3.6.____cpython.yaml} (87%) rename .ci_support/{linux_64_c_compiler_version9cxx_compiler_version9enable_moabmoabenable_openmcopenmcfortran_compiler_version9python3.7.____cpython.yaml => linux_64_enable_moabmoabenable_openmcopenmcpython3.7.____cpython.yaml} (87%) rename .ci_support/{linux_64_c_compiler_version9cxx_compiler_version9enable_moabmoabenable_openmcopenmcfortran_compiler_version9python3.8.____cpython.yaml => linux_64_enable_moabmoabenable_openmcopenmcpython3.8.____cpython.yaml} (87%) rename .ci_support/{linux_64_c_compiler_version9cxx_compiler_version9enable_moabnomoabenable_openmcnoopenmcfortran_compiler_version9python3.6.____cpython.yaml => linux_64_enable_moabnomoabenable_openmcnoopenmcpython3.6.____cpython.yaml} (87%) rename .ci_support/{linux_64_c_compiler_version9cxx_compiler_version9enable_moabnomoabenable_openmcnoopenmcfortran_compiler_version9python3.7.____cpython.yaml => linux_64_enable_moabnomoabenable_openmcnoopenmcpython3.7.____cpython.yaml} (87%) rename .ci_support/{linux_64_c_compiler_version9cxx_compiler_version9enable_moabnomoabenable_openmcnoopenmcfortran_compiler_version9python3.8.____cpython.yaml => linux_64_enable_moabnomoabenable_openmcnoopenmcpython3.8.____cpython.yaml} (87%) rename .ci_support/{linux_64_c_compiler_version9cxx_compiler_version9enable_moabnomoabenable_openmcopenmcfortran_compiler_version9python3.6.____cpython.yaml => linux_64_enable_moabnomoabenable_openmcopenmcpython3.6.____cpython.yaml} (87%) rename .ci_support/{linux_64_c_compiler_version9cxx_compiler_version9enable_moabnomoabenable_openmcopenmcfortran_compiler_version9python3.7.____cpython.yaml => linux_64_enable_moabnomoabenable_openmcopenmcpython3.7.____cpython.yaml} (87%) rename .ci_support/{linux_64_c_compiler_version9cxx_compiler_version9enable_moabnomoabenable_openmcopenmcfortran_compiler_version9python3.8.____cpython.yaml => linux_64_enable_moabnomoabenable_openmcopenmcpython3.8.____cpython.yaml} (87%) delete mode 100644 .ci_support/migrations/gcc930.yaml delete mode 100644 .ci_support/migrations/hdf51106.yaml rename .ci_support/{linux_64_c_compiler_version7cxx_compiler_version7enable_moabmoabenable_openmcnoopenmcfortran_compiler_version7python3.6.____cpython.yaml => osx_64_enable_moabmoabenable_openmcnoopenmcpython3.6.____cpython.yaml} (78%) rename .ci_support/{linux_64_c_compiler_version7cxx_compiler_version7enable_moabmoabenable_openmcnoopenmcfortran_compiler_version7python3.7.____cpython.yaml => osx_64_enable_moabmoabenable_openmcnoopenmcpython3.7.____cpython.yaml} (78%) rename .ci_support/{linux_64_c_compiler_version7cxx_compiler_version7enable_moabmoabenable_openmcnoopenmcfortran_compiler_version7python3.8.____cpython.yaml => osx_64_enable_moabmoabenable_openmcnoopenmcpython3.8.____cpython.yaml} (78%) rename .ci_support/{linux_64_c_compiler_version7cxx_compiler_version7enable_moabmoabenable_openmcopenmcfortran_compiler_version7python3.6.____cpython.yaml => osx_64_enable_moabmoabenable_openmcopenmcpython3.6.____cpython.yaml} (78%) rename .ci_support/{linux_64_c_compiler_version7cxx_compiler_version7enable_moabmoabenable_openmcopenmcfortran_compiler_version7python3.7.____cpython.yaml => osx_64_enable_moabmoabenable_openmcopenmcpython3.7.____cpython.yaml} (78%) rename .ci_support/{linux_64_c_compiler_version7cxx_compiler_version7enable_moabmoabenable_openmcopenmcfortran_compiler_version7python3.8.____cpython.yaml => osx_64_enable_moabmoabenable_openmcopenmcpython3.8.____cpython.yaml} (78%) rename .ci_support/{linux_64_c_compiler_version7cxx_compiler_version7enable_moabnomoabenable_openmcnoopenmcfortran_compiler_version7python3.6.____cpython.yaml => osx_64_enable_moabnomoabenable_openmcnoopenmcpython3.6.____cpython.yaml} (78%) rename .ci_support/{linux_64_c_compiler_version7cxx_compiler_version7enable_moabnomoabenable_openmcnoopenmcfortran_compiler_version7python3.7.____cpython.yaml => osx_64_enable_moabnomoabenable_openmcnoopenmcpython3.7.____cpython.yaml} (78%) rename .ci_support/{linux_64_c_compiler_version7cxx_compiler_version7enable_moabnomoabenable_openmcnoopenmcfortran_compiler_version7python3.8.____cpython.yaml => osx_64_enable_moabnomoabenable_openmcnoopenmcpython3.8.____cpython.yaml} (78%) rename .ci_support/{linux_64_c_compiler_version7cxx_compiler_version7enable_moabnomoabenable_openmcopenmcfortran_compiler_version7python3.6.____cpython.yaml => osx_64_enable_moabnomoabenable_openmcopenmcpython3.6.____cpython.yaml} (78%) rename .ci_support/{linux_64_c_compiler_version7cxx_compiler_version7enable_moabnomoabenable_openmcopenmcfortran_compiler_version7python3.7.____cpython.yaml => osx_64_enable_moabnomoabenable_openmcopenmcpython3.7.____cpython.yaml} (78%) rename .ci_support/{linux_64_c_compiler_version7cxx_compiler_version7enable_moabnomoabenable_openmcopenmcfortran_compiler_version7python3.8.____cpython.yaml => osx_64_enable_moabnomoabenable_openmcopenmcpython3.8.____cpython.yaml} (78%) create mode 100644 .scripts/logging_utils.sh create mode 100755 .scripts/run_osx_build.sh diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index b359888..50060a0 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,102 +8,54 @@ jobs: vmImage: ubuntu-16.04 strategy: matrix: - ? linux_64_c_compiler_version7cxx_compiler_version7enable_moabmoabenable_openmcnoopenmcfortran_compiler_version7python3.6.____cpython - : CONFIG: linux_64_c_compiler_version7cxx_compiler_version7enable_moabmoabenable_openmcnoopenmcfortran_compiler_version7python3.6.____cpython + linux_64_enable_moabmoabenable_openmcnoopenmcpython3.6.____cpython: + CONFIG: linux_64_enable_moabmoabenable_openmcnoopenmcpython3.6.____cpython UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: condaforge/linux-anvil-comp7 - ? linux_64_c_compiler_version7cxx_compiler_version7enable_moabmoabenable_openmcnoopenmcfortran_compiler_version7python3.7.____cpython - : CONFIG: linux_64_c_compiler_version7cxx_compiler_version7enable_moabmoabenable_openmcnoopenmcfortran_compiler_version7python3.7.____cpython + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-comp7 + linux_64_enable_moabmoabenable_openmcnoopenmcpython3.7.____cpython: + CONFIG: linux_64_enable_moabmoabenable_openmcnoopenmcpython3.7.____cpython UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: condaforge/linux-anvil-comp7 - ? linux_64_c_compiler_version7cxx_compiler_version7enable_moabmoabenable_openmcnoopenmcfortran_compiler_version7python3.8.____cpython - : CONFIG: linux_64_c_compiler_version7cxx_compiler_version7enable_moabmoabenable_openmcnoopenmcfortran_compiler_version7python3.8.____cpython + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-comp7 + linux_64_enable_moabmoabenable_openmcnoopenmcpython3.8.____cpython: + CONFIG: linux_64_enable_moabmoabenable_openmcnoopenmcpython3.8.____cpython UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: condaforge/linux-anvil-comp7 - ? linux_64_c_compiler_version7cxx_compiler_version7enable_moabmoabenable_openmcopenmcfortran_compiler_version7python3.6.____cpython - : CONFIG: linux_64_c_compiler_version7cxx_compiler_version7enable_moabmoabenable_openmcopenmcfortran_compiler_version7python3.6.____cpython + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-comp7 + linux_64_enable_moabmoabenable_openmcopenmcpython3.6.____cpython: + CONFIG: linux_64_enable_moabmoabenable_openmcopenmcpython3.6.____cpython UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: condaforge/linux-anvil-comp7 - ? linux_64_c_compiler_version7cxx_compiler_version7enable_moabmoabenable_openmcopenmcfortran_compiler_version7python3.7.____cpython - : CONFIG: linux_64_c_compiler_version7cxx_compiler_version7enable_moabmoabenable_openmcopenmcfortran_compiler_version7python3.7.____cpython + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-comp7 + linux_64_enable_moabmoabenable_openmcopenmcpython3.7.____cpython: + CONFIG: linux_64_enable_moabmoabenable_openmcopenmcpython3.7.____cpython UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: condaforge/linux-anvil-comp7 - ? linux_64_c_compiler_version7cxx_compiler_version7enable_moabmoabenable_openmcopenmcfortran_compiler_version7python3.8.____cpython - : CONFIG: linux_64_c_compiler_version7cxx_compiler_version7enable_moabmoabenable_openmcopenmcfortran_compiler_version7python3.8.____cpython + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-comp7 + linux_64_enable_moabmoabenable_openmcopenmcpython3.8.____cpython: + CONFIG: linux_64_enable_moabmoabenable_openmcopenmcpython3.8.____cpython UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: condaforge/linux-anvil-comp7 - ? linux_64_c_compiler_version7cxx_compiler_version7enable_moabnomoabenable_openmcnoopenmcfortran_compiler_version7python3.6.____cpython - : CONFIG: linux_64_c_compiler_version7cxx_compiler_version7enable_moabnomoabenable_openmcnoopenmcfortran_compiler_version7python3.6.____cpython + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-comp7 + linux_64_enable_moabnomoabenable_openmcnoopenmcpython3.6.____cpython: + CONFIG: linux_64_enable_moabnomoabenable_openmcnoopenmcpython3.6.____cpython UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: condaforge/linux-anvil-comp7 - ? linux_64_c_compiler_version7cxx_compiler_version7enable_moabnomoabenable_openmcnoopenmcfortran_compiler_version7python3.7.____cpython - : CONFIG: linux_64_c_compiler_version7cxx_compiler_version7enable_moabnomoabenable_openmcnoopenmcfortran_compiler_version7python3.7.____cpython + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-comp7 + linux_64_enable_moabnomoabenable_openmcnoopenmcpython3.7.____cpython: + CONFIG: linux_64_enable_moabnomoabenable_openmcnoopenmcpython3.7.____cpython UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: condaforge/linux-anvil-comp7 - ? linux_64_c_compiler_version7cxx_compiler_version7enable_moabnomoabenable_openmcnoopenmcfortran_compiler_version7python3.8.____cpython - : CONFIG: linux_64_c_compiler_version7cxx_compiler_version7enable_moabnomoabenable_openmcnoopenmcfortran_compiler_version7python3.8.____cpython + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-comp7 + linux_64_enable_moabnomoabenable_openmcnoopenmcpython3.8.____cpython: + CONFIG: linux_64_enable_moabnomoabenable_openmcnoopenmcpython3.8.____cpython UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: condaforge/linux-anvil-comp7 - ? linux_64_c_compiler_version7cxx_compiler_version7enable_moabnomoabenable_openmcopenmcfortran_compiler_version7python3.6.____cpython - : CONFIG: linux_64_c_compiler_version7cxx_compiler_version7enable_moabnomoabenable_openmcopenmcfortran_compiler_version7python3.6.____cpython + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-comp7 + linux_64_enable_moabnomoabenable_openmcopenmcpython3.6.____cpython: + CONFIG: linux_64_enable_moabnomoabenable_openmcopenmcpython3.6.____cpython UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: condaforge/linux-anvil-comp7 - ? linux_64_c_compiler_version7cxx_compiler_version7enable_moabnomoabenable_openmcopenmcfortran_compiler_version7python3.7.____cpython - : CONFIG: linux_64_c_compiler_version7cxx_compiler_version7enable_moabnomoabenable_openmcopenmcfortran_compiler_version7python3.7.____cpython + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-comp7 + linux_64_enable_moabnomoabenable_openmcopenmcpython3.7.____cpython: + CONFIG: linux_64_enable_moabnomoabenable_openmcopenmcpython3.7.____cpython UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: condaforge/linux-anvil-comp7 - ? linux_64_c_compiler_version7cxx_compiler_version7enable_moabnomoabenable_openmcopenmcfortran_compiler_version7python3.8.____cpython - : CONFIG: linux_64_c_compiler_version7cxx_compiler_version7enable_moabnomoabenable_openmcopenmcfortran_compiler_version7python3.8.____cpython + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-comp7 + linux_64_enable_moabnomoabenable_openmcopenmcpython3.8.____cpython: + CONFIG: linux_64_enable_moabnomoabenable_openmcopenmcpython3.8.____cpython UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: condaforge/linux-anvil-comp7 - ? linux_64_c_compiler_version9cxx_compiler_version9enable_moabmoabenable_openmcnoopenmcfortran_compiler_version9python3.6.____cpython - : CONFIG: linux_64_c_compiler_version9cxx_compiler_version9enable_moabmoabenable_openmcnoopenmcfortran_compiler_version9python3.6.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: condaforge/linux-anvil-comp7 - ? linux_64_c_compiler_version9cxx_compiler_version9enable_moabmoabenable_openmcnoopenmcfortran_compiler_version9python3.7.____cpython - : CONFIG: linux_64_c_compiler_version9cxx_compiler_version9enable_moabmoabenable_openmcnoopenmcfortran_compiler_version9python3.7.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: condaforge/linux-anvil-comp7 - ? linux_64_c_compiler_version9cxx_compiler_version9enable_moabmoabenable_openmcnoopenmcfortran_compiler_version9python3.8.____cpython - : CONFIG: linux_64_c_compiler_version9cxx_compiler_version9enable_moabmoabenable_openmcnoopenmcfortran_compiler_version9python3.8.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: condaforge/linux-anvil-comp7 - ? linux_64_c_compiler_version9cxx_compiler_version9enable_moabmoabenable_openmcopenmcfortran_compiler_version9python3.6.____cpython - : CONFIG: linux_64_c_compiler_version9cxx_compiler_version9enable_moabmoabenable_openmcopenmcfortran_compiler_version9python3.6.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: condaforge/linux-anvil-comp7 - ? linux_64_c_compiler_version9cxx_compiler_version9enable_moabmoabenable_openmcopenmcfortran_compiler_version9python3.7.____cpython - : CONFIG: linux_64_c_compiler_version9cxx_compiler_version9enable_moabmoabenable_openmcopenmcfortran_compiler_version9python3.7.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: condaforge/linux-anvil-comp7 - ? linux_64_c_compiler_version9cxx_compiler_version9enable_moabmoabenable_openmcopenmcfortran_compiler_version9python3.8.____cpython - : CONFIG: linux_64_c_compiler_version9cxx_compiler_version9enable_moabmoabenable_openmcopenmcfortran_compiler_version9python3.8.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: condaforge/linux-anvil-comp7 - ? linux_64_c_compiler_version9cxx_compiler_version9enable_moabnomoabenable_openmcnoopenmcfortran_compiler_version9python3.6.____cpython - : CONFIG: linux_64_c_compiler_version9cxx_compiler_version9enable_moabnomoabenable_openmcnoopenmcfortran_compiler_version9python3.6.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: condaforge/linux-anvil-comp7 - ? linux_64_c_compiler_version9cxx_compiler_version9enable_moabnomoabenable_openmcnoopenmcfortran_compiler_version9python3.7.____cpython - : CONFIG: linux_64_c_compiler_version9cxx_compiler_version9enable_moabnomoabenable_openmcnoopenmcfortran_compiler_version9python3.7.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: condaforge/linux-anvil-comp7 - ? linux_64_c_compiler_version9cxx_compiler_version9enable_moabnomoabenable_openmcnoopenmcfortran_compiler_version9python3.8.____cpython - : CONFIG: linux_64_c_compiler_version9cxx_compiler_version9enable_moabnomoabenable_openmcnoopenmcfortran_compiler_version9python3.8.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: condaforge/linux-anvil-comp7 - ? linux_64_c_compiler_version9cxx_compiler_version9enable_moabnomoabenable_openmcopenmcfortran_compiler_version9python3.6.____cpython - : CONFIG: linux_64_c_compiler_version9cxx_compiler_version9enable_moabnomoabenable_openmcopenmcfortran_compiler_version9python3.6.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: condaforge/linux-anvil-comp7 - ? linux_64_c_compiler_version9cxx_compiler_version9enable_moabnomoabenable_openmcopenmcfortran_compiler_version9python3.7.____cpython - : CONFIG: linux_64_c_compiler_version9cxx_compiler_version9enable_moabnomoabenable_openmcopenmcfortran_compiler_version9python3.7.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: condaforge/linux-anvil-comp7 - ? linux_64_c_compiler_version9cxx_compiler_version9enable_moabnomoabenable_openmcopenmcfortran_compiler_version9python3.8.____cpython - : CONFIG: linux_64_c_compiler_version9cxx_compiler_version9enable_moabnomoabenable_openmcopenmcfortran_compiler_version9python3.8.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: condaforge/linux-anvil-comp7 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-comp7 timeoutInMinutes: 360 steps: diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml new file mode 100755 index 0000000..86c1102 --- /dev/null +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -0,0 +1,61 @@ +# This file was generated automatically from conda-smithy. To update this configuration, +# update the conda-forge.yml and/or the recipe/meta.yaml. +# -*- mode: yaml -*- + +jobs: +- job: osx + pool: + vmImage: macOS-10.15 + strategy: + matrix: + osx_64_enable_moabmoabenable_openmcnoopenmcpython3.6.____cpython: + CONFIG: osx_64_enable_moabmoabenable_openmcnoopenmcpython3.6.____cpython + UPLOAD_PACKAGES: 'True' + osx_64_enable_moabmoabenable_openmcnoopenmcpython3.7.____cpython: + CONFIG: osx_64_enable_moabmoabenable_openmcnoopenmcpython3.7.____cpython + UPLOAD_PACKAGES: 'True' + osx_64_enable_moabmoabenable_openmcnoopenmcpython3.8.____cpython: + CONFIG: osx_64_enable_moabmoabenable_openmcnoopenmcpython3.8.____cpython + UPLOAD_PACKAGES: 'True' + osx_64_enable_moabmoabenable_openmcopenmcpython3.6.____cpython: + CONFIG: osx_64_enable_moabmoabenable_openmcopenmcpython3.6.____cpython + UPLOAD_PACKAGES: 'True' + osx_64_enable_moabmoabenable_openmcopenmcpython3.7.____cpython: + CONFIG: osx_64_enable_moabmoabenable_openmcopenmcpython3.7.____cpython + UPLOAD_PACKAGES: 'True' + osx_64_enable_moabmoabenable_openmcopenmcpython3.8.____cpython: + CONFIG: osx_64_enable_moabmoabenable_openmcopenmcpython3.8.____cpython + UPLOAD_PACKAGES: 'True' + osx_64_enable_moabnomoabenable_openmcnoopenmcpython3.6.____cpython: + CONFIG: osx_64_enable_moabnomoabenable_openmcnoopenmcpython3.6.____cpython + UPLOAD_PACKAGES: 'True' + osx_64_enable_moabnomoabenable_openmcnoopenmcpython3.7.____cpython: + CONFIG: osx_64_enable_moabnomoabenable_openmcnoopenmcpython3.7.____cpython + UPLOAD_PACKAGES: 'True' + osx_64_enable_moabnomoabenable_openmcnoopenmcpython3.8.____cpython: + CONFIG: osx_64_enable_moabnomoabenable_openmcnoopenmcpython3.8.____cpython + UPLOAD_PACKAGES: 'True' + osx_64_enable_moabnomoabenable_openmcopenmcpython3.6.____cpython: + CONFIG: osx_64_enable_moabnomoabenable_openmcopenmcpython3.6.____cpython + UPLOAD_PACKAGES: 'True' + osx_64_enable_moabnomoabenable_openmcopenmcpython3.7.____cpython: + CONFIG: osx_64_enable_moabnomoabenable_openmcopenmcpython3.7.____cpython + UPLOAD_PACKAGES: 'True' + osx_64_enable_moabnomoabenable_openmcopenmcpython3.8.____cpython: + CONFIG: osx_64_enable_moabnomoabenable_openmcopenmcpython3.8.____cpython + UPLOAD_PACKAGES: 'True' + timeoutInMinutes: 360 + + steps: + # TODO: Fast finish on azure pipelines? + - script: | + export CI=azure + export OSX_FORCE_SDK_DOWNLOAD="1" + export GIT_BRANCH=$BUILD_SOURCEBRANCHNAME + export FEEDSTOCK_NAME=$(basename ${BUILD_REPOSITORY_NAME}) + ./.scripts/run_osx_build.sh + displayName: Run OSX build + env: + BINSTAR_TOKEN: $(BINSTAR_TOKEN) + FEEDSTOCK_TOKEN: $(FEEDSTOCK_TOKEN) + STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) \ No newline at end of file diff --git a/.ci_support/linux_64_c_compiler_version9cxx_compiler_version9enable_moabmoabenable_openmcnoopenmcfortran_compiler_version9python3.6.____cpython.yaml b/.ci_support/linux_64_enable_moabmoabenable_openmcnoopenmcpython3.6.____cpython.yaml similarity index 87% rename from .ci_support/linux_64_c_compiler_version9cxx_compiler_version9enable_moabmoabenable_openmcnoopenmcfortran_compiler_version9python3.6.____cpython.yaml rename to .ci_support/linux_64_enable_moabmoabenable_openmcnoopenmcpython3.6.____cpython.yaml index 9e4a64c..4ada8a9 100644 --- a/.ci_support/linux_64_c_compiler_version9cxx_compiler_version9enable_moabmoabenable_openmcnoopenmcfortran_compiler_version9python3.6.____cpython.yaml +++ b/.ci_support/linux_64_enable_moabmoabenable_openmcnoopenmcpython3.6.____cpython.yaml @@ -13,7 +13,7 @@ cxx_compiler: cxx_compiler_version: - '9' docker_image: -- condaforge/linux-anvil-comp7 +- quay.io/condaforge/linux-anvil-comp7 enable_moab: - moab enable_openmc: @@ -25,7 +25,7 @@ fortran_compiler_version: hdf5: - 1.10.6 numpy: -- '1.16' +- '1.17' pin_run_as_build: python: min_pin: x.x @@ -38,5 +38,7 @@ zip_keys: - - c_compiler_version - cxx_compiler_version - fortran_compiler_version +- - cdt_name + - docker_image - - python - numpy diff --git a/.ci_support/linux_64_c_compiler_version9cxx_compiler_version9enable_moabmoabenable_openmcnoopenmcfortran_compiler_version9python3.7.____cpython.yaml b/.ci_support/linux_64_enable_moabmoabenable_openmcnoopenmcpython3.7.____cpython.yaml similarity index 87% rename from .ci_support/linux_64_c_compiler_version9cxx_compiler_version9enable_moabmoabenable_openmcnoopenmcfortran_compiler_version9python3.7.____cpython.yaml rename to .ci_support/linux_64_enable_moabmoabenable_openmcnoopenmcpython3.7.____cpython.yaml index ccc4537..5dd6ad3 100644 --- a/.ci_support/linux_64_c_compiler_version9cxx_compiler_version9enable_moabmoabenable_openmcnoopenmcfortran_compiler_version9python3.7.____cpython.yaml +++ b/.ci_support/linux_64_enable_moabmoabenable_openmcnoopenmcpython3.7.____cpython.yaml @@ -13,7 +13,7 @@ cxx_compiler: cxx_compiler_version: - '9' docker_image: -- condaforge/linux-anvil-comp7 +- quay.io/condaforge/linux-anvil-comp7 enable_moab: - moab enable_openmc: @@ -25,7 +25,7 @@ fortran_compiler_version: hdf5: - 1.10.6 numpy: -- '1.16' +- '1.17' pin_run_as_build: python: min_pin: x.x @@ -38,5 +38,7 @@ zip_keys: - - c_compiler_version - cxx_compiler_version - fortran_compiler_version +- - cdt_name + - docker_image - - python - numpy diff --git a/.ci_support/linux_64_c_compiler_version9cxx_compiler_version9enable_moabmoabenable_openmcnoopenmcfortran_compiler_version9python3.8.____cpython.yaml b/.ci_support/linux_64_enable_moabmoabenable_openmcnoopenmcpython3.8.____cpython.yaml similarity index 87% rename from .ci_support/linux_64_c_compiler_version9cxx_compiler_version9enable_moabmoabenable_openmcnoopenmcfortran_compiler_version9python3.8.____cpython.yaml rename to .ci_support/linux_64_enable_moabmoabenable_openmcnoopenmcpython3.8.____cpython.yaml index 06e7c94..794afc7 100644 --- a/.ci_support/linux_64_c_compiler_version9cxx_compiler_version9enable_moabmoabenable_openmcnoopenmcfortran_compiler_version9python3.8.____cpython.yaml +++ b/.ci_support/linux_64_enable_moabmoabenable_openmcnoopenmcpython3.8.____cpython.yaml @@ -13,7 +13,7 @@ cxx_compiler: cxx_compiler_version: - '9' docker_image: -- condaforge/linux-anvil-comp7 +- quay.io/condaforge/linux-anvil-comp7 enable_moab: - moab enable_openmc: @@ -25,7 +25,7 @@ fortran_compiler_version: hdf5: - 1.10.6 numpy: -- '1.16' +- '1.17' pin_run_as_build: python: min_pin: x.x @@ -38,5 +38,7 @@ zip_keys: - - c_compiler_version - cxx_compiler_version - fortran_compiler_version +- - cdt_name + - docker_image - - python - numpy diff --git a/.ci_support/linux_64_c_compiler_version9cxx_compiler_version9enable_moabmoabenable_openmcopenmcfortran_compiler_version9python3.6.____cpython.yaml b/.ci_support/linux_64_enable_moabmoabenable_openmcopenmcpython3.6.____cpython.yaml similarity index 87% rename from .ci_support/linux_64_c_compiler_version9cxx_compiler_version9enable_moabmoabenable_openmcopenmcfortran_compiler_version9python3.6.____cpython.yaml rename to .ci_support/linux_64_enable_moabmoabenable_openmcopenmcpython3.6.____cpython.yaml index ef88bf0..c050775 100644 --- a/.ci_support/linux_64_c_compiler_version9cxx_compiler_version9enable_moabmoabenable_openmcopenmcfortran_compiler_version9python3.6.____cpython.yaml +++ b/.ci_support/linux_64_enable_moabmoabenable_openmcopenmcpython3.6.____cpython.yaml @@ -13,7 +13,7 @@ cxx_compiler: cxx_compiler_version: - '9' docker_image: -- condaforge/linux-anvil-comp7 +- quay.io/condaforge/linux-anvil-comp7 enable_moab: - moab enable_openmc: @@ -25,7 +25,7 @@ fortran_compiler_version: hdf5: - 1.10.6 numpy: -- '1.16' +- '1.17' pin_run_as_build: python: min_pin: x.x @@ -38,5 +38,7 @@ zip_keys: - - c_compiler_version - cxx_compiler_version - fortran_compiler_version +- - cdt_name + - docker_image - - python - numpy diff --git a/.ci_support/linux_64_c_compiler_version9cxx_compiler_version9enable_moabmoabenable_openmcopenmcfortran_compiler_version9python3.7.____cpython.yaml b/.ci_support/linux_64_enable_moabmoabenable_openmcopenmcpython3.7.____cpython.yaml similarity index 87% rename from .ci_support/linux_64_c_compiler_version9cxx_compiler_version9enable_moabmoabenable_openmcopenmcfortran_compiler_version9python3.7.____cpython.yaml rename to .ci_support/linux_64_enable_moabmoabenable_openmcopenmcpython3.7.____cpython.yaml index ddd5a64..e07bf06 100644 --- a/.ci_support/linux_64_c_compiler_version9cxx_compiler_version9enable_moabmoabenable_openmcopenmcfortran_compiler_version9python3.7.____cpython.yaml +++ b/.ci_support/linux_64_enable_moabmoabenable_openmcopenmcpython3.7.____cpython.yaml @@ -13,7 +13,7 @@ cxx_compiler: cxx_compiler_version: - '9' docker_image: -- condaforge/linux-anvil-comp7 +- quay.io/condaforge/linux-anvil-comp7 enable_moab: - moab enable_openmc: @@ -25,7 +25,7 @@ fortran_compiler_version: hdf5: - 1.10.6 numpy: -- '1.16' +- '1.17' pin_run_as_build: python: min_pin: x.x @@ -38,5 +38,7 @@ zip_keys: - - c_compiler_version - cxx_compiler_version - fortran_compiler_version +- - cdt_name + - docker_image - - python - numpy diff --git a/.ci_support/linux_64_c_compiler_version9cxx_compiler_version9enable_moabmoabenable_openmcopenmcfortran_compiler_version9python3.8.____cpython.yaml b/.ci_support/linux_64_enable_moabmoabenable_openmcopenmcpython3.8.____cpython.yaml similarity index 87% rename from .ci_support/linux_64_c_compiler_version9cxx_compiler_version9enable_moabmoabenable_openmcopenmcfortran_compiler_version9python3.8.____cpython.yaml rename to .ci_support/linux_64_enable_moabmoabenable_openmcopenmcpython3.8.____cpython.yaml index 943f7e1..c80e7d5 100644 --- a/.ci_support/linux_64_c_compiler_version9cxx_compiler_version9enable_moabmoabenable_openmcopenmcfortran_compiler_version9python3.8.____cpython.yaml +++ b/.ci_support/linux_64_enable_moabmoabenable_openmcopenmcpython3.8.____cpython.yaml @@ -13,7 +13,7 @@ cxx_compiler: cxx_compiler_version: - '9' docker_image: -- condaforge/linux-anvil-comp7 +- quay.io/condaforge/linux-anvil-comp7 enable_moab: - moab enable_openmc: @@ -25,7 +25,7 @@ fortran_compiler_version: hdf5: - 1.10.6 numpy: -- '1.16' +- '1.17' pin_run_as_build: python: min_pin: x.x @@ -38,5 +38,7 @@ zip_keys: - - c_compiler_version - cxx_compiler_version - fortran_compiler_version +- - cdt_name + - docker_image - - python - numpy diff --git a/.ci_support/linux_64_c_compiler_version9cxx_compiler_version9enable_moabnomoabenable_openmcnoopenmcfortran_compiler_version9python3.6.____cpython.yaml b/.ci_support/linux_64_enable_moabnomoabenable_openmcnoopenmcpython3.6.____cpython.yaml similarity index 87% rename from .ci_support/linux_64_c_compiler_version9cxx_compiler_version9enable_moabnomoabenable_openmcnoopenmcfortran_compiler_version9python3.6.____cpython.yaml rename to .ci_support/linux_64_enable_moabnomoabenable_openmcnoopenmcpython3.6.____cpython.yaml index b2acd52..44a96aa 100644 --- a/.ci_support/linux_64_c_compiler_version9cxx_compiler_version9enable_moabnomoabenable_openmcnoopenmcfortran_compiler_version9python3.6.____cpython.yaml +++ b/.ci_support/linux_64_enable_moabnomoabenable_openmcnoopenmcpython3.6.____cpython.yaml @@ -13,7 +13,7 @@ cxx_compiler: cxx_compiler_version: - '9' docker_image: -- condaforge/linux-anvil-comp7 +- quay.io/condaforge/linux-anvil-comp7 enable_moab: - nomoab enable_openmc: @@ -25,7 +25,7 @@ fortran_compiler_version: hdf5: - 1.10.6 numpy: -- '1.16' +- '1.17' pin_run_as_build: python: min_pin: x.x @@ -38,5 +38,7 @@ zip_keys: - - c_compiler_version - cxx_compiler_version - fortran_compiler_version +- - cdt_name + - docker_image - - python - numpy diff --git a/.ci_support/linux_64_c_compiler_version9cxx_compiler_version9enable_moabnomoabenable_openmcnoopenmcfortran_compiler_version9python3.7.____cpython.yaml b/.ci_support/linux_64_enable_moabnomoabenable_openmcnoopenmcpython3.7.____cpython.yaml similarity index 87% rename from .ci_support/linux_64_c_compiler_version9cxx_compiler_version9enable_moabnomoabenable_openmcnoopenmcfortran_compiler_version9python3.7.____cpython.yaml rename to .ci_support/linux_64_enable_moabnomoabenable_openmcnoopenmcpython3.7.____cpython.yaml index c0b746e..2025fec 100644 --- a/.ci_support/linux_64_c_compiler_version9cxx_compiler_version9enable_moabnomoabenable_openmcnoopenmcfortran_compiler_version9python3.7.____cpython.yaml +++ b/.ci_support/linux_64_enable_moabnomoabenable_openmcnoopenmcpython3.7.____cpython.yaml @@ -13,7 +13,7 @@ cxx_compiler: cxx_compiler_version: - '9' docker_image: -- condaforge/linux-anvil-comp7 +- quay.io/condaforge/linux-anvil-comp7 enable_moab: - nomoab enable_openmc: @@ -25,7 +25,7 @@ fortran_compiler_version: hdf5: - 1.10.6 numpy: -- '1.16' +- '1.17' pin_run_as_build: python: min_pin: x.x @@ -38,5 +38,7 @@ zip_keys: - - c_compiler_version - cxx_compiler_version - fortran_compiler_version +- - cdt_name + - docker_image - - python - numpy diff --git a/.ci_support/linux_64_c_compiler_version9cxx_compiler_version9enable_moabnomoabenable_openmcnoopenmcfortran_compiler_version9python3.8.____cpython.yaml b/.ci_support/linux_64_enable_moabnomoabenable_openmcnoopenmcpython3.8.____cpython.yaml similarity index 87% rename from .ci_support/linux_64_c_compiler_version9cxx_compiler_version9enable_moabnomoabenable_openmcnoopenmcfortran_compiler_version9python3.8.____cpython.yaml rename to .ci_support/linux_64_enable_moabnomoabenable_openmcnoopenmcpython3.8.____cpython.yaml index d807782..ca5fb0f 100644 --- a/.ci_support/linux_64_c_compiler_version9cxx_compiler_version9enable_moabnomoabenable_openmcnoopenmcfortran_compiler_version9python3.8.____cpython.yaml +++ b/.ci_support/linux_64_enable_moabnomoabenable_openmcnoopenmcpython3.8.____cpython.yaml @@ -13,7 +13,7 @@ cxx_compiler: cxx_compiler_version: - '9' docker_image: -- condaforge/linux-anvil-comp7 +- quay.io/condaforge/linux-anvil-comp7 enable_moab: - nomoab enable_openmc: @@ -25,7 +25,7 @@ fortran_compiler_version: hdf5: - 1.10.6 numpy: -- '1.16' +- '1.17' pin_run_as_build: python: min_pin: x.x @@ -38,5 +38,7 @@ zip_keys: - - c_compiler_version - cxx_compiler_version - fortran_compiler_version +- - cdt_name + - docker_image - - python - numpy diff --git a/.ci_support/linux_64_c_compiler_version9cxx_compiler_version9enable_moabnomoabenable_openmcopenmcfortran_compiler_version9python3.6.____cpython.yaml b/.ci_support/linux_64_enable_moabnomoabenable_openmcopenmcpython3.6.____cpython.yaml similarity index 87% rename from .ci_support/linux_64_c_compiler_version9cxx_compiler_version9enable_moabnomoabenable_openmcopenmcfortran_compiler_version9python3.6.____cpython.yaml rename to .ci_support/linux_64_enable_moabnomoabenable_openmcopenmcpython3.6.____cpython.yaml index 633b420..185a82a 100644 --- a/.ci_support/linux_64_c_compiler_version9cxx_compiler_version9enable_moabnomoabenable_openmcopenmcfortran_compiler_version9python3.6.____cpython.yaml +++ b/.ci_support/linux_64_enable_moabnomoabenable_openmcopenmcpython3.6.____cpython.yaml @@ -13,7 +13,7 @@ cxx_compiler: cxx_compiler_version: - '9' docker_image: -- condaforge/linux-anvil-comp7 +- quay.io/condaforge/linux-anvil-comp7 enable_moab: - nomoab enable_openmc: @@ -25,7 +25,7 @@ fortran_compiler_version: hdf5: - 1.10.6 numpy: -- '1.16' +- '1.17' pin_run_as_build: python: min_pin: x.x @@ -38,5 +38,7 @@ zip_keys: - - c_compiler_version - cxx_compiler_version - fortran_compiler_version +- - cdt_name + - docker_image - - python - numpy diff --git a/.ci_support/linux_64_c_compiler_version9cxx_compiler_version9enable_moabnomoabenable_openmcopenmcfortran_compiler_version9python3.7.____cpython.yaml b/.ci_support/linux_64_enable_moabnomoabenable_openmcopenmcpython3.7.____cpython.yaml similarity index 87% rename from .ci_support/linux_64_c_compiler_version9cxx_compiler_version9enable_moabnomoabenable_openmcopenmcfortran_compiler_version9python3.7.____cpython.yaml rename to .ci_support/linux_64_enable_moabnomoabenable_openmcopenmcpython3.7.____cpython.yaml index d698bfe..83b785f 100644 --- a/.ci_support/linux_64_c_compiler_version9cxx_compiler_version9enable_moabnomoabenable_openmcopenmcfortran_compiler_version9python3.7.____cpython.yaml +++ b/.ci_support/linux_64_enable_moabnomoabenable_openmcopenmcpython3.7.____cpython.yaml @@ -13,7 +13,7 @@ cxx_compiler: cxx_compiler_version: - '9' docker_image: -- condaforge/linux-anvil-comp7 +- quay.io/condaforge/linux-anvil-comp7 enable_moab: - nomoab enable_openmc: @@ -25,7 +25,7 @@ fortran_compiler_version: hdf5: - 1.10.6 numpy: -- '1.16' +- '1.17' pin_run_as_build: python: min_pin: x.x @@ -38,5 +38,7 @@ zip_keys: - - c_compiler_version - cxx_compiler_version - fortran_compiler_version +- - cdt_name + - docker_image - - python - numpy diff --git a/.ci_support/linux_64_c_compiler_version9cxx_compiler_version9enable_moabnomoabenable_openmcopenmcfortran_compiler_version9python3.8.____cpython.yaml b/.ci_support/linux_64_enable_moabnomoabenable_openmcopenmcpython3.8.____cpython.yaml similarity index 87% rename from .ci_support/linux_64_c_compiler_version9cxx_compiler_version9enable_moabnomoabenable_openmcopenmcfortran_compiler_version9python3.8.____cpython.yaml rename to .ci_support/linux_64_enable_moabnomoabenable_openmcopenmcpython3.8.____cpython.yaml index f8a5433..7afbbcb 100644 --- a/.ci_support/linux_64_c_compiler_version9cxx_compiler_version9enable_moabnomoabenable_openmcopenmcfortran_compiler_version9python3.8.____cpython.yaml +++ b/.ci_support/linux_64_enable_moabnomoabenable_openmcopenmcpython3.8.____cpython.yaml @@ -13,7 +13,7 @@ cxx_compiler: cxx_compiler_version: - '9' docker_image: -- condaforge/linux-anvil-comp7 +- quay.io/condaforge/linux-anvil-comp7 enable_moab: - nomoab enable_openmc: @@ -25,7 +25,7 @@ fortran_compiler_version: hdf5: - 1.10.6 numpy: -- '1.16' +- '1.17' pin_run_as_build: python: min_pin: x.x @@ -38,5 +38,7 @@ zip_keys: - - c_compiler_version - cxx_compiler_version - fortran_compiler_version +- - cdt_name + - docker_image - - python - numpy diff --git a/.ci_support/migrations/gcc930.yaml b/.ci_support/migrations/gcc930.yaml deleted file mode 100644 index abac624..0000000 --- a/.ci_support/migrations/gcc930.yaml +++ /dev/null @@ -1,60 +0,0 @@ -migrator_ts: 1602079781 - -__migrator: - kind: - version - migration_number: 1 - build_number: 1 - override_cbc_keys: - - fortran_compiler_stub - paused: false - -c_compiler_version: # [unix] - - 11 # [osx and arm64] - - - 10 # [osx and x86_64] - - 10 # [osx and x86_64] - - - 9 # [linux64] - - 9 # [aarch64] - - 9 # [ppc64le] - - # we are keeping both versions for a while during the migration - # we need to remove 7/8 when the migration is done - - 7 # [linux64] - - 7 # [aarch64] - - 8 # [ppc64le] - -cxx_compiler_version: # [unix] - - 11 # [osx and arm64] - - - 10 # [osx and x86_64] - - 10 # [osx and x86_64] - - - 9 # [linux64] - - 9 # [aarch64] - - 9 # [ppc64le] - - # we are keeping both versions for a while during the migration - # we need to remove 7/8 when the migration is done - - 7 # [linux64] - - 7 # [aarch64] - - 8 # [ppc64le] - -fortran_compiler_version: # [unix or win64] - - 11 # [osx and arm64] - - - 9 # [osx and x86_64] - - 7 # [osx and x86_64] - - - 9 # [linux64] - - 9 # [aarch64] - - 9 # [ppc64le] - - # we are keeping both versions for a while during the migration - # we need to remove 7/8 when the migration is done - - 7 # [linux64] - - 7 # [aarch64] - - 8 # [ppc64le] - - - 5 # [win64] diff --git a/.ci_support/migrations/hdf51106.yaml b/.ci_support/migrations/hdf51106.yaml deleted file mode 100644 index dc5b3f1..0000000 --- a/.ci_support/migrations/hdf51106.yaml +++ /dev/null @@ -1,7 +0,0 @@ -__migrator: - build_number: 1 - kind: version - migration_number: 1 -hdf5: -- 1.10.6 -migrator_ts: 1587001869.689825 diff --git a/.ci_support/linux_64_c_compiler_version7cxx_compiler_version7enable_moabmoabenable_openmcnoopenmcfortran_compiler_version7python3.6.____cpython.yaml b/.ci_support/osx_64_enable_moabmoabenable_openmcnoopenmcpython3.6.____cpython.yaml similarity index 78% rename from .ci_support/linux_64_c_compiler_version7cxx_compiler_version7enable_moabmoabenable_openmcnoopenmcfortran_compiler_version7python3.6.____cpython.yaml rename to .ci_support/osx_64_enable_moabmoabenable_openmcnoopenmcpython3.6.____cpython.yaml index 8bc9a9f..fa6233a 100644 --- a/.ci_support/linux_64_c_compiler_version7cxx_compiler_version7enable_moabmoabenable_openmcnoopenmcfortran_compiler_version7python3.6.____cpython.yaml +++ b/.ci_support/osx_64_enable_moabmoabenable_openmcnoopenmcpython3.6.____cpython.yaml @@ -1,19 +1,17 @@ +MACOSX_DEPLOYMENT_TARGET: +- '10.9' c_compiler: -- gcc +- clang c_compiler_version: -- '7' -cdt_name: -- cos6 +- '11' channel_sources: - conda-forge,defaults channel_targets: - conda-forge main cxx_compiler: -- gxx +- clangxx cxx_compiler_version: -- '7' -docker_image: -- condaforge/linux-anvil-comp7 +- '11' enable_moab: - moab enable_openmc: @@ -21,11 +19,13 @@ enable_openmc: fortran_compiler: - gfortran fortran_compiler_version: -- '7' +- '9' hdf5: - 1.10.6 +macos_machine: +- x86_64-apple-darwin13.4.0 numpy: -- '1.16' +- '1.17' pin_run_as_build: python: min_pin: x.x @@ -33,7 +33,7 @@ pin_run_as_build: python: - 3.6.* *_cpython target_platform: -- linux-64 +- osx-64 zip_keys: - - c_compiler_version - cxx_compiler_version diff --git a/.ci_support/linux_64_c_compiler_version7cxx_compiler_version7enable_moabmoabenable_openmcnoopenmcfortran_compiler_version7python3.7.____cpython.yaml b/.ci_support/osx_64_enable_moabmoabenable_openmcnoopenmcpython3.7.____cpython.yaml similarity index 78% rename from .ci_support/linux_64_c_compiler_version7cxx_compiler_version7enable_moabmoabenable_openmcnoopenmcfortran_compiler_version7python3.7.____cpython.yaml rename to .ci_support/osx_64_enable_moabmoabenable_openmcnoopenmcpython3.7.____cpython.yaml index cc45f0a..50824d5 100644 --- a/.ci_support/linux_64_c_compiler_version7cxx_compiler_version7enable_moabmoabenable_openmcnoopenmcfortran_compiler_version7python3.7.____cpython.yaml +++ b/.ci_support/osx_64_enable_moabmoabenable_openmcnoopenmcpython3.7.____cpython.yaml @@ -1,19 +1,17 @@ +MACOSX_DEPLOYMENT_TARGET: +- '10.9' c_compiler: -- gcc +- clang c_compiler_version: -- '7' -cdt_name: -- cos6 +- '11' channel_sources: - conda-forge,defaults channel_targets: - conda-forge main cxx_compiler: -- gxx +- clangxx cxx_compiler_version: -- '7' -docker_image: -- condaforge/linux-anvil-comp7 +- '11' enable_moab: - moab enable_openmc: @@ -21,11 +19,13 @@ enable_openmc: fortran_compiler: - gfortran fortran_compiler_version: -- '7' +- '9' hdf5: - 1.10.6 +macos_machine: +- x86_64-apple-darwin13.4.0 numpy: -- '1.16' +- '1.17' pin_run_as_build: python: min_pin: x.x @@ -33,7 +33,7 @@ pin_run_as_build: python: - 3.7.* *_cpython target_platform: -- linux-64 +- osx-64 zip_keys: - - c_compiler_version - cxx_compiler_version diff --git a/.ci_support/linux_64_c_compiler_version7cxx_compiler_version7enable_moabmoabenable_openmcnoopenmcfortran_compiler_version7python3.8.____cpython.yaml b/.ci_support/osx_64_enable_moabmoabenable_openmcnoopenmcpython3.8.____cpython.yaml similarity index 78% rename from .ci_support/linux_64_c_compiler_version7cxx_compiler_version7enable_moabmoabenable_openmcnoopenmcfortran_compiler_version7python3.8.____cpython.yaml rename to .ci_support/osx_64_enable_moabmoabenable_openmcnoopenmcpython3.8.____cpython.yaml index ee9e741..c87395a 100644 --- a/.ci_support/linux_64_c_compiler_version7cxx_compiler_version7enable_moabmoabenable_openmcnoopenmcfortran_compiler_version7python3.8.____cpython.yaml +++ b/.ci_support/osx_64_enable_moabmoabenable_openmcnoopenmcpython3.8.____cpython.yaml @@ -1,19 +1,17 @@ +MACOSX_DEPLOYMENT_TARGET: +- '10.9' c_compiler: -- gcc +- clang c_compiler_version: -- '7' -cdt_name: -- cos6 +- '11' channel_sources: - conda-forge,defaults channel_targets: - conda-forge main cxx_compiler: -- gxx +- clangxx cxx_compiler_version: -- '7' -docker_image: -- condaforge/linux-anvil-comp7 +- '11' enable_moab: - moab enable_openmc: @@ -21,11 +19,13 @@ enable_openmc: fortran_compiler: - gfortran fortran_compiler_version: -- '7' +- '9' hdf5: - 1.10.6 +macos_machine: +- x86_64-apple-darwin13.4.0 numpy: -- '1.16' +- '1.17' pin_run_as_build: python: min_pin: x.x @@ -33,7 +33,7 @@ pin_run_as_build: python: - 3.8.* *_cpython target_platform: -- linux-64 +- osx-64 zip_keys: - - c_compiler_version - cxx_compiler_version diff --git a/.ci_support/linux_64_c_compiler_version7cxx_compiler_version7enable_moabmoabenable_openmcopenmcfortran_compiler_version7python3.6.____cpython.yaml b/.ci_support/osx_64_enable_moabmoabenable_openmcopenmcpython3.6.____cpython.yaml similarity index 78% rename from .ci_support/linux_64_c_compiler_version7cxx_compiler_version7enable_moabmoabenable_openmcopenmcfortran_compiler_version7python3.6.____cpython.yaml rename to .ci_support/osx_64_enable_moabmoabenable_openmcopenmcpython3.6.____cpython.yaml index 6bfeb4b..84db628 100644 --- a/.ci_support/linux_64_c_compiler_version7cxx_compiler_version7enable_moabmoabenable_openmcopenmcfortran_compiler_version7python3.6.____cpython.yaml +++ b/.ci_support/osx_64_enable_moabmoabenable_openmcopenmcpython3.6.____cpython.yaml @@ -1,19 +1,17 @@ +MACOSX_DEPLOYMENT_TARGET: +- '10.9' c_compiler: -- gcc +- clang c_compiler_version: -- '7' -cdt_name: -- cos6 +- '11' channel_sources: - conda-forge,defaults channel_targets: - conda-forge main cxx_compiler: -- gxx +- clangxx cxx_compiler_version: -- '7' -docker_image: -- condaforge/linux-anvil-comp7 +- '11' enable_moab: - moab enable_openmc: @@ -21,11 +19,13 @@ enable_openmc: fortran_compiler: - gfortran fortran_compiler_version: -- '7' +- '9' hdf5: - 1.10.6 +macos_machine: +- x86_64-apple-darwin13.4.0 numpy: -- '1.16' +- '1.17' pin_run_as_build: python: min_pin: x.x @@ -33,7 +33,7 @@ pin_run_as_build: python: - 3.6.* *_cpython target_platform: -- linux-64 +- osx-64 zip_keys: - - c_compiler_version - cxx_compiler_version diff --git a/.ci_support/linux_64_c_compiler_version7cxx_compiler_version7enable_moabmoabenable_openmcopenmcfortran_compiler_version7python3.7.____cpython.yaml b/.ci_support/osx_64_enable_moabmoabenable_openmcopenmcpython3.7.____cpython.yaml similarity index 78% rename from .ci_support/linux_64_c_compiler_version7cxx_compiler_version7enable_moabmoabenable_openmcopenmcfortran_compiler_version7python3.7.____cpython.yaml rename to .ci_support/osx_64_enable_moabmoabenable_openmcopenmcpython3.7.____cpython.yaml index 404c9f6..5d2daae 100644 --- a/.ci_support/linux_64_c_compiler_version7cxx_compiler_version7enable_moabmoabenable_openmcopenmcfortran_compiler_version7python3.7.____cpython.yaml +++ b/.ci_support/osx_64_enable_moabmoabenable_openmcopenmcpython3.7.____cpython.yaml @@ -1,19 +1,17 @@ +MACOSX_DEPLOYMENT_TARGET: +- '10.9' c_compiler: -- gcc +- clang c_compiler_version: -- '7' -cdt_name: -- cos6 +- '11' channel_sources: - conda-forge,defaults channel_targets: - conda-forge main cxx_compiler: -- gxx +- clangxx cxx_compiler_version: -- '7' -docker_image: -- condaforge/linux-anvil-comp7 +- '11' enable_moab: - moab enable_openmc: @@ -21,11 +19,13 @@ enable_openmc: fortran_compiler: - gfortran fortran_compiler_version: -- '7' +- '9' hdf5: - 1.10.6 +macos_machine: +- x86_64-apple-darwin13.4.0 numpy: -- '1.16' +- '1.17' pin_run_as_build: python: min_pin: x.x @@ -33,7 +33,7 @@ pin_run_as_build: python: - 3.7.* *_cpython target_platform: -- linux-64 +- osx-64 zip_keys: - - c_compiler_version - cxx_compiler_version diff --git a/.ci_support/linux_64_c_compiler_version7cxx_compiler_version7enable_moabmoabenable_openmcopenmcfortran_compiler_version7python3.8.____cpython.yaml b/.ci_support/osx_64_enable_moabmoabenable_openmcopenmcpython3.8.____cpython.yaml similarity index 78% rename from .ci_support/linux_64_c_compiler_version7cxx_compiler_version7enable_moabmoabenable_openmcopenmcfortran_compiler_version7python3.8.____cpython.yaml rename to .ci_support/osx_64_enable_moabmoabenable_openmcopenmcpython3.8.____cpython.yaml index dfa8cf6..f1979d0 100644 --- a/.ci_support/linux_64_c_compiler_version7cxx_compiler_version7enable_moabmoabenable_openmcopenmcfortran_compiler_version7python3.8.____cpython.yaml +++ b/.ci_support/osx_64_enable_moabmoabenable_openmcopenmcpython3.8.____cpython.yaml @@ -1,19 +1,17 @@ +MACOSX_DEPLOYMENT_TARGET: +- '10.9' c_compiler: -- gcc +- clang c_compiler_version: -- '7' -cdt_name: -- cos6 +- '11' channel_sources: - conda-forge,defaults channel_targets: - conda-forge main cxx_compiler: -- gxx +- clangxx cxx_compiler_version: -- '7' -docker_image: -- condaforge/linux-anvil-comp7 +- '11' enable_moab: - moab enable_openmc: @@ -21,11 +19,13 @@ enable_openmc: fortran_compiler: - gfortran fortran_compiler_version: -- '7' +- '9' hdf5: - 1.10.6 +macos_machine: +- x86_64-apple-darwin13.4.0 numpy: -- '1.16' +- '1.17' pin_run_as_build: python: min_pin: x.x @@ -33,7 +33,7 @@ pin_run_as_build: python: - 3.8.* *_cpython target_platform: -- linux-64 +- osx-64 zip_keys: - - c_compiler_version - cxx_compiler_version diff --git a/.ci_support/linux_64_c_compiler_version7cxx_compiler_version7enable_moabnomoabenable_openmcnoopenmcfortran_compiler_version7python3.6.____cpython.yaml b/.ci_support/osx_64_enable_moabnomoabenable_openmcnoopenmcpython3.6.____cpython.yaml similarity index 78% rename from .ci_support/linux_64_c_compiler_version7cxx_compiler_version7enable_moabnomoabenable_openmcnoopenmcfortran_compiler_version7python3.6.____cpython.yaml rename to .ci_support/osx_64_enable_moabnomoabenable_openmcnoopenmcpython3.6.____cpython.yaml index 8152814..a2d0067 100644 --- a/.ci_support/linux_64_c_compiler_version7cxx_compiler_version7enable_moabnomoabenable_openmcnoopenmcfortran_compiler_version7python3.6.____cpython.yaml +++ b/.ci_support/osx_64_enable_moabnomoabenable_openmcnoopenmcpython3.6.____cpython.yaml @@ -1,19 +1,17 @@ +MACOSX_DEPLOYMENT_TARGET: +- '10.9' c_compiler: -- gcc +- clang c_compiler_version: -- '7' -cdt_name: -- cos6 +- '11' channel_sources: - conda-forge,defaults channel_targets: - conda-forge main cxx_compiler: -- gxx +- clangxx cxx_compiler_version: -- '7' -docker_image: -- condaforge/linux-anvil-comp7 +- '11' enable_moab: - nomoab enable_openmc: @@ -21,11 +19,13 @@ enable_openmc: fortran_compiler: - gfortran fortran_compiler_version: -- '7' +- '9' hdf5: - 1.10.6 +macos_machine: +- x86_64-apple-darwin13.4.0 numpy: -- '1.16' +- '1.17' pin_run_as_build: python: min_pin: x.x @@ -33,7 +33,7 @@ pin_run_as_build: python: - 3.6.* *_cpython target_platform: -- linux-64 +- osx-64 zip_keys: - - c_compiler_version - cxx_compiler_version diff --git a/.ci_support/linux_64_c_compiler_version7cxx_compiler_version7enable_moabnomoabenable_openmcnoopenmcfortran_compiler_version7python3.7.____cpython.yaml b/.ci_support/osx_64_enable_moabnomoabenable_openmcnoopenmcpython3.7.____cpython.yaml similarity index 78% rename from .ci_support/linux_64_c_compiler_version7cxx_compiler_version7enable_moabnomoabenable_openmcnoopenmcfortran_compiler_version7python3.7.____cpython.yaml rename to .ci_support/osx_64_enable_moabnomoabenable_openmcnoopenmcpython3.7.____cpython.yaml index 8d1d096..521b15c 100644 --- a/.ci_support/linux_64_c_compiler_version7cxx_compiler_version7enable_moabnomoabenable_openmcnoopenmcfortran_compiler_version7python3.7.____cpython.yaml +++ b/.ci_support/osx_64_enable_moabnomoabenable_openmcnoopenmcpython3.7.____cpython.yaml @@ -1,19 +1,17 @@ +MACOSX_DEPLOYMENT_TARGET: +- '10.9' c_compiler: -- gcc +- clang c_compiler_version: -- '7' -cdt_name: -- cos6 +- '11' channel_sources: - conda-forge,defaults channel_targets: - conda-forge main cxx_compiler: -- gxx +- clangxx cxx_compiler_version: -- '7' -docker_image: -- condaforge/linux-anvil-comp7 +- '11' enable_moab: - nomoab enable_openmc: @@ -21,11 +19,13 @@ enable_openmc: fortran_compiler: - gfortran fortran_compiler_version: -- '7' +- '9' hdf5: - 1.10.6 +macos_machine: +- x86_64-apple-darwin13.4.0 numpy: -- '1.16' +- '1.17' pin_run_as_build: python: min_pin: x.x @@ -33,7 +33,7 @@ pin_run_as_build: python: - 3.7.* *_cpython target_platform: -- linux-64 +- osx-64 zip_keys: - - c_compiler_version - cxx_compiler_version diff --git a/.ci_support/linux_64_c_compiler_version7cxx_compiler_version7enable_moabnomoabenable_openmcnoopenmcfortran_compiler_version7python3.8.____cpython.yaml b/.ci_support/osx_64_enable_moabnomoabenable_openmcnoopenmcpython3.8.____cpython.yaml similarity index 78% rename from .ci_support/linux_64_c_compiler_version7cxx_compiler_version7enable_moabnomoabenable_openmcnoopenmcfortran_compiler_version7python3.8.____cpython.yaml rename to .ci_support/osx_64_enable_moabnomoabenable_openmcnoopenmcpython3.8.____cpython.yaml index 105891d..9a2bc19 100644 --- a/.ci_support/linux_64_c_compiler_version7cxx_compiler_version7enable_moabnomoabenable_openmcnoopenmcfortran_compiler_version7python3.8.____cpython.yaml +++ b/.ci_support/osx_64_enable_moabnomoabenable_openmcnoopenmcpython3.8.____cpython.yaml @@ -1,19 +1,17 @@ +MACOSX_DEPLOYMENT_TARGET: +- '10.9' c_compiler: -- gcc +- clang c_compiler_version: -- '7' -cdt_name: -- cos6 +- '11' channel_sources: - conda-forge,defaults channel_targets: - conda-forge main cxx_compiler: -- gxx +- clangxx cxx_compiler_version: -- '7' -docker_image: -- condaforge/linux-anvil-comp7 +- '11' enable_moab: - nomoab enable_openmc: @@ -21,11 +19,13 @@ enable_openmc: fortran_compiler: - gfortran fortran_compiler_version: -- '7' +- '9' hdf5: - 1.10.6 +macos_machine: +- x86_64-apple-darwin13.4.0 numpy: -- '1.16' +- '1.17' pin_run_as_build: python: min_pin: x.x @@ -33,7 +33,7 @@ pin_run_as_build: python: - 3.8.* *_cpython target_platform: -- linux-64 +- osx-64 zip_keys: - - c_compiler_version - cxx_compiler_version diff --git a/.ci_support/linux_64_c_compiler_version7cxx_compiler_version7enable_moabnomoabenable_openmcopenmcfortran_compiler_version7python3.6.____cpython.yaml b/.ci_support/osx_64_enable_moabnomoabenable_openmcopenmcpython3.6.____cpython.yaml similarity index 78% rename from .ci_support/linux_64_c_compiler_version7cxx_compiler_version7enable_moabnomoabenable_openmcopenmcfortran_compiler_version7python3.6.____cpython.yaml rename to .ci_support/osx_64_enable_moabnomoabenable_openmcopenmcpython3.6.____cpython.yaml index 5a8c98f..35fbd1b 100644 --- a/.ci_support/linux_64_c_compiler_version7cxx_compiler_version7enable_moabnomoabenable_openmcopenmcfortran_compiler_version7python3.6.____cpython.yaml +++ b/.ci_support/osx_64_enable_moabnomoabenable_openmcopenmcpython3.6.____cpython.yaml @@ -1,19 +1,17 @@ +MACOSX_DEPLOYMENT_TARGET: +- '10.9' c_compiler: -- gcc +- clang c_compiler_version: -- '7' -cdt_name: -- cos6 +- '11' channel_sources: - conda-forge,defaults channel_targets: - conda-forge main cxx_compiler: -- gxx +- clangxx cxx_compiler_version: -- '7' -docker_image: -- condaforge/linux-anvil-comp7 +- '11' enable_moab: - nomoab enable_openmc: @@ -21,11 +19,13 @@ enable_openmc: fortran_compiler: - gfortran fortran_compiler_version: -- '7' +- '9' hdf5: - 1.10.6 +macos_machine: +- x86_64-apple-darwin13.4.0 numpy: -- '1.16' +- '1.17' pin_run_as_build: python: min_pin: x.x @@ -33,7 +33,7 @@ pin_run_as_build: python: - 3.6.* *_cpython target_platform: -- linux-64 +- osx-64 zip_keys: - - c_compiler_version - cxx_compiler_version diff --git a/.ci_support/linux_64_c_compiler_version7cxx_compiler_version7enable_moabnomoabenable_openmcopenmcfortran_compiler_version7python3.7.____cpython.yaml b/.ci_support/osx_64_enable_moabnomoabenable_openmcopenmcpython3.7.____cpython.yaml similarity index 78% rename from .ci_support/linux_64_c_compiler_version7cxx_compiler_version7enable_moabnomoabenable_openmcopenmcfortran_compiler_version7python3.7.____cpython.yaml rename to .ci_support/osx_64_enable_moabnomoabenable_openmcopenmcpython3.7.____cpython.yaml index 16f3b6b..1aeee0f 100644 --- a/.ci_support/linux_64_c_compiler_version7cxx_compiler_version7enable_moabnomoabenable_openmcopenmcfortran_compiler_version7python3.7.____cpython.yaml +++ b/.ci_support/osx_64_enable_moabnomoabenable_openmcopenmcpython3.7.____cpython.yaml @@ -1,19 +1,17 @@ +MACOSX_DEPLOYMENT_TARGET: +- '10.9' c_compiler: -- gcc +- clang c_compiler_version: -- '7' -cdt_name: -- cos6 +- '11' channel_sources: - conda-forge,defaults channel_targets: - conda-forge main cxx_compiler: -- gxx +- clangxx cxx_compiler_version: -- '7' -docker_image: -- condaforge/linux-anvil-comp7 +- '11' enable_moab: - nomoab enable_openmc: @@ -21,11 +19,13 @@ enable_openmc: fortran_compiler: - gfortran fortran_compiler_version: -- '7' +- '9' hdf5: - 1.10.6 +macos_machine: +- x86_64-apple-darwin13.4.0 numpy: -- '1.16' +- '1.17' pin_run_as_build: python: min_pin: x.x @@ -33,7 +33,7 @@ pin_run_as_build: python: - 3.7.* *_cpython target_platform: -- linux-64 +- osx-64 zip_keys: - - c_compiler_version - cxx_compiler_version diff --git a/.ci_support/linux_64_c_compiler_version7cxx_compiler_version7enable_moabnomoabenable_openmcopenmcfortran_compiler_version7python3.8.____cpython.yaml b/.ci_support/osx_64_enable_moabnomoabenable_openmcopenmcpython3.8.____cpython.yaml similarity index 78% rename from .ci_support/linux_64_c_compiler_version7cxx_compiler_version7enable_moabnomoabenable_openmcopenmcfortran_compiler_version7python3.8.____cpython.yaml rename to .ci_support/osx_64_enable_moabnomoabenable_openmcopenmcpython3.8.____cpython.yaml index c6436d0..2a12922 100644 --- a/.ci_support/linux_64_c_compiler_version7cxx_compiler_version7enable_moabnomoabenable_openmcopenmcfortran_compiler_version7python3.8.____cpython.yaml +++ b/.ci_support/osx_64_enable_moabnomoabenable_openmcopenmcpython3.8.____cpython.yaml @@ -1,19 +1,17 @@ +MACOSX_DEPLOYMENT_TARGET: +- '10.9' c_compiler: -- gcc +- clang c_compiler_version: -- '7' -cdt_name: -- cos6 +- '11' channel_sources: - conda-forge,defaults channel_targets: - conda-forge main cxx_compiler: -- gxx +- clangxx cxx_compiler_version: -- '7' -docker_image: -- condaforge/linux-anvil-comp7 +- '11' enable_moab: - nomoab enable_openmc: @@ -21,11 +19,13 @@ enable_openmc: fortran_compiler: - gfortran fortran_compiler_version: -- '7' +- '9' hdf5: - 1.10.6 +macos_machine: +- x86_64-apple-darwin13.4.0 numpy: -- '1.16' +- '1.17' pin_run_as_build: python: min_pin: x.x @@ -33,7 +33,7 @@ pin_run_as_build: python: - 3.8.* *_cpython target_platform: -- linux-64 +- osx-64 zip_keys: - - c_compiler_version - cxx_compiler_version diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index aa9727b..71a0686 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -6,8 +6,15 @@ # benefit from the improvement. set -xeuo pipefail -export PYTHONUNBUFFERED=1 export FEEDSTOCK_ROOT="${FEEDSTOCK_ROOT:-/home/conda/feedstock_root}" +source ${FEEDSTOCK_ROOT}/.scripts/logging_utils.sh + + +( endgroup "Start Docker" ) 2> /dev/null + +( startgroup "Configuring conda" ) 2> /dev/null + +export PYTHONUNBUFFERED=1 export RECIPE_ROOT="${RECIPE_ROOT:-/home/conda/recipe_root}" export CI_SUPPORT="${FEEDSTOCK_ROOT}/.ci_support" export CONFIG_FILE="${CI_SUPPORT}/${CONFIG}.yaml" @@ -18,8 +25,9 @@ conda-build: root-dir: ${FEEDSTOCK_ROOT}/build_artifacts CONDARC +BUILD_CMD=build -conda install --yes --quiet "conda-forge-ci-setup=3" conda-build pip -c conda-forge +conda install --yes --quiet "conda-forge-ci-setup=3" conda-build pip ${GET_BOA:-} -c conda-forge # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" @@ -30,6 +38,8 @@ source run_conda_forge_build_setup make_build_number "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" +( endgroup "Configuring conda" ) 2> /dev/null + if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then if [[ "x${BUILD_OUTPUT_ID:-}" != "x" ]]; then EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --output-id ${BUILD_OUTPUT_ID}" @@ -37,17 +47,28 @@ if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then conda debug "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ ${EXTRA_CB_OPTIONS:-} \ --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" + # Drop into an interactive shell /bin/bash else - conda build "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ + conda $BUILD_CMD "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ --suppress-variables ${EXTRA_CB_OPTIONS:-} \ --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" + ( startgroup "Validating outputs" ) 2> /dev/null + validate_recipe_outputs "${FEEDSTOCK_NAME}" + ( endgroup "Validating outputs" ) 2> /dev/null + + ( startgroup "Uploading packages" ) 2> /dev/null + if [[ "${UPLOAD_PACKAGES}" != "False" ]]; then upload_package --validate --feedstock-name="${FEEDSTOCK_NAME}" "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" fi + + ( endgroup "Uploading packages" ) 2> /dev/null fi +( startgroup "Final checks" ) 2> /dev/null + touch "${FEEDSTOCK_ROOT}/build_artifacts/conda-forge-build-done-${CONFIG}" \ No newline at end of file diff --git a/.scripts/logging_utils.sh b/.scripts/logging_utils.sh new file mode 100644 index 0000000..57bc95c --- /dev/null +++ b/.scripts/logging_utils.sh @@ -0,0 +1,35 @@ +#!/bin/bash + +# Provide a unified interface for the different logging +# utilities CI providers offer. If unavailable, provide +# a compatible fallback (e.g. bare `echo xxxxxx`). + +function startgroup { + # Start a foldable group of log lines + # Pass a single argument, quoted + case ${CI:-} in + azure ) + echo "##[group]$1";; + travis ) + echo "$1" + echo -en 'travis_fold:start:'"${1// /}"'\\r';; + github_actions ) + echo "::group::$1";; + * ) + echo "$1";; + esac +} 2> /dev/null + +function endgroup { + # End a foldable group of log lines + # Pass a single argument, quoted + + case ${CI:-} in + azure ) + echo "##[endgroup]";; + travis ) + echo -en 'travis_fold:end:'"${1// /}"'\\r';; + github_actions ) + echo "::endgroup::";; + esac +} 2> /dev/null diff --git a/.scripts/run_docker_build.sh b/.scripts/run_docker_build.sh index 87ba4db..44ad3ce 100755 --- a/.scripts/run_docker_build.sh +++ b/.scripts/run_docker_build.sh @@ -5,6 +5,10 @@ # changes to this script, consider a proposal to conda-smithy so that other feedstocks can also # benefit from the improvement. +source .scripts/logging_utils.sh + +( startgroup "Configure Docker" ) 2> /dev/null + set -xeo pipefail THISDIR="$( cd "$( dirname "$0" )" >/dev/null && pwd )" @@ -45,8 +49,12 @@ fi if [ -z "${DOCKER_IMAGE}" ]; then SHYAML_INSTALLED="$(shyaml -h || echo NO)" if [ "${SHYAML_INSTALLED}" == "NO" ]; then - echo "WARNING: DOCKER_IMAGE variable not set and shyaml not installed. Falling back to condaforge/linux-anvil-comp7" - DOCKER_IMAGE="condaforge/linux-anvil-comp7" + echo "WARNING: DOCKER_IMAGE variable not set and shyaml not installed. Trying to parse with coreutils" + DOCKER_IMAGE=$(cat .ci_support/${CONFIG}.yaml | grep '^docker_image:$' -A 1 | tail -n 1 | cut -b 3-) + if [ "${DOCKER_IMAGE}" = "" ]; then + echo "No docker_image entry found in ${CONFIG}. Falling back to condaforge/linux-anvil-comp7" + DOCKER_IMAGE="condaforge/linux-anvil-comp7" + fi else DOCKER_IMAGE="$(cat "${FEEDSTOCK_ROOT}/.ci_support/${CONFIG}.yaml" | shyaml get-value docker_image.0 condaforge/linux-anvil-comp7 )" fi @@ -62,10 +70,14 @@ if [ -z "${CI}" ]; then DOCKER_RUN_ARGS="-it ${DOCKER_RUN_ARGS}" fi +( endgroup "Configure Docker" ) 2> /dev/null + +( startgroup "Start Docker" ) 2> /dev/null + export UPLOAD_PACKAGES="${UPLOAD_PACKAGES:-True}" docker run ${DOCKER_RUN_ARGS} \ - -v "${RECIPE_ROOT}":/home/conda/recipe_root:rw,z \ - -v "${FEEDSTOCK_ROOT}":/home/conda/feedstock_root:rw,z \ + -v "${RECIPE_ROOT}":/home/conda/recipe_root:rw,z,delegated \ + -v "${FEEDSTOCK_ROOT}":/home/conda/feedstock_root:rw,z,delegated \ -e CONFIG \ -e HOST_USER_ID \ -e UPLOAD_PACKAGES \ @@ -84,4 +96,7 @@ docker run ${DOCKER_RUN_ARGS} \ /home/conda/feedstock_root/${PROVIDER_DIR}/build_steps.sh # verify that the end of the script was reached -test -f "$DONE_CANARY" \ No newline at end of file +test -f "$DONE_CANARY" + +# This closes the last group opened in `build_steps.sh` +( endgroup "Final checks" ) 2> /dev/null \ No newline at end of file diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh new file mode 100755 index 0000000..39436ec --- /dev/null +++ b/.scripts/run_osx_build.sh @@ -0,0 +1,60 @@ +#!/usr/bin/env bash + +source .scripts/logging_utils.sh + +set -xe + +( startgroup "Installing a fresh version of Miniforge" ) 2> /dev/null + +MINIFORGE_URL="https://github.com/conda-forge/miniforge/releases/latest/download" +MINIFORGE_FILE="Miniforge3-MacOSX-x86_64.sh" +curl -L -O "${MINIFORGE_URL}/${MINIFORGE_FILE}" +bash $MINIFORGE_FILE -b + +( endgroup "Installing a fresh version of Miniforge" ) 2> /dev/null + +( startgroup "Configuring conda" ) 2> /dev/null + +BUILD_CMD=build + +source ${HOME}/miniforge3/etc/profile.d/conda.sh +conda activate base + +echo -e "\n\nInstalling conda-forge-ci-setup=3 and conda-build." +conda install -n base --quiet --yes "conda-forge-ci-setup=3" conda-build pip ${GET_BOA:-} + + + +echo -e "\n\nSetting up the condarc and mangling the compiler." +setup_conda_rc ./ ./recipe ./.ci_support/${CONFIG}.yaml +mangle_compiler ./ ./recipe .ci_support/${CONFIG}.yaml + +echo -e "\n\nMangling homebrew in the CI to avoid conflicts." +/usr/bin/sudo mangle_homebrew +/usr/bin/sudo -k + +echo -e "\n\nRunning the build setup script." +source run_conda_forge_build_setup + + + +( endgroup "Configuring conda" ) 2> /dev/null + + +echo -e "\n\nMaking the build clobber file" +make_build_number ./ ./recipe ./.ci_support/${CONFIG}.yaml + +conda $BUILD_CMD ./recipe -m ./.ci_support/${CONFIG}.yaml --suppress-variables --clobber-file ./.ci_support/clobber_${CONFIG}.yaml ${EXTRA_CB_OPTIONS:-} +( startgroup "Validating outputs" ) 2> /dev/null + +validate_recipe_outputs "${FEEDSTOCK_NAME}" + +( endgroup "Validating outputs" ) 2> /dev/null + +( startgroup "Uploading packages" ) 2> /dev/null + +if [[ "${UPLOAD_PACKAGES}" != "False" ]]; then + upload_package --validate --feedstock-name="${FEEDSTOCK_NAME}" ./ ./recipe ./.ci_support/${CONFIG}.yaml +fi + +( endgroup "Uploading packages" ) 2> /dev/null \ No newline at end of file diff --git a/LICENSE.txt b/LICENSE.txt index 5f30279..ed3f451 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,5 +1,5 @@ BSD 3-clause license -Copyright (c) 2015-2020, conda-forge contributors +Copyright (c) 2015-2021, conda-forge contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/README.md b/README.md index b1a986d..3d07ace 100644 --- a/README.md +++ b/README.md @@ -27,171 +27,171 @@ Current build status - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -216,6 +216,7 @@ Installing `pyne` from the `conda-forge` channel can be achieved by adding `cond ``` conda config --add channels conda-forge +conda config --set channel_priority strict ``` Once the `conda-forge` channel has been enabled, `pyne` can be installed with: @@ -286,9 +287,9 @@ build distinct package versions. In order to produce a uniquely identifiable distribution: * If the version of a package **is not** being increased, please add or increase - the [``build/number``](https://conda.io/docs/user-guide/tasks/build-packages/define-metadata.html#build-number-and-string). + the [``build/number``](https://docs.conda.io/projects/conda-build/en/latest/resources/define-metadata.html#build-number-and-string). * If the version of a package **is** being increased, please remember to return - the [``build/number``](https://conda.io/docs/user-guide/tasks/build-packages/define-metadata.html#build-number-and-string) + the [``build/number``](https://docs.conda.io/projects/conda-build/en/latest/resources/define-metadata.html#build-number-and-string) back to 0. Feedstock Maintainers diff --git a/azure-pipelines.yml b/azure-pipelines.yml index ad85a2c..33a441c 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -3,4 +3,5 @@ # -*- mode: yaml -*- jobs: - - template: ./.azure-pipelines/azure-pipelines-linux.yml \ No newline at end of file + - template: ./.azure-pipelines/azure-pipelines-linux.yml + - template: ./.azure-pipelines/azure-pipelines-osx.yml \ No newline at end of file From cdc6a406cf813d7eea7e2ae13bb74a97b6960966 Mon Sep 17 00:00:00 2001 From: Baptiste Mouginot Date: Tue, 20 Apr 2021 18:14:33 -0500 Subject: [PATCH 4/4] update the test script --- recipe/run_test.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipe/run_test.sh b/recipe/run_test.sh index 0571a5e..a9c2cde 100644 --- a/recipe/run_test.sh +++ b/recipe/run_test.sh @@ -12,4 +12,5 @@ test -f ${PREFIX}/lib/libpyne* test -f ${PREFIX}/include/pyne/pyne.h test -f ${PREFIX}/lib/python*/site-packages/pyne/nuc_data.h5 ${PYTHON} -c "from pyne.pyne_config import pyne_conf; print(pyne_conf.NUC_DATA_PATH)" -nosetests --nocapture + +./travis-run-tests.sh
VariantStatus
linux_64_c_compiler_version7cxx_compiler_version7enable_moabmoabenable_openmcnoopenmcfortran_compiler_version7python3.6.____cpythonlinux_64_enable_moabmoabenable_openmcnoopenmcpython3.6.____cpython - variant + variant
linux_64_c_compiler_version7cxx_compiler_version7enable_moabmoabenable_openmcnoopenmcfortran_compiler_version7python3.7.____cpythonlinux_64_enable_moabmoabenable_openmcnoopenmcpython3.7.____cpython - variant + variant
linux_64_c_compiler_version7cxx_compiler_version7enable_moabmoabenable_openmcnoopenmcfortran_compiler_version7python3.8.____cpythonlinux_64_enable_moabmoabenable_openmcnoopenmcpython3.8.____cpython - variant + variant
linux_64_c_compiler_version7cxx_compiler_version7enable_moabmoabenable_openmcopenmcfortran_compiler_version7python3.6.____cpythonlinux_64_enable_moabmoabenable_openmcopenmcpython3.6.____cpython - variant + variant
linux_64_c_compiler_version7cxx_compiler_version7enable_moabmoabenable_openmcopenmcfortran_compiler_version7python3.7.____cpythonlinux_64_enable_moabmoabenable_openmcopenmcpython3.7.____cpython - variant + variant
linux_64_c_compiler_version7cxx_compiler_version7enable_moabmoabenable_openmcopenmcfortran_compiler_version7python3.8.____cpythonlinux_64_enable_moabmoabenable_openmcopenmcpython3.8.____cpython - variant + variant
linux_64_c_compiler_version7cxx_compiler_version7enable_moabnomoabenable_openmcnoopenmcfortran_compiler_version7python3.6.____cpythonlinux_64_enable_moabnomoabenable_openmcnoopenmcpython3.6.____cpython - variant + variant
linux_64_c_compiler_version7cxx_compiler_version7enable_moabnomoabenable_openmcnoopenmcfortran_compiler_version7python3.7.____cpythonlinux_64_enable_moabnomoabenable_openmcnoopenmcpython3.7.____cpython - variant + variant
linux_64_c_compiler_version7cxx_compiler_version7enable_moabnomoabenable_openmcnoopenmcfortran_compiler_version7python3.8.____cpythonlinux_64_enable_moabnomoabenable_openmcnoopenmcpython3.8.____cpython - variant + variant
linux_64_c_compiler_version7cxx_compiler_version7enable_moabnomoabenable_openmcopenmcfortran_compiler_version7python3.6.____cpythonlinux_64_enable_moabnomoabenable_openmcopenmcpython3.6.____cpython - variant + variant
linux_64_c_compiler_version7cxx_compiler_version7enable_moabnomoabenable_openmcopenmcfortran_compiler_version7python3.7.____cpythonlinux_64_enable_moabnomoabenable_openmcopenmcpython3.7.____cpython - variant + variant
linux_64_c_compiler_version7cxx_compiler_version7enable_moabnomoabenable_openmcopenmcfortran_compiler_version7python3.8.____cpythonlinux_64_enable_moabnomoabenable_openmcopenmcpython3.8.____cpython - variant + variant
linux_64_c_compiler_version9cxx_compiler_version9enable_moabmoabenable_openmcnoopenmcfortran_compiler_version9python3.6.____cpythonosx_64_enable_moabmoabenable_openmcnoopenmcpython3.6.____cpython - variant + variant
linux_64_c_compiler_version9cxx_compiler_version9enable_moabmoabenable_openmcnoopenmcfortran_compiler_version9python3.7.____cpythonosx_64_enable_moabmoabenable_openmcnoopenmcpython3.7.____cpython - variant + variant
linux_64_c_compiler_version9cxx_compiler_version9enable_moabmoabenable_openmcnoopenmcfortran_compiler_version9python3.8.____cpythonosx_64_enable_moabmoabenable_openmcnoopenmcpython3.8.____cpython - variant + variant
linux_64_c_compiler_version9cxx_compiler_version9enable_moabmoabenable_openmcopenmcfortran_compiler_version9python3.6.____cpythonosx_64_enable_moabmoabenable_openmcopenmcpython3.6.____cpython - variant + variant
linux_64_c_compiler_version9cxx_compiler_version9enable_moabmoabenable_openmcopenmcfortran_compiler_version9python3.7.____cpythonosx_64_enable_moabmoabenable_openmcopenmcpython3.7.____cpython - variant + variant
linux_64_c_compiler_version9cxx_compiler_version9enable_moabmoabenable_openmcopenmcfortran_compiler_version9python3.8.____cpythonosx_64_enable_moabmoabenable_openmcopenmcpython3.8.____cpython - variant + variant
linux_64_c_compiler_version9cxx_compiler_version9enable_moabnomoabenable_openmcnoopenmcfortran_compiler_version9python3.6.____cpythonosx_64_enable_moabnomoabenable_openmcnoopenmcpython3.6.____cpython - variant + variant
linux_64_c_compiler_version9cxx_compiler_version9enable_moabnomoabenable_openmcnoopenmcfortran_compiler_version9python3.7.____cpythonosx_64_enable_moabnomoabenable_openmcnoopenmcpython3.7.____cpython - variant + variant
linux_64_c_compiler_version9cxx_compiler_version9enable_moabnomoabenable_openmcnoopenmcfortran_compiler_version9python3.8.____cpythonosx_64_enable_moabnomoabenable_openmcnoopenmcpython3.8.____cpython - variant + variant
linux_64_c_compiler_version9cxx_compiler_version9enable_moabnomoabenable_openmcopenmcfortran_compiler_version9python3.6.____cpythonosx_64_enable_moabnomoabenable_openmcopenmcpython3.6.____cpython - variant + variant
linux_64_c_compiler_version9cxx_compiler_version9enable_moabnomoabenable_openmcopenmcfortran_compiler_version9python3.7.____cpythonosx_64_enable_moabnomoabenable_openmcopenmcpython3.7.____cpython - variant + variant
linux_64_c_compiler_version9cxx_compiler_version9enable_moabnomoabenable_openmcopenmcfortran_compiler_version9python3.8.____cpythonosx_64_enable_moabnomoabenable_openmcopenmcpython3.8.____cpython - variant + variant