From 8206cf7bd85f3afff0a9827869ee9b32e7208cea Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Thu, 7 Mar 2024 06:58:35 +1100 Subject: [PATCH 1/4] LLVM 18.1.2 --- recipe/conda_build_config.yaml | 2 +- recipe/meta.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index b4ae6f6..771f16c 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -11,7 +11,7 @@ MACOSX_DEPLOYMENT_TARGET: # [linux] version: - 16.0.6 - 17.0.6 - - 18.1.0.rc4 + - 18.1.2 # zip to avoid using rc-builds for already-released-in-conda-forge LLVM versions channel_sources: diff --git a/recipe/meta.yaml b/recipe/meta.yaml index e80a735..a750a04 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,5 +1,5 @@ {% if version is not defined %} -{% set version = "18.1.0.rc4" %} +{% set version = "18.1.2" %} {% endif %} {% set major_ver = version.split(".")[0] %} # cannot yet build libcxx 17 due to having no From fbe56e30e87a49d61dd69f932ce32dc8533a0215 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Thu, 7 Mar 2024 06:58:54 +1100 Subject: [PATCH 2/4] remove "rc-channels" --- recipe/conda_build_config.yaml | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index 771f16c..ec49339 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -13,16 +13,6 @@ version: - 17.0.6 - 18.1.2 -# zip to avoid using rc-builds for already-released-in-conda-forge LLVM versions -channel_sources: - - conda-forge - - conda-forge - - conda-forge/label/llvm_rc,conda-forge -channel_targets: - - conda-forge main - - conda-forge main - - conda-forge llvm_rc - # everything below is zipped cross_target_platform: - osx-64 @@ -51,7 +41,3 @@ zip_keys: - uname_machine - uname_kernel_release - FINAL_PYTHON_SYSCONFIGDATA_NAME - - - - version - - channel_sources - - channel_targets From 757d4d3b9a3ee8018f11a9e8cb67415d3805f327 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Thu, 21 Mar 2024 11:22:12 +1100 Subject: [PATCH 3/4] re-nest run_exports --- recipe/meta.yaml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index a750a04..f112f77 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -7,7 +7,7 @@ # so allow the last major version of libcxx {% set libcxx_major = 16 %} -{% set build_number = 10 %} +{% set build_number = 11 %} package: name: clang-compiler-activation @@ -97,6 +97,12 @@ outputs: - name: clangxx_{{ cross_target_platform }} script: install-clangxx-scripts.sh + build: + # Since transitive run_exports are not currently possible + # (here I would like the run dependency on clangxx to pull in the run_exports from it). + run_exports: + strong: + - libcxx >={{ libcxx_major }} requirements: run: - {{ pin_subpackage("clangxx_impl_" ~ cross_target_platform, exact=True) }} @@ -105,11 +111,6 @@ outputs: commands: - {{ CBUILD }}-clang++ --version - {{ macos_machine }}-clang++ --version - # Since transitive run_exports are not currently possible - # (here I would like the run dependency on clangxx to pull in the run_exports from it). - run_exports: - strong: - - libcxx >={{ libcxx_major }} - name: clang_bootstrap_{{ cross_target_platform }} script: install-clang-bootstrap.sh From 13d6b96e680e5dedca7861637e973c15fac53936 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Thu, 21 Mar 2024 11:31:49 +1100 Subject: [PATCH 4/4] MNT: Re-rendered with conda-build 24.1.2, conda-smithy 3.32.0, and conda-forge-pinning 2024.03.19.15.37.47 --- .azure-pipelines/azure-pipelines-linux.yml | 25 +++--- .azure-pipelines/azure-pipelines-osx.yml | 49 ++++++----- ...6_64-apple-darwin13.4.0version16.0.6.yaml} | 3 - ...6_64-apple-darwin13.4.0version17.0.6.yaml} | 3 - ...6_64-apple-darwin13.4.0version18.1.2.yaml} | 9 +- ...rm64-apple-darwin20.0.0version16.0.6.yaml} | 3 - ...rm64-apple-darwin20.0.0version17.0.6.yaml} | 3 - ...rm64-apple-darwin20.0.0version18.1.2.yaml} | 9 +- ...4-apple-darwin13.4.0version18.1.0.rc4.yaml | 34 ------- ...4-apple-darwin20.0.0version18.1.0.rc4.yaml | 34 ------- ...6_64-apple-darwin13.4.0version16.0.6.yaml} | 3 - ...6_64-apple-darwin13.4.0version17.0.6.yaml} | 3 - ...86_64-apple-darwin13.4.0version18.1.2.yaml | 31 +++++++ ...rm64-apple-darwin20.0.0version16.0.6.yaml} | 3 - ...rm64-apple-darwin20.0.0version17.0.6.yaml} | 3 - ...arm64-apple-darwin20.0.0version18.1.2.yaml | 31 +++++++ ...4-apple-darwin13.4.0version18.1.0.rc4.yaml | 34 ------- ...4-apple-darwin20.0.0version18.1.0.rc4.yaml | 34 ------- ...6_64-apple-darwin13.4.0version16.0.6.yaml} | 3 - ...6_64-apple-darwin13.4.0version17.0.6.yaml} | 3 - ...86_64-apple-darwin13.4.0version18.1.2.yaml | 31 +++++++ ...rm64-apple-darwin20.0.0version16.0.6.yaml} | 3 - ...rm64-apple-darwin20.0.0version17.0.6.yaml} | 3 - ...arm64-apple-darwin20.0.0version18.1.2.yaml | 31 +++++++ .scripts/build_steps.sh | 2 +- .scripts/run_osx_build.sh | 2 +- README.md | 88 +++++++++---------- 27 files changed, 214 insertions(+), 266 deletions(-) rename .ci_support/{linux_64_channel_targetsconda-forge_maincross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version16.0.6.yaml => linux_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version16.0.6.yaml} (92%) rename .ci_support/{linux_64_channel_targetsconda-forge_maincross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version17.0.6.yaml => linux_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version17.0.6.yaml} (92%) rename .ci_support/{linux_64_channel_targetsconda-forge_llvm_rccross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version18.1.0.rc4.yaml => linux_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version18.1.2.yaml} (82%) rename .ci_support/{linux_64_channel_targetsconda-forge_maincross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version16.0.6.yaml => linux_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version16.0.6.yaml} (92%) rename .ci_support/{linux_64_channel_targetsconda-forge_maincross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version17.0.6.yaml => linux_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version17.0.6.yaml} (92%) rename .ci_support/{linux_64_channel_targetsconda-forge_llvm_rccross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version18.1.0.rc4.yaml => linux_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version18.1.2.yaml} (82%) delete mode 100644 .ci_support/osx_64_channel_targetsconda-forge_llvm_rccross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version18.1.0.rc4.yaml delete mode 100644 .ci_support/osx_64_channel_targetsconda-forge_llvm_rccross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version18.1.0.rc4.yaml rename .ci_support/{osx_64_channel_targetsconda-forge_maincross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version16.0.6.yaml => osx_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version16.0.6.yaml} (91%) rename .ci_support/{osx_64_channel_targetsconda-forge_maincross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version17.0.6.yaml => osx_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version17.0.6.yaml} (91%) create mode 100644 .ci_support/osx_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version18.1.2.yaml rename .ci_support/{osx_64_channel_targetsconda-forge_maincross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version16.0.6.yaml => osx_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version16.0.6.yaml} (91%) rename .ci_support/{osx_64_channel_targetsconda-forge_maincross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version17.0.6.yaml => osx_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version17.0.6.yaml} (91%) create mode 100644 .ci_support/osx_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version18.1.2.yaml delete mode 100644 .ci_support/osx_arm64_channel_targetsconda-forge_llvm_rccross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version18.1.0.rc4.yaml delete mode 100644 .ci_support/osx_arm64_channel_targetsconda-forge_llvm_rccross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version18.1.0.rc4.yaml rename .ci_support/{osx_arm64_channel_targetsconda-forge_maincross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version16.0.6.yaml => osx_arm64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version16.0.6.yaml} (91%) rename .ci_support/{osx_arm64_channel_targetsconda-forge_maincross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version17.0.6.yaml => osx_arm64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version17.0.6.yaml} (91%) create mode 100644 .ci_support/osx_arm64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version18.1.2.yaml rename .ci_support/{osx_arm64_channel_targetsconda-forge_maincross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version16.0.6.yaml => osx_arm64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version16.0.6.yaml} (91%) rename .ci_support/{osx_arm64_channel_targetsconda-forge_maincross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version17.0.6.yaml => osx_arm64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version17.0.6.yaml} (91%) create mode 100644 .ci_support/osx_arm64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version18.1.2.yaml diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index ea546f1..8a61032 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,31 +8,32 @@ jobs: vmImage: ubuntu-latest strategy: matrix: - ? linux_64_channel_targetsconda-forge_llvm_rccross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version18.1.0.rc4 - : CONFIG: linux_64_channel_targetsconda-forge_llvm_rccross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version18.1.0.rc4 + linux_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version16.0.6: + CONFIG: linux_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version16.0.6 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - ? linux_64_channel_targetsconda-forge_llvm_rccross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version18.1.0.rc4 - : CONFIG: linux_64_channel_targetsconda-forge_llvm_rccross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version18.1.0.rc4 + linux_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version17.0.6: + CONFIG: linux_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version17.0.6 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_channel_targetsconda-forge_maincross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version16.0.6: - CONFIG: linux_64_channel_targetsconda-forge_maincross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version16.0.6 + linux_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version18.1.2: + CONFIG: linux_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version18.1.2 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_channel_targetsconda-forge_maincross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version17.0.6: - CONFIG: linux_64_channel_targetsconda-forge_maincross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version17.0.6 + linux_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version16.0.6: + CONFIG: linux_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version16.0.6 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_channel_targetsconda-forge_maincross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version16.0.6: - CONFIG: linux_64_channel_targetsconda-forge_maincross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version16.0.6 + linux_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version17.0.6: + CONFIG: linux_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version17.0.6 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_channel_targetsconda-forge_maincross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version17.0.6: - CONFIG: linux_64_channel_targetsconda-forge_maincross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version17.0.6 + linux_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version18.1.2: + CONFIG: linux_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version18.1.2 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 timeoutInMinutes: 360 + variables: {} steps: # configure qemu binfmt-misc running. This allows us to run docker containers diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 174ff91..9c0b35e 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -8,43 +8,44 @@ jobs: vmImage: macOS-11 strategy: matrix: - ? osx_64_channel_targetsconda-forge_llvm_rccross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version18.1.0.rc4 - : CONFIG: osx_64_channel_targetsconda-forge_llvm_rccross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version18.1.0.rc4 + osx_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version16.0.6: + CONFIG: osx_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version16.0.6 UPLOAD_PACKAGES: 'True' - ? osx_64_channel_targetsconda-forge_llvm_rccross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version18.1.0.rc4 - : CONFIG: osx_64_channel_targetsconda-forge_llvm_rccross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version18.1.0.rc4 + osx_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version17.0.6: + CONFIG: osx_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version17.0.6 UPLOAD_PACKAGES: 'True' - osx_64_channel_targetsconda-forge_maincross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version16.0.6: - CONFIG: osx_64_channel_targetsconda-forge_maincross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version16.0.6 + osx_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version18.1.2: + CONFIG: osx_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version18.1.2 UPLOAD_PACKAGES: 'True' - osx_64_channel_targetsconda-forge_maincross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version17.0.6: - CONFIG: osx_64_channel_targetsconda-forge_maincross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version17.0.6 + osx_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version16.0.6: + CONFIG: osx_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version16.0.6 UPLOAD_PACKAGES: 'True' - osx_64_channel_targetsconda-forge_maincross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version16.0.6: - CONFIG: osx_64_channel_targetsconda-forge_maincross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version16.0.6 + osx_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version17.0.6: + CONFIG: osx_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version17.0.6 UPLOAD_PACKAGES: 'True' - osx_64_channel_targetsconda-forge_maincross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version17.0.6: - CONFIG: osx_64_channel_targetsconda-forge_maincross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version17.0.6 + osx_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version18.1.2: + CONFIG: osx_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version18.1.2 UPLOAD_PACKAGES: 'True' - ? osx_arm64_channel_targetsconda-forge_llvm_rccross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version18.1.0.rc4 - : CONFIG: osx_arm64_channel_targetsconda-forge_llvm_rccross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version18.1.0.rc4 + osx_arm64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version16.0.6: + CONFIG: osx_arm64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version16.0.6 UPLOAD_PACKAGES: 'True' - ? osx_arm64_channel_targetsconda-forge_llvm_rccross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version18.1.0.rc4 - : CONFIG: osx_arm64_channel_targetsconda-forge_llvm_rccross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version18.1.0.rc4 + osx_arm64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version17.0.6: + CONFIG: osx_arm64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version17.0.6 UPLOAD_PACKAGES: 'True' - osx_arm64_channel_targetsconda-forge_maincross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version16.0.6: - CONFIG: osx_arm64_channel_targetsconda-forge_maincross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version16.0.6 + osx_arm64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version18.1.2: + CONFIG: osx_arm64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version18.1.2 UPLOAD_PACKAGES: 'True' - osx_arm64_channel_targetsconda-forge_maincross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version17.0.6: - CONFIG: osx_arm64_channel_targetsconda-forge_maincross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version17.0.6 + osx_arm64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version16.0.6: + CONFIG: osx_arm64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version16.0.6 UPLOAD_PACKAGES: 'True' - osx_arm64_channel_targetsconda-forge_maincross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version16.0.6: - CONFIG: osx_arm64_channel_targetsconda-forge_maincross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version16.0.6 + osx_arm64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version17.0.6: + CONFIG: osx_arm64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version17.0.6 UPLOAD_PACKAGES: 'True' - osx_arm64_channel_targetsconda-forge_maincross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version17.0.6: - CONFIG: osx_arm64_channel_targetsconda-forge_maincross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version17.0.6 + osx_arm64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version18.1.2: + CONFIG: osx_arm64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version18.1.2 UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 + variables: {} steps: # TODO: Fast finish on azure pipelines? diff --git a/.ci_support/linux_64_channel_targetsconda-forge_maincross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version16.0.6.yaml b/.ci_support/linux_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version16.0.6.yaml similarity index 92% rename from .ci_support/linux_64_channel_targetsconda-forge_maincross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version16.0.6.yaml rename to .ci_support/linux_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version16.0.6.yaml index cfff5f9..bad378b 100644 --- a/.ci_support/linux_64_channel_targetsconda-forge_maincross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version16.0.6.yaml +++ b/.ci_support/linux_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version16.0.6.yaml @@ -33,6 +33,3 @@ zip_keys: - uname_machine - uname_kernel_release - FINAL_PYTHON_SYSCONFIGDATA_NAME -- - version - - channel_sources - - channel_targets diff --git a/.ci_support/linux_64_channel_targetsconda-forge_maincross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version17.0.6.yaml b/.ci_support/linux_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version17.0.6.yaml similarity index 92% rename from .ci_support/linux_64_channel_targetsconda-forge_maincross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version17.0.6.yaml rename to .ci_support/linux_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version17.0.6.yaml index 295d1eb..ca09d7e 100644 --- a/.ci_support/linux_64_channel_targetsconda-forge_maincross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version17.0.6.yaml +++ b/.ci_support/linux_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version17.0.6.yaml @@ -33,6 +33,3 @@ zip_keys: - uname_machine - uname_kernel_release - FINAL_PYTHON_SYSCONFIGDATA_NAME -- - version - - channel_sources - - channel_targets diff --git a/.ci_support/linux_64_channel_targetsconda-forge_llvm_rccross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version18.1.0.rc4.yaml b/.ci_support/linux_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version18.1.2.yaml similarity index 82% rename from .ci_support/linux_64_channel_targetsconda-forge_llvm_rccross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version18.1.0.rc4.yaml rename to .ci_support/linux_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version18.1.2.yaml index 931d4a2..90bce53 100644 --- a/.ci_support/linux_64_channel_targetsconda-forge_llvm_rccross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version18.1.0.rc4.yaml +++ b/.ci_support/linux_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version18.1.2.yaml @@ -7,9 +7,9 @@ MACOSX_DEPLOYMENT_TARGET: cdt_name: - cos6 channel_sources: -- conda-forge/label/llvm_rc,conda-forge +- conda-forge channel_targets: -- conda-forge llvm_rc +- conda-forge main cross_target_platform: - osx-64 docker_image: @@ -25,7 +25,7 @@ uname_kernel_release: uname_machine: - x86_64 version: -- 18.1.0.rc4 +- 18.1.2 zip_keys: - - cross_target_platform - macos_machine @@ -33,6 +33,3 @@ zip_keys: - uname_machine - uname_kernel_release - FINAL_PYTHON_SYSCONFIGDATA_NAME -- - version - - channel_sources - - channel_targets diff --git a/.ci_support/linux_64_channel_targetsconda-forge_maincross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version16.0.6.yaml b/.ci_support/linux_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version16.0.6.yaml similarity index 92% rename from .ci_support/linux_64_channel_targetsconda-forge_maincross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version16.0.6.yaml rename to .ci_support/linux_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version16.0.6.yaml index 9287831..829761c 100644 --- a/.ci_support/linux_64_channel_targetsconda-forge_maincross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version16.0.6.yaml +++ b/.ci_support/linux_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version16.0.6.yaml @@ -33,6 +33,3 @@ zip_keys: - uname_machine - uname_kernel_release - FINAL_PYTHON_SYSCONFIGDATA_NAME -- - version - - channel_sources - - channel_targets diff --git a/.ci_support/linux_64_channel_targetsconda-forge_maincross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version17.0.6.yaml b/.ci_support/linux_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version17.0.6.yaml similarity index 92% rename from .ci_support/linux_64_channel_targetsconda-forge_maincross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version17.0.6.yaml rename to .ci_support/linux_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version17.0.6.yaml index 5f9207c..736c82a 100644 --- a/.ci_support/linux_64_channel_targetsconda-forge_maincross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version17.0.6.yaml +++ b/.ci_support/linux_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version17.0.6.yaml @@ -33,6 +33,3 @@ zip_keys: - uname_machine - uname_kernel_release - FINAL_PYTHON_SYSCONFIGDATA_NAME -- - version - - channel_sources - - channel_targets diff --git a/.ci_support/linux_64_channel_targetsconda-forge_llvm_rccross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version18.1.0.rc4.yaml b/.ci_support/linux_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version18.1.2.yaml similarity index 82% rename from .ci_support/linux_64_channel_targetsconda-forge_llvm_rccross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version18.1.0.rc4.yaml rename to .ci_support/linux_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version18.1.2.yaml index d1b60da..9864a5a 100644 --- a/.ci_support/linux_64_channel_targetsconda-forge_llvm_rccross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version18.1.0.rc4.yaml +++ b/.ci_support/linux_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version18.1.2.yaml @@ -7,9 +7,9 @@ MACOSX_DEPLOYMENT_TARGET: cdt_name: - cos6 channel_sources: -- conda-forge/label/llvm_rc,conda-forge +- conda-forge channel_targets: -- conda-forge llvm_rc +- conda-forge main cross_target_platform: - osx-arm64 docker_image: @@ -25,7 +25,7 @@ uname_kernel_release: uname_machine: - arm64 version: -- 18.1.0.rc4 +- 18.1.2 zip_keys: - - cross_target_platform - macos_machine @@ -33,6 +33,3 @@ zip_keys: - uname_machine - uname_kernel_release - FINAL_PYTHON_SYSCONFIGDATA_NAME -- - version - - channel_sources - - channel_targets diff --git a/.ci_support/osx_64_channel_targetsconda-forge_llvm_rccross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version18.1.0.rc4.yaml b/.ci_support/osx_64_channel_targetsconda-forge_llvm_rccross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version18.1.0.rc4.yaml deleted file mode 100644 index 9ff0f78..0000000 --- a/.ci_support/osx_64_channel_targetsconda-forge_llvm_rccross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version18.1.0.rc4.yaml +++ /dev/null @@ -1,34 +0,0 @@ -CBUILD: -- x86_64-apple-darwin13.4.0 -FINAL_PYTHON_SYSCONFIGDATA_NAME: -- _sysconfigdata_x86_64_apple_darwin13_4_0 -MACOSX_DEPLOYMENT_TARGET: -- '10.9' -channel_sources: -- conda-forge/label/llvm_rc,conda-forge -channel_targets: -- conda-forge llvm_rc -cross_target_platform: -- osx-64 -macos_machine: -- x86_64-apple-darwin13.4.0 -meson_cpu_family: -- x86_64 -target_platform: -- osx-64 -uname_kernel_release: -- 13.4.0 -uname_machine: -- x86_64 -version: -- 18.1.0.rc4 -zip_keys: -- - cross_target_platform - - macos_machine - - meson_cpu_family - - uname_machine - - uname_kernel_release - - FINAL_PYTHON_SYSCONFIGDATA_NAME -- - version - - channel_sources - - channel_targets diff --git a/.ci_support/osx_64_channel_targetsconda-forge_llvm_rccross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version18.1.0.rc4.yaml b/.ci_support/osx_64_channel_targetsconda-forge_llvm_rccross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version18.1.0.rc4.yaml deleted file mode 100644 index 74d596f..0000000 --- a/.ci_support/osx_64_channel_targetsconda-forge_llvm_rccross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version18.1.0.rc4.yaml +++ /dev/null @@ -1,34 +0,0 @@ -CBUILD: -- x86_64-apple-darwin13.4.0 -FINAL_PYTHON_SYSCONFIGDATA_NAME: -- _sysconfigdata_arm64_apple_darwin20_0_0 -MACOSX_DEPLOYMENT_TARGET: -- '10.9' -channel_sources: -- conda-forge/label/llvm_rc,conda-forge -channel_targets: -- conda-forge llvm_rc -cross_target_platform: -- osx-arm64 -macos_machine: -- arm64-apple-darwin20.0.0 -meson_cpu_family: -- aarch64 -target_platform: -- osx-64 -uname_kernel_release: -- 20.0.0 -uname_machine: -- arm64 -version: -- 18.1.0.rc4 -zip_keys: -- - cross_target_platform - - macos_machine - - meson_cpu_family - - uname_machine - - uname_kernel_release - - FINAL_PYTHON_SYSCONFIGDATA_NAME -- - version - - channel_sources - - channel_targets diff --git a/.ci_support/osx_64_channel_targetsconda-forge_maincross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version16.0.6.yaml b/.ci_support/osx_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version16.0.6.yaml similarity index 91% rename from .ci_support/osx_64_channel_targetsconda-forge_maincross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version16.0.6.yaml rename to .ci_support/osx_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version16.0.6.yaml index bb4daf3..7d340c9 100644 --- a/.ci_support/osx_64_channel_targetsconda-forge_maincross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version16.0.6.yaml +++ b/.ci_support/osx_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version16.0.6.yaml @@ -29,6 +29,3 @@ zip_keys: - uname_machine - uname_kernel_release - FINAL_PYTHON_SYSCONFIGDATA_NAME -- - version - - channel_sources - - channel_targets diff --git a/.ci_support/osx_64_channel_targetsconda-forge_maincross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version17.0.6.yaml b/.ci_support/osx_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version17.0.6.yaml similarity index 91% rename from .ci_support/osx_64_channel_targetsconda-forge_maincross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version17.0.6.yaml rename to .ci_support/osx_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version17.0.6.yaml index ab193ae..7c816bd 100644 --- a/.ci_support/osx_64_channel_targetsconda-forge_maincross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version17.0.6.yaml +++ b/.ci_support/osx_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version17.0.6.yaml @@ -29,6 +29,3 @@ zip_keys: - uname_machine - uname_kernel_release - FINAL_PYTHON_SYSCONFIGDATA_NAME -- - version - - channel_sources - - channel_targets diff --git a/.ci_support/osx_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version18.1.2.yaml b/.ci_support/osx_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version18.1.2.yaml new file mode 100644 index 0000000..ed49d18 --- /dev/null +++ b/.ci_support/osx_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version18.1.2.yaml @@ -0,0 +1,31 @@ +CBUILD: +- x86_64-apple-darwin13.4.0 +FINAL_PYTHON_SYSCONFIGDATA_NAME: +- _sysconfigdata_x86_64_apple_darwin13_4_0 +MACOSX_DEPLOYMENT_TARGET: +- '10.9' +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cross_target_platform: +- osx-64 +macos_machine: +- x86_64-apple-darwin13.4.0 +meson_cpu_family: +- x86_64 +target_platform: +- osx-64 +uname_kernel_release: +- 13.4.0 +uname_machine: +- x86_64 +version: +- 18.1.2 +zip_keys: +- - cross_target_platform + - macos_machine + - meson_cpu_family + - uname_machine + - uname_kernel_release + - FINAL_PYTHON_SYSCONFIGDATA_NAME diff --git a/.ci_support/osx_64_channel_targetsconda-forge_maincross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version16.0.6.yaml b/.ci_support/osx_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version16.0.6.yaml similarity index 91% rename from .ci_support/osx_64_channel_targetsconda-forge_maincross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version16.0.6.yaml rename to .ci_support/osx_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version16.0.6.yaml index c5be080..8b27ddc 100644 --- a/.ci_support/osx_64_channel_targetsconda-forge_maincross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version16.0.6.yaml +++ b/.ci_support/osx_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version16.0.6.yaml @@ -29,6 +29,3 @@ zip_keys: - uname_machine - uname_kernel_release - FINAL_PYTHON_SYSCONFIGDATA_NAME -- - version - - channel_sources - - channel_targets diff --git a/.ci_support/osx_64_channel_targetsconda-forge_maincross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version17.0.6.yaml b/.ci_support/osx_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version17.0.6.yaml similarity index 91% rename from .ci_support/osx_64_channel_targetsconda-forge_maincross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version17.0.6.yaml rename to .ci_support/osx_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version17.0.6.yaml index c8055b1..6a845fd 100644 --- a/.ci_support/osx_64_channel_targetsconda-forge_maincross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version17.0.6.yaml +++ b/.ci_support/osx_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version17.0.6.yaml @@ -29,6 +29,3 @@ zip_keys: - uname_machine - uname_kernel_release - FINAL_PYTHON_SYSCONFIGDATA_NAME -- - version - - channel_sources - - channel_targets diff --git a/.ci_support/osx_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version18.1.2.yaml b/.ci_support/osx_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version18.1.2.yaml new file mode 100644 index 0000000..7deadf4 --- /dev/null +++ b/.ci_support/osx_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version18.1.2.yaml @@ -0,0 +1,31 @@ +CBUILD: +- x86_64-apple-darwin13.4.0 +FINAL_PYTHON_SYSCONFIGDATA_NAME: +- _sysconfigdata_arm64_apple_darwin20_0_0 +MACOSX_DEPLOYMENT_TARGET: +- '10.9' +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cross_target_platform: +- osx-arm64 +macos_machine: +- arm64-apple-darwin20.0.0 +meson_cpu_family: +- aarch64 +target_platform: +- osx-64 +uname_kernel_release: +- 20.0.0 +uname_machine: +- arm64 +version: +- 18.1.2 +zip_keys: +- - cross_target_platform + - macos_machine + - meson_cpu_family + - uname_machine + - uname_kernel_release + - FINAL_PYTHON_SYSCONFIGDATA_NAME diff --git a/.ci_support/osx_arm64_channel_targetsconda-forge_llvm_rccross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version18.1.0.rc4.yaml b/.ci_support/osx_arm64_channel_targetsconda-forge_llvm_rccross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version18.1.0.rc4.yaml deleted file mode 100644 index 2f0a7d6..0000000 --- a/.ci_support/osx_arm64_channel_targetsconda-forge_llvm_rccross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version18.1.0.rc4.yaml +++ /dev/null @@ -1,34 +0,0 @@ -CBUILD: -- arm64-apple-darwin20.0.0 -FINAL_PYTHON_SYSCONFIGDATA_NAME: -- _sysconfigdata_x86_64_apple_darwin13_4_0 -MACOSX_DEPLOYMENT_TARGET: -- '11.0' -channel_sources: -- conda-forge/label/llvm_rc,conda-forge -channel_targets: -- conda-forge llvm_rc -cross_target_platform: -- osx-64 -macos_machine: -- x86_64-apple-darwin13.4.0 -meson_cpu_family: -- x86_64 -target_platform: -- osx-arm64 -uname_kernel_release: -- 13.4.0 -uname_machine: -- x86_64 -version: -- 18.1.0.rc4 -zip_keys: -- - cross_target_platform - - macos_machine - - meson_cpu_family - - uname_machine - - uname_kernel_release - - FINAL_PYTHON_SYSCONFIGDATA_NAME -- - version - - channel_sources - - channel_targets diff --git a/.ci_support/osx_arm64_channel_targetsconda-forge_llvm_rccross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version18.1.0.rc4.yaml b/.ci_support/osx_arm64_channel_targetsconda-forge_llvm_rccross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version18.1.0.rc4.yaml deleted file mode 100644 index 938d056..0000000 --- a/.ci_support/osx_arm64_channel_targetsconda-forge_llvm_rccross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version18.1.0.rc4.yaml +++ /dev/null @@ -1,34 +0,0 @@ -CBUILD: -- arm64-apple-darwin20.0.0 -FINAL_PYTHON_SYSCONFIGDATA_NAME: -- _sysconfigdata_arm64_apple_darwin20_0_0 -MACOSX_DEPLOYMENT_TARGET: -- '11.0' -channel_sources: -- conda-forge/label/llvm_rc,conda-forge -channel_targets: -- conda-forge llvm_rc -cross_target_platform: -- osx-arm64 -macos_machine: -- arm64-apple-darwin20.0.0 -meson_cpu_family: -- aarch64 -target_platform: -- osx-arm64 -uname_kernel_release: -- 20.0.0 -uname_machine: -- arm64 -version: -- 18.1.0.rc4 -zip_keys: -- - cross_target_platform - - macos_machine - - meson_cpu_family - - uname_machine - - uname_kernel_release - - FINAL_PYTHON_SYSCONFIGDATA_NAME -- - version - - channel_sources - - channel_targets diff --git a/.ci_support/osx_arm64_channel_targetsconda-forge_maincross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version16.0.6.yaml b/.ci_support/osx_arm64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version16.0.6.yaml similarity index 91% rename from .ci_support/osx_arm64_channel_targetsconda-forge_maincross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version16.0.6.yaml rename to .ci_support/osx_arm64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version16.0.6.yaml index 3d8c439..b87999f 100644 --- a/.ci_support/osx_arm64_channel_targetsconda-forge_maincross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version16.0.6.yaml +++ b/.ci_support/osx_arm64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version16.0.6.yaml @@ -29,6 +29,3 @@ zip_keys: - uname_machine - uname_kernel_release - FINAL_PYTHON_SYSCONFIGDATA_NAME -- - version - - channel_sources - - channel_targets diff --git a/.ci_support/osx_arm64_channel_targetsconda-forge_maincross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version17.0.6.yaml b/.ci_support/osx_arm64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version17.0.6.yaml similarity index 91% rename from .ci_support/osx_arm64_channel_targetsconda-forge_maincross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version17.0.6.yaml rename to .ci_support/osx_arm64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version17.0.6.yaml index fd3f49b..d64f784 100644 --- a/.ci_support/osx_arm64_channel_targetsconda-forge_maincross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version17.0.6.yaml +++ b/.ci_support/osx_arm64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version17.0.6.yaml @@ -29,6 +29,3 @@ zip_keys: - uname_machine - uname_kernel_release - FINAL_PYTHON_SYSCONFIGDATA_NAME -- - version - - channel_sources - - channel_targets diff --git a/.ci_support/osx_arm64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version18.1.2.yaml b/.ci_support/osx_arm64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version18.1.2.yaml new file mode 100644 index 0000000..24b231b --- /dev/null +++ b/.ci_support/osx_arm64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version18.1.2.yaml @@ -0,0 +1,31 @@ +CBUILD: +- arm64-apple-darwin20.0.0 +FINAL_PYTHON_SYSCONFIGDATA_NAME: +- _sysconfigdata_x86_64_apple_darwin13_4_0 +MACOSX_DEPLOYMENT_TARGET: +- '11.0' +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cross_target_platform: +- osx-64 +macos_machine: +- x86_64-apple-darwin13.4.0 +meson_cpu_family: +- x86_64 +target_platform: +- osx-arm64 +uname_kernel_release: +- 13.4.0 +uname_machine: +- x86_64 +version: +- 18.1.2 +zip_keys: +- - cross_target_platform + - macos_machine + - meson_cpu_family + - uname_machine + - uname_kernel_release + - FINAL_PYTHON_SYSCONFIGDATA_NAME diff --git a/.ci_support/osx_arm64_channel_targetsconda-forge_maincross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version16.0.6.yaml b/.ci_support/osx_arm64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version16.0.6.yaml similarity index 91% rename from .ci_support/osx_arm64_channel_targetsconda-forge_maincross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version16.0.6.yaml rename to .ci_support/osx_arm64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version16.0.6.yaml index b015a9f..f9573d0 100644 --- a/.ci_support/osx_arm64_channel_targetsconda-forge_maincross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version16.0.6.yaml +++ b/.ci_support/osx_arm64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version16.0.6.yaml @@ -29,6 +29,3 @@ zip_keys: - uname_machine - uname_kernel_release - FINAL_PYTHON_SYSCONFIGDATA_NAME -- - version - - channel_sources - - channel_targets diff --git a/.ci_support/osx_arm64_channel_targetsconda-forge_maincross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version17.0.6.yaml b/.ci_support/osx_arm64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version17.0.6.yaml similarity index 91% rename from .ci_support/osx_arm64_channel_targetsconda-forge_maincross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version17.0.6.yaml rename to .ci_support/osx_arm64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version17.0.6.yaml index 5b2480f..9fce86d 100644 --- a/.ci_support/osx_arm64_channel_targetsconda-forge_maincross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version17.0.6.yaml +++ b/.ci_support/osx_arm64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version17.0.6.yaml @@ -29,6 +29,3 @@ zip_keys: - uname_machine - uname_kernel_release - FINAL_PYTHON_SYSCONFIGDATA_NAME -- - version - - channel_sources - - channel_targets diff --git a/.ci_support/osx_arm64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version18.1.2.yaml b/.ci_support/osx_arm64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version18.1.2.yaml new file mode 100644 index 0000000..1342e14 --- /dev/null +++ b/.ci_support/osx_arm64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version18.1.2.yaml @@ -0,0 +1,31 @@ +CBUILD: +- arm64-apple-darwin20.0.0 +FINAL_PYTHON_SYSCONFIGDATA_NAME: +- _sysconfigdata_arm64_apple_darwin20_0_0 +MACOSX_DEPLOYMENT_TARGET: +- '11.0' +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cross_target_platform: +- osx-arm64 +macos_machine: +- arm64-apple-darwin20.0.0 +meson_cpu_family: +- aarch64 +target_platform: +- osx-arm64 +uname_kernel_release: +- 20.0.0 +uname_machine: +- arm64 +version: +- 18.1.2 +zip_keys: +- - cross_target_platform + - macos_machine + - meson_cpu_family + - uname_machine + - uname_kernel_release + - FINAL_PYTHON_SYSCONFIGDATA_NAME diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 9121002..899ba03 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -68,7 +68,7 @@ if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then # Drop into an interactive shell /bin/bash else - conda build "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ + conda-build "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ --suppress-variables ${EXTRA_CB_OPTIONS:-} \ --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" \ --extra-meta flow_run_id="${flow_run_id:-}" remote_url="${remote_url:-}" sha="${sha:-}" diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 16daa69..07dff21 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -81,7 +81,7 @@ else EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --no-test" fi - conda build ./recipe -m ./.ci_support/${CONFIG}.yaml \ + conda-build ./recipe -m ./.ci_support/${CONFIG}.yaml \ --suppress-variables ${EXTRA_CB_OPTIONS:-} \ --clobber-file ./.ci_support/clobber_${CONFIG}.yaml \ --extra-meta flow_run_id="$flow_run_id" remote_url="$remote_url" sha="$sha" diff --git a/README.md b/README.md index c141810..1bfefa7 100644 --- a/README.md +++ b/README.md @@ -49,129 +49,129 @@ Current build status - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -201,14 +201,14 @@ Current release info Installing clang-compiler-activation ==================================== -Installing `clang-compiler-activation` from the `conda-forge/label/llvm_rc` channel can be achieved by adding `conda-forge/label/llvm_rc` to your channels with: +Installing `clang-compiler-activation` from the `conda-forge` channel can be achieved by adding `conda-forge` to your channels with: ``` -conda config --add channels conda-forge/label/llvm_rc +conda config --add channels conda-forge conda config --set channel_priority strict ``` -Once the `conda-forge/label/llvm_rc` channel has been enabled, `clang_bootstrap_osx-64, clang_bootstrap_osx-arm64, clang_impl_osx-64, clang_impl_osx-arm64, clang_osx-64, clang_osx-arm64, clangxx_impl_osx-64, clangxx_impl_osx-arm64, clangxx_osx-64, clangxx_osx-arm64` can be installed with `conda`: +Once the `conda-forge` channel has been enabled, `clang_bootstrap_osx-64, clang_bootstrap_osx-arm64, clang_impl_osx-64, clang_impl_osx-arm64, clang_osx-64, clang_osx-arm64, clangxx_impl_osx-64, clangxx_impl_osx-arm64, clangxx_osx-64, clangxx_osx-arm64` can be installed with `conda`: ``` conda install clang_bootstrap_osx-64 clang_bootstrap_osx-arm64 clang_impl_osx-64 clang_impl_osx-arm64 clang_osx-64 clang_osx-arm64 clangxx_impl_osx-64 clangxx_impl_osx-arm64 clangxx_osx-64 clangxx_osx-arm64 @@ -223,26 +223,26 @@ mamba install clang_bootstrap_osx-64 clang_bootstrap_osx-arm64 clang_impl_osx-64 It is possible to list all of the versions of `clang_bootstrap_osx-64` available on your platform with `conda`: ``` -conda search clang_bootstrap_osx-64 --channel conda-forge/label/llvm_rc +conda search clang_bootstrap_osx-64 --channel conda-forge ``` or with `mamba`: ``` -mamba search clang_bootstrap_osx-64 --channel conda-forge/label/llvm_rc +mamba search clang_bootstrap_osx-64 --channel conda-forge ``` Alternatively, `mamba repoquery` may provide more information: ``` # Search all versions available on your platform: -mamba repoquery search clang_bootstrap_osx-64 --channel conda-forge/label/llvm_rc +mamba repoquery search clang_bootstrap_osx-64 --channel conda-forge # List packages depending on `clang_bootstrap_osx-64`: -mamba repoquery whoneeds clang_bootstrap_osx-64 --channel conda-forge/label/llvm_rc +mamba repoquery whoneeds clang_bootstrap_osx-64 --channel conda-forge # List dependencies of `clang_bootstrap_osx-64`: -mamba repoquery depends clang_bootstrap_osx-64 --channel conda-forge/label/llvm_rc +mamba repoquery depends clang_bootstrap_osx-64 --channel conda-forge ```
VariantStatus
linux_64_channel_targetsconda-forge_llvm_rccross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version18.1.0.rc4linux_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version16.0.6 - variant + variant
linux_64_channel_targetsconda-forge_llvm_rccross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version18.1.0.rc4linux_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version17.0.6 - variant + variant
linux_64_channel_targetsconda-forge_maincross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version16.0.6linux_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version18.1.2 - variant + variant
linux_64_channel_targetsconda-forge_maincross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version17.0.6linux_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version16.0.6 - variant + variant
linux_64_channel_targetsconda-forge_maincross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version16.0.6linux_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version17.0.6 - variant + variant
linux_64_channel_targetsconda-forge_maincross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version17.0.6linux_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version18.1.2 - variant + variant
osx_64_channel_targetsconda-forge_llvm_rccross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version18.1.0.rc4osx_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version16.0.6 - variant + variant
osx_64_channel_targetsconda-forge_llvm_rccross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version18.1.0.rc4osx_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version17.0.6 - variant + variant
osx_64_channel_targetsconda-forge_maincross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version16.0.6osx_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version18.1.2 - variant + variant
osx_64_channel_targetsconda-forge_maincross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version17.0.6osx_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version16.0.6 - variant + variant
osx_64_channel_targetsconda-forge_maincross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version16.0.6osx_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version17.0.6 - variant + variant
osx_64_channel_targetsconda-forge_maincross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version17.0.6osx_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version18.1.2 - variant + variant
osx_arm64_channel_targetsconda-forge_llvm_rccross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version18.1.0.rc4osx_arm64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version16.0.6 - variant + variant
osx_arm64_channel_targetsconda-forge_llvm_rccross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version18.1.0.rc4osx_arm64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version17.0.6 - variant + variant
osx_arm64_channel_targetsconda-forge_maincross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version16.0.6osx_arm64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version18.1.2 - variant + variant
osx_arm64_channel_targetsconda-forge_maincross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version17.0.6osx_arm64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version16.0.6 - variant + variant
osx_arm64_channel_targetsconda-forge_maincross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version16.0.6osx_arm64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version17.0.6 - variant + variant
osx_arm64_channel_targetsconda-forge_maincross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version17.0.6osx_arm64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version18.1.2 - variant + variant