From a58dcf903d233b5c733af71c8fa206856f37cdc7 Mon Sep 17 00:00:00 2001 From: "Billy K. Poon" Date: Sun, 30 May 2021 18:26:26 -0700 Subject: [PATCH 1/5] Switch macOS SDK to 11.0 for Python 3.8 This is to match the switch for Python 3.8 from https://github.com/conda-forge/python-feedstock/commit/da95584347c061218cc2f2795522437e8ca26460 --- .ci_support/osx_64_numpy1.16python3.8.____cpython.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.ci_support/osx_64_numpy1.16python3.8.____cpython.yaml b/.ci_support/osx_64_numpy1.16python3.8.____cpython.yaml index 5ab9197b..f98588e1 100644 --- a/.ci_support/osx_64_numpy1.16python3.8.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.16python3.8.____cpython.yaml @@ -1,5 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: - '10.9' +MACOSX_SDK_VERSION: +- '11.0' channel_sources: - conda-forge,defaults channel_targets: From e91d5e699b89d570451c1d3cc489d5d0aa7d05d1 Mon Sep 17 00:00:00 2001 From: "Billy K. Poon" Date: Sun, 30 May 2021 18:40:42 -0700 Subject: [PATCH 2/5] Add store_build_artifacts for Azure --- conda-forge.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/conda-forge.yml b/conda-forge.yml index 26ceb378..5376af6f 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -1,3 +1,4 @@ +azure: {store_build_artifacts: true} build_platform: {osx_arm64: osx_64} conda_forge_output_validation: true provider: {linux_aarch64: default, linux_ppc64le: default, win: azure} From 346f3be2c765945b39781ded04c415e8009bb3e1 Mon Sep 17 00:00:00 2001 From: "Billy K. Poon" Date: Mon, 31 May 2021 15:41:38 -0700 Subject: [PATCH 3/5] Switch to using artifactory as bintray is going away --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index a1b0da40..4a02f62d 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -7,7 +7,7 @@ package: source: fn: {{ filename }} - url: https://dl.bintray.com/boostorg/release/{{ version }}/source/{{ filename }} + url: https://boostorg.jfrog.io/artifactory/main/release/{{ version }}/source/{{ filename }} sha256: 83bfc1507731a0906e387fc28b7ef5417d591429e51e788417fe9ff025e116b1 patches: # related to https://github.com/boostorg/build/pull/291 From 54158a99bf6eb4ca89edcdb044218085dbeada10 Mon Sep 17 00:00:00 2001 From: "Billy K. Poon" Date: Mon, 31 May 2021 16:49:20 -0700 Subject: [PATCH 4/5] MNT: Re-rendered with conda-build 3.21.4, conda-smithy 3.10.1, and conda-forge-pinning 2021.05.31.20.14.01 --- .azure-pipelines/azure-pipelines-linux.yml | 27 ++++++-- .azure-pipelines/azure-pipelines-osx.yml | 27 ++++++-- .azure-pipelines/azure-pipelines-win.yml | 25 +++++-- ...ux_64_numpy1.17python3.6.____cpython.yaml} | 2 +- ...ux_64_numpy1.17python3.7.____cpython.yaml} | 2 +- ...ux_64_numpy1.17python3.8.____cpython.yaml} | 2 +- ...rch64_numpy1.17python3.6.____cpython.yaml} | 2 +- ...rch64_numpy1.17python3.7.____cpython.yaml} | 2 +- ...rch64_numpy1.17python3.8.____cpython.yaml} | 2 +- ...c64le_numpy1.17python3.6.____cpython.yaml} | 2 +- ...c64le_numpy1.17python3.7.____cpython.yaml} | 2 +- ...c64le_numpy1.17python3.8.____cpython.yaml} | 2 +- .ci_support/migrations/python39.yaml | 26 -------- ...sx_64_numpy1.17python3.6.____cpython.yaml} | 2 +- ...sx_64_numpy1.17python3.7.____cpython.yaml} | 2 +- ...sx_64_numpy1.17python3.8.____cpython.yaml} | 4 +- .../osx_arm64_python3.8.____cpython.yaml | 2 +- .../osx_arm64_python3.9.____cpython.yaml | 2 +- ...in_64_numpy1.17python3.6.____cpython.yaml} | 2 +- ...in_64_numpy1.17python3.7.____cpython.yaml} | 2 +- ...in_64_numpy1.17python3.8.____cpython.yaml} | 2 +- .drone.yml | 12 ++-- .scripts/build_steps.sh | 29 ++++++-- .scripts/logging_utils.sh | 35 ++++++++++ .scripts/run_docker_build.sh | 19 ++++-- .scripts/run_osx_build.sh | 66 +++++++++++-------- .travis.yml | 12 +++- LICENSE.txt | 2 +- README.md | 65 +++++++++--------- build-locally.py | 27 +++++++- 30 files changed, 263 insertions(+), 145 deletions(-) rename .ci_support/{linux_64_numpy1.16python3.6.____cpython.yaml => linux_64_numpy1.17python3.6.____cpython.yaml} (97%) rename .ci_support/{linux_64_numpy1.16python3.7.____cpython.yaml => linux_64_numpy1.17python3.7.____cpython.yaml} (97%) rename .ci_support/{linux_64_numpy1.16python3.8.____cpython.yaml => linux_64_numpy1.17python3.8.____cpython.yaml} (97%) rename .ci_support/{linux_aarch64_numpy1.16python3.6.____cpython.yaml => linux_aarch64_numpy1.17python3.6.____cpython.yaml} (97%) rename .ci_support/{linux_aarch64_numpy1.16python3.7.____cpython.yaml => linux_aarch64_numpy1.17python3.7.____cpython.yaml} (97%) rename .ci_support/{linux_aarch64_numpy1.16python3.8.____cpython.yaml => linux_aarch64_numpy1.17python3.8.____cpython.yaml} (97%) rename .ci_support/{linux_ppc64le_numpy1.16python3.6.____cpython.yaml => linux_ppc64le_numpy1.17python3.6.____cpython.yaml} (97%) rename .ci_support/{linux_ppc64le_numpy1.16python3.7.____cpython.yaml => linux_ppc64le_numpy1.17python3.7.____cpython.yaml} (97%) rename .ci_support/{linux_ppc64le_numpy1.16python3.8.____cpython.yaml => linux_ppc64le_numpy1.17python3.8.____cpython.yaml} (97%) delete mode 100644 .ci_support/migrations/python39.yaml rename .ci_support/{osx_64_numpy1.16python3.6.____cpython.yaml => osx_64_numpy1.17python3.6.____cpython.yaml} (97%) rename .ci_support/{osx_64_numpy1.16python3.7.____cpython.yaml => osx_64_numpy1.17python3.7.____cpython.yaml} (97%) rename .ci_support/{osx_64_numpy1.16python3.8.____cpython.yaml => osx_64_numpy1.17python3.8.____cpython.yaml} (90%) rename .ci_support/{win_64_numpy1.16python3.6.____cpython.yaml => win_64_numpy1.17python3.6.____cpython.yaml} (96%) rename .ci_support/{win_64_numpy1.16python3.7.____cpython.yaml => win_64_numpy1.17python3.7.____cpython.yaml} (96%) rename .ci_support/{win_64_numpy1.16python3.8.____cpython.yaml => win_64_numpy1.17python3.8.____cpython.yaml} (96%) create mode 100644 .scripts/logging_utils.sh diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 24706462..b7b834ed 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,16 +8,16 @@ jobs: vmImage: ubuntu-16.04 strategy: matrix: - linux_64_numpy1.16python3.6.____cpython: - CONFIG: linux_64_numpy1.16python3.6.____cpython + linux_64_numpy1.17python3.6.____cpython: + CONFIG: linux_64_numpy1.17python3.6.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-comp7 - linux_64_numpy1.16python3.7.____cpython: - CONFIG: linux_64_numpy1.16python3.7.____cpython + linux_64_numpy1.17python3.7.____cpython: + CONFIG: linux_64_numpy1.17python3.7.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-comp7 - linux_64_numpy1.16python3.8.____cpython: - CONFIG: linux_64_numpy1.16python3.8.____cpython + linux_64_numpy1.17python3.8.____cpython: + CONFIG: linux_64_numpy1.17python3.8.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-comp7 linux_64_numpy1.18python3.6.____73_pypy: @@ -57,4 +57,17 @@ jobs: env: BINSTAR_TOKEN: $(BINSTAR_TOKEN) FEEDSTOCK_TOKEN: $(FEEDSTOCK_TOKEN) - STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) \ No newline at end of file + STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) + - script: | + full_artifact_name="conda_artifacts_$(build.BuildId)_$(CONFIG)" + artifact_name=`echo "$full_artifact_name" | head -c 80` + echo "##vso[task.setVariable variable=ARTIFACT_NAME]$artifact_name" + if [ -d build_artifacts ]; then + echo "##vso[task.setVariable variable=CONDA_BLD_DIR_EXISTS]true" + fi + displayName: Check for conda build artifacts + condition: succeededOrFailed() + + - publish: build_artifacts/ + artifact: $(ARTIFACT_NAME) + condition: eq(variables.CONDA_BLD_DIR_EXISTS, 'true') \ No newline at end of file diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index ea15d2c2..6b2708b2 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -8,14 +8,14 @@ jobs: vmImage: macOS-10.15 strategy: matrix: - osx_64_numpy1.16python3.6.____cpython: - CONFIG: osx_64_numpy1.16python3.6.____cpython + osx_64_numpy1.17python3.6.____cpython: + CONFIG: osx_64_numpy1.17python3.6.____cpython UPLOAD_PACKAGES: 'True' - osx_64_numpy1.16python3.7.____cpython: - CONFIG: osx_64_numpy1.16python3.7.____cpython + osx_64_numpy1.17python3.7.____cpython: + CONFIG: osx_64_numpy1.17python3.7.____cpython UPLOAD_PACKAGES: 'True' - osx_64_numpy1.16python3.8.____cpython: - CONFIG: osx_64_numpy1.16python3.8.____cpython + osx_64_numpy1.17python3.8.____cpython: + CONFIG: osx_64_numpy1.17python3.8.____cpython UPLOAD_PACKAGES: 'True' osx_64_numpy1.18python3.6.____73_pypy: CONFIG: osx_64_numpy1.18python3.6.____73_pypy @@ -46,4 +46,17 @@ jobs: env: BINSTAR_TOKEN: $(BINSTAR_TOKEN) FEEDSTOCK_TOKEN: $(FEEDSTOCK_TOKEN) - STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) \ No newline at end of file + STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) + - script: | + full_artifact_name="conda_artifacts_$(build.BuildId)_$(CONFIG)" + artifact_name=`echo "$full_artifact_name" | head -c 80` + echo "##vso[task.setVariable variable=ARTIFACT_NAME]$artifact_name" + if [ -d /Users/runner/miniforge3/conda-bld/ ]; then + echo "##vso[task.setVariable variable=CONDA_BLD_DIR_EXISTS]true" + fi + displayName: Check for conda build artifacts + condition: succeededOrFailed() + + - publish: /Users/runner/miniforge3/conda-bld/ + artifact: $(ARTIFACT_NAME) + condition: eq(variables.CONDA_BLD_DIR_EXISTS, 'true') \ No newline at end of file diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index fa86d683..9247c6c0 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -8,14 +8,14 @@ jobs: vmImage: vs2017-win2016 strategy: matrix: - win_64_numpy1.16python3.6.____cpython: - CONFIG: win_64_numpy1.16python3.6.____cpython + win_64_numpy1.17python3.6.____cpython: + CONFIG: win_64_numpy1.17python3.6.____cpython UPLOAD_PACKAGES: 'True' - win_64_numpy1.16python3.7.____cpython: - CONFIG: win_64_numpy1.16python3.7.____cpython + win_64_numpy1.17python3.7.____cpython: + CONFIG: win_64_numpy1.17python3.7.____cpython UPLOAD_PACKAGES: 'True' - win_64_numpy1.16python3.8.____cpython: - CONFIG: win_64_numpy1.16python3.8.____cpython + win_64_numpy1.17python3.8.____cpython: + CONFIG: win_64_numpy1.17python3.8.____cpython UPLOAD_PACKAGES: 'True' win_64_numpy1.19python3.9.____cpython: CONFIG: win_64_numpy1.19python3.9.____cpython @@ -100,6 +100,19 @@ jobs: env: PYTHONUNBUFFERED: 1 condition: not(contains(variables['CONFIG'], 'vs2008')) + - script: | + set full_artifact_name=conda_artifacts_$(build.BuildID)_$(CONFIG) + set artifact_name=%full_artifact_name:~0,80% + echo ##vso[task.setVariable variable=ARTIFACT_NAME]%artifact_name% + if exist $(CONDA_BLD_PATH)\\ ( + echo ##vso[task.setVariable variable=CONDA_BLD_DIR_EXISTS]true + ) + displayName: Check for conda build artifacts + condition: succeededOrFailed() + + - publish: $(CONDA_BLD_PATH)\\ + artifact: $(ARTIFACT_NAME) + condition: eq(variables.CONDA_BLD_DIR_EXISTS, 'true') - script: | set "FEEDSTOCK_NAME=%BUILD_REPOSITORY_NAME:*/=%" call activate base diff --git a/.ci_support/linux_64_numpy1.16python3.6.____cpython.yaml b/.ci_support/linux_64_numpy1.17python3.6.____cpython.yaml similarity index 97% rename from .ci_support/linux_64_numpy1.16python3.6.____cpython.yaml rename to .ci_support/linux_64_numpy1.17python3.6.____cpython.yaml index 8332ab95..a686bd27 100644 --- a/.ci_support/linux_64_numpy1.16python3.6.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.17python3.6.____cpython.yaml @@ -11,7 +11,7 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-comp7 numpy: -- '1.16' +- '1.17' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/linux_64_numpy1.16python3.7.____cpython.yaml b/.ci_support/linux_64_numpy1.17python3.7.____cpython.yaml similarity index 97% rename from .ci_support/linux_64_numpy1.16python3.7.____cpython.yaml rename to .ci_support/linux_64_numpy1.17python3.7.____cpython.yaml index 047e54bd..b75d2db2 100644 --- a/.ci_support/linux_64_numpy1.16python3.7.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.17python3.7.____cpython.yaml @@ -11,7 +11,7 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-comp7 numpy: -- '1.16' +- '1.17' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/linux_64_numpy1.16python3.8.____cpython.yaml b/.ci_support/linux_64_numpy1.17python3.8.____cpython.yaml similarity index 97% rename from .ci_support/linux_64_numpy1.16python3.8.____cpython.yaml rename to .ci_support/linux_64_numpy1.17python3.8.____cpython.yaml index 6a2e1d04..622bf448 100644 --- a/.ci_support/linux_64_numpy1.16python3.8.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.17python3.8.____cpython.yaml @@ -11,7 +11,7 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-comp7 numpy: -- '1.16' +- '1.17' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/linux_aarch64_numpy1.16python3.6.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.17python3.6.____cpython.yaml similarity index 97% rename from .ci_support/linux_aarch64_numpy1.16python3.6.____cpython.yaml rename to .ci_support/linux_aarch64_numpy1.17python3.6.____cpython.yaml index 24d77713..53d82213 100644 --- a/.ci_support/linux_aarch64_numpy1.16python3.6.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.17python3.6.____cpython.yaml @@ -15,7 +15,7 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-aarch64 numpy: -- '1.16' +- '1.17' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/linux_aarch64_numpy1.16python3.7.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.17python3.7.____cpython.yaml similarity index 97% rename from .ci_support/linux_aarch64_numpy1.16python3.7.____cpython.yaml rename to .ci_support/linux_aarch64_numpy1.17python3.7.____cpython.yaml index eaa49eb7..83ef2adc 100644 --- a/.ci_support/linux_aarch64_numpy1.16python3.7.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.17python3.7.____cpython.yaml @@ -15,7 +15,7 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-aarch64 numpy: -- '1.16' +- '1.17' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/linux_aarch64_numpy1.16python3.8.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.17python3.8.____cpython.yaml similarity index 97% rename from .ci_support/linux_aarch64_numpy1.16python3.8.____cpython.yaml rename to .ci_support/linux_aarch64_numpy1.17python3.8.____cpython.yaml index ad84f3d2..797f96d9 100644 --- a/.ci_support/linux_aarch64_numpy1.16python3.8.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.17python3.8.____cpython.yaml @@ -15,7 +15,7 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-aarch64 numpy: -- '1.16' +- '1.17' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/linux_ppc64le_numpy1.16python3.6.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.17python3.6.____cpython.yaml similarity index 97% rename from .ci_support/linux_ppc64le_numpy1.16python3.6.____cpython.yaml rename to .ci_support/linux_ppc64le_numpy1.17python3.6.____cpython.yaml index 628e251c..48f477a6 100644 --- a/.ci_support/linux_ppc64le_numpy1.16python3.6.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.17python3.6.____cpython.yaml @@ -11,7 +11,7 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-ppc64le numpy: -- '1.16' +- '1.17' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/linux_ppc64le_numpy1.16python3.7.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.17python3.7.____cpython.yaml similarity index 97% rename from .ci_support/linux_ppc64le_numpy1.16python3.7.____cpython.yaml rename to .ci_support/linux_ppc64le_numpy1.17python3.7.____cpython.yaml index 1c5c9f2d..006ba9e7 100644 --- a/.ci_support/linux_ppc64le_numpy1.16python3.7.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.17python3.7.____cpython.yaml @@ -11,7 +11,7 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-ppc64le numpy: -- '1.16' +- '1.17' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/linux_ppc64le_numpy1.16python3.8.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.17python3.8.____cpython.yaml similarity index 97% rename from .ci_support/linux_ppc64le_numpy1.16python3.8.____cpython.yaml rename to .ci_support/linux_ppc64le_numpy1.17python3.8.____cpython.yaml index 5ee06ed0..a8b2e6a1 100644 --- a/.ci_support/linux_ppc64le_numpy1.16python3.8.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.17python3.8.____cpython.yaml @@ -11,7 +11,7 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-ppc64le numpy: -- '1.16' +- '1.17' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/migrations/python39.yaml b/.ci_support/migrations/python39.yaml deleted file mode 100644 index 3eff5c74..00000000 --- a/.ci_support/migrations/python39.yaml +++ /dev/null @@ -1,26 +0,0 @@ -migrator_ts: 1602104489 -__migrator: - migration_number: 2 - operation: key_add - primary_key: python - ordering: - python: - - 3.6.* *_cpython - - 3.7.* *_cpython - - 3.8.* *_cpython - - 3.9.* *_cpython # new entry - - 3.6.* *_73_pypy - paused: false - pr_limit: 50 - exclude: - # this shouldn't attempt to modify the python feedstocks - - python - - pypy3.6 - - pypy-meta -python: - - 3.9.* *_cpython -# additional entries to add for zip_keys -numpy: - - 1.19 -python_impl: - - cpython diff --git a/.ci_support/osx_64_numpy1.16python3.6.____cpython.yaml b/.ci_support/osx_64_numpy1.17python3.6.____cpython.yaml similarity index 97% rename from .ci_support/osx_64_numpy1.16python3.6.____cpython.yaml rename to .ci_support/osx_64_numpy1.17python3.6.____cpython.yaml index a807bd3f..aad516cb 100644 --- a/.ci_support/osx_64_numpy1.16python3.6.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.17python3.6.____cpython.yaml @@ -11,7 +11,7 @@ cxx_compiler_version: macos_machine: - x86_64-apple-darwin13.4.0 numpy: -- '1.16' +- '1.17' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/osx_64_numpy1.16python3.7.____cpython.yaml b/.ci_support/osx_64_numpy1.17python3.7.____cpython.yaml similarity index 97% rename from .ci_support/osx_64_numpy1.16python3.7.____cpython.yaml rename to .ci_support/osx_64_numpy1.17python3.7.____cpython.yaml index 48e17c77..0c8c4439 100644 --- a/.ci_support/osx_64_numpy1.16python3.7.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.17python3.7.____cpython.yaml @@ -11,7 +11,7 @@ cxx_compiler_version: macos_machine: - x86_64-apple-darwin13.4.0 numpy: -- '1.16' +- '1.17' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/osx_64_numpy1.16python3.8.____cpython.yaml b/.ci_support/osx_64_numpy1.17python3.8.____cpython.yaml similarity index 90% rename from .ci_support/osx_64_numpy1.16python3.8.____cpython.yaml rename to .ci_support/osx_64_numpy1.17python3.8.____cpython.yaml index f98588e1..bc8edee9 100644 --- a/.ci_support/osx_64_numpy1.16python3.8.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.17python3.8.____cpython.yaml @@ -1,7 +1,5 @@ MACOSX_DEPLOYMENT_TARGET: - '10.9' -MACOSX_SDK_VERSION: -- '11.0' channel_sources: - conda-forge,defaults channel_targets: @@ -13,7 +11,7 @@ cxx_compiler_version: macos_machine: - x86_64-apple-darwin13.4.0 numpy: -- '1.16' +- '1.17' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/osx_arm64_python3.8.____cpython.yaml b/.ci_support/osx_arm64_python3.8.____cpython.yaml index ce9ab033..4fc6a64f 100644 --- a/.ci_support/osx_arm64_python3.8.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.8.____cpython.yaml @@ -1,7 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' channel_sources: -- conda-forge +- conda-forge/label/rust_dev,conda-forge channel_targets: - conda-forge main cxx_compiler: diff --git a/.ci_support/osx_arm64_python3.9.____cpython.yaml b/.ci_support/osx_arm64_python3.9.____cpython.yaml index a8461ced..288513da 100644 --- a/.ci_support/osx_arm64_python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.9.____cpython.yaml @@ -1,7 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' channel_sources: -- conda-forge +- conda-forge/label/rust_dev,conda-forge channel_targets: - conda-forge main cxx_compiler: diff --git a/.ci_support/win_64_numpy1.16python3.6.____cpython.yaml b/.ci_support/win_64_numpy1.17python3.6.____cpython.yaml similarity index 96% rename from .ci_support/win_64_numpy1.16python3.6.____cpython.yaml rename to .ci_support/win_64_numpy1.17python3.6.____cpython.yaml index bcbabdf4..43114eb5 100644 --- a/.ci_support/win_64_numpy1.16python3.6.____cpython.yaml +++ b/.ci_support/win_64_numpy1.17python3.6.____cpython.yaml @@ -5,7 +5,7 @@ channel_targets: cxx_compiler: - vs2017 numpy: -- '1.16' +- '1.17' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/win_64_numpy1.16python3.7.____cpython.yaml b/.ci_support/win_64_numpy1.17python3.7.____cpython.yaml similarity index 96% rename from .ci_support/win_64_numpy1.16python3.7.____cpython.yaml rename to .ci_support/win_64_numpy1.17python3.7.____cpython.yaml index bbdf8c9c..d73058b3 100644 --- a/.ci_support/win_64_numpy1.16python3.7.____cpython.yaml +++ b/.ci_support/win_64_numpy1.17python3.7.____cpython.yaml @@ -5,7 +5,7 @@ channel_targets: cxx_compiler: - vs2017 numpy: -- '1.16' +- '1.17' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/win_64_numpy1.16python3.8.____cpython.yaml b/.ci_support/win_64_numpy1.17python3.8.____cpython.yaml similarity index 96% rename from .ci_support/win_64_numpy1.16python3.8.____cpython.yaml rename to .ci_support/win_64_numpy1.17python3.8.____cpython.yaml index 3cd653e9..ddd6ac1c 100644 --- a/.ci_support/win_64_numpy1.16python3.8.____cpython.yaml +++ b/.ci_support/win_64_numpy1.17python3.8.____cpython.yaml @@ -5,7 +5,7 @@ channel_targets: cxx_compiler: - vs2017 numpy: -- '1.16' +- '1.17' pin_run_as_build: python: min_pin: x.x diff --git a/.drone.yml b/.drone.yml index 94bbd710..b9aac4cb 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,6 +1,6 @@ --- kind: pipeline -name: linux_aarch64_numpy1.16python3.6.____cpython +name: linux_aarch64_numpy1.17python3.6.____cpython platform: os: linux @@ -10,7 +10,7 @@ steps: - name: Install and build image: quay.io/condaforge/linux-anvil-aarch64 environment: - CONFIG: linux_aarch64_numpy1.16python3.6.____cpython + CONFIG: linux_aarch64_numpy1.17python3.6.____cpython UPLOAD_PACKAGES: True PLATFORM: linux-aarch64 BINSTAR_TOKEN: @@ -31,7 +31,7 @@ steps: --- kind: pipeline -name: linux_aarch64_numpy1.16python3.7.____cpython +name: linux_aarch64_numpy1.17python3.7.____cpython platform: os: linux @@ -41,7 +41,7 @@ steps: - name: Install and build image: quay.io/condaforge/linux-anvil-aarch64 environment: - CONFIG: linux_aarch64_numpy1.16python3.7.____cpython + CONFIG: linux_aarch64_numpy1.17python3.7.____cpython UPLOAD_PACKAGES: True PLATFORM: linux-aarch64 BINSTAR_TOKEN: @@ -62,7 +62,7 @@ steps: --- kind: pipeline -name: linux_aarch64_numpy1.16python3.8.____cpython +name: linux_aarch64_numpy1.17python3.8.____cpython platform: os: linux @@ -72,7 +72,7 @@ steps: - name: Install and build image: quay.io/condaforge/linux-anvil-aarch64 environment: - CONFIG: linux_aarch64_numpy1.16python3.8.____cpython + CONFIG: linux_aarch64_numpy1.17python3.8.____cpython UPLOAD_PACKAGES: True PLATFORM: linux-aarch64 BINSTAR_TOKEN: diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 8a4b0d37..99baf86d 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}" @@ -29,11 +37,13 @@ source run_conda_forge_build_setup # make the build number clobber make_build_number "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" -if [[ "${HOST_PLATFORM}" != "${BUILD_PLATFORM}" ]]; then +if [[ "${HOST_PLATFORM}" != "${BUILD_PLATFORM}" ]] && [[ "${BUILD_WITH_CONDA_DEBUG:-0}" != 1 ]]; then EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --no-test" fi +( 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}" @@ -41,17 +51,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 00000000..57bc95c2 --- /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 36dacd6e..244ccd1f 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 )" @@ -48,11 +52,11 @@ if [ -z "${DOCKER_IMAGE}" ]; then 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" + echo "No docker_image entry found in ${CONFIG}. Falling back to quay.io/condaforge/linux-anvil-comp7" + DOCKER_IMAGE="quay.io/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 )" + DOCKER_IMAGE="$(cat "${FEEDSTOCK_ROOT}/.ci_support/${CONFIG}.yaml" | shyaml get-value docker_image.0 quay.io/condaforge/linux-anvil-comp7 )" fi fi @@ -66,6 +70,10 @@ 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,delegated \ @@ -88,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 index 3675dacf..708b1e1f 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -1,61 +1,73 @@ #!/usr/bin/env bash -set -x +source .scripts/logging_utils.sh + +set -xe + +MINIFORGE_HOME=${MINIFORGE_HOME:-${HOME}/miniforge3} + +( startgroup "Installing a fresh version of Miniforge" ) 2> /dev/null -echo -e "\n\nInstalling a fresh version of Miniforge." -if [[ ${CI} == "travis" ]]; then - echo -en 'travis_fold:start:install_miniforge\\r' -fi 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 -if [[ ${CI} == "travis" ]]; then - echo -en 'travis_fold:end:install_miniforge\\r' -fi +bash $MINIFORGE_FILE -b -p ${MINIFORGE_HOME} -echo -e "\n\nConfiguring conda." -if [[ ${CI} == "travis" ]]; then - echo -en 'travis_fold:start:configure_conda\\r' -fi +( endgroup "Installing a fresh version of Miniforge" ) 2> /dev/null + +( startgroup "Configuring conda" ) 2> /dev/null -source ${HOME}/miniforge3/etc/profile.d/conda.sh +BUILD_CMD=build + +source ${MINIFORGE_HOME}/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 +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 +if [[ "${CI:-}" != "" ]]; then + mangle_compiler ./ ./recipe .ci_support/${CONFIG}.yaml +fi + +if [[ "${CI:-}" != "" ]]; then + echo -e "\n\nMangling homebrew in the CI to avoid conflicts." + /usr/bin/sudo mangle_homebrew + /usr/bin/sudo -k +else + echo -e "\n\nNot mangling homebrew as we are not running in CI" +fi echo -e "\n\nRunning the build setup script." source run_conda_forge_build_setup -if [[ ${CI} == "travis" ]]; then - echo -en 'travis_fold:end:configure_conda\\r' -fi -set -e +( endgroup "Configuring conda" ) 2> /dev/null -echo -e "\n\nMaking the build clobber file and running the build." + +echo -e "\n\nMaking the build clobber file" make_build_number ./ ./recipe ./.ci_support/${CONFIG}.yaml if [[ "${HOST_PLATFORM}" != "${BUILD_PLATFORM}" ]]; then EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --no-test" fi -conda build ./recipe -m ./.ci_support/${CONFIG}.yaml --suppress-variables --clobber-file ./.ci_support/clobber_${CONFIG}.yaml ${EXTRA_CB_OPTIONS:-} +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 - echo -e "\n\nUploading the packages." upload_package --validate --feedstock-name="${FEEDSTOCK_NAME}" ./ ./recipe ./.ci_support/${CONFIG}.yaml -fi \ No newline at end of file +fi + +( endgroup "Uploading packages" ) 2> /dev/null \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index 8f0a25f3..dfe3aefb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,29 +7,35 @@ language: generic matrix: include: - - env: CONFIG=linux_ppc64le_numpy1.16python3.6.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le + - env: CONFIG=linux_ppc64le_numpy1.17python3.6.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le os: linux arch: ppc64le + dist: focal - - env: CONFIG=linux_ppc64le_numpy1.16python3.7.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le + - env: CONFIG=linux_ppc64le_numpy1.17python3.7.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le os: linux arch: ppc64le + dist: focal - - env: CONFIG=linux_ppc64le_numpy1.16python3.8.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le + - env: CONFIG=linux_ppc64le_numpy1.17python3.8.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le os: linux arch: ppc64le + dist: focal - env: CONFIG=linux_ppc64le_numpy1.18python3.6.____73_pypy UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le os: linux arch: ppc64le + dist: focal - env: CONFIG=linux_ppc64le_numpy1.19python3.7.____73_pypy UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le os: linux arch: ppc64le + dist: focal - env: CONFIG=linux_ppc64le_numpy1.19python3.9.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le os: linux arch: ppc64le + dist: focal script: - export CI=travis diff --git a/LICENSE.txt b/LICENSE.txt index 5f302793..ed3f451e 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 264ba0a2..10d14a45 100644 --- a/README.md +++ b/README.md @@ -41,24 +41,24 @@ Current build status - + - + - + @@ -83,24 +83,24 @@ Current build status - + - + - + @@ -125,24 +125,24 @@ Current build status - + - + - + @@ -167,24 +167,24 @@ Current build status - + - + - + @@ -223,24 +223,24 @@ Current build status - + - + - + @@ -272,6 +272,7 @@ Installing `boost` from the `conda-forge` channel can be achieved by adding `con ``` conda config --add channels conda-forge +conda config --set channel_priority strict ``` Once the `conda-forge` channel has been enabled, `boost` can be installed with: @@ -342,9 +343,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/build-locally.py b/build-locally.py index 3453cfe6..00eeb34b 100755 --- a/build-locally.py +++ b/build-locally.py @@ -7,6 +7,7 @@ import glob import subprocess from argparse import ArgumentParser +import platform def setup_environment(ns): @@ -16,6 +17,10 @@ def setup_environment(ns): os.environ["BUILD_WITH_CONDA_DEBUG"] = "1" if ns.output_id: os.environ["BUILD_OUTPUT_ID"] = ns.output_id + if "MINIFORGE_HOME" not in os.environ: + os.environ["MINIFORGE_HOME"] = os.path.join( + os.path.dirname(__file__), "miniforge3" + ) def run_docker_build(ns): @@ -23,6 +28,11 @@ def run_docker_build(ns): subprocess.check_call([script]) +def run_osx_build(ns): + script = ".scripts/run_osx_build.sh" + subprocess.check_call([script]) + + def verify_config(ns): valid_configs = { os.path.basename(f)[:-5] for f in glob.glob(".ci_support/*.yaml") @@ -46,10 +56,16 @@ def verify_config(ns): else: raise ValueError("config " + ns.config + " is not valid") # Remove the following, as implemented - if not ns.config.startswith("linux"): + if ns.config.startswith("win"): raise ValueError( - f"only Linux configs currently supported, got {ns.config}" + f"only Linux/macOS configs currently supported, got {ns.config}" ) + elif ns.config.startswith("osx") and platform.system() == "Darwin": + if "OSX_SDK_DIR" not in os.environ: + raise RuntimeError( + "Need OSX_SDK_DIR env variable set. Run 'export OSX_SDK_DIR=/opt'" + "to download the SDK automatically to '/opt/MacOSX.sdk'" + ) def main(args=None): @@ -68,7 +84,12 @@ def main(args=None): verify_config(ns) setup_environment(ns) - run_docker_build(ns) + if ns.config.startswith("linux") or ( + ns.config.startswith("osx") and platform.system() == "Linux" + ): + run_docker_build(ns) + elif ns.config.startswith("osx"): + run_osx_build(ns) if __name__ == "__main__": From e01b597cf375edb748a0c5cf03ee5847ba7d524d Mon Sep 17 00:00:00 2001 From: "Billy K. Poon" Date: Mon, 31 May 2021 16:54:12 -0700 Subject: [PATCH 5/5] Add back SDK change after rerender --- .ci_support/osx_64_numpy1.17python3.8.____cpython.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.ci_support/osx_64_numpy1.17python3.8.____cpython.yaml b/.ci_support/osx_64_numpy1.17python3.8.____cpython.yaml index bc8edee9..640178de 100644 --- a/.ci_support/osx_64_numpy1.17python3.8.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.17python3.8.____cpython.yaml @@ -1,5 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: - '10.9' +MACOSX_SDK_VERSION: +- '11.0' channel_sources: - conda-forge,defaults channel_targets:
VariantStatus
linux_64_numpy1.16python3.6.____cpythonlinux_64_numpy1.17python3.6.____cpython - variant + variant
linux_64_numpy1.16python3.7.____cpythonlinux_64_numpy1.17python3.7.____cpython - variant + variant
linux_64_numpy1.16python3.8.____cpythonlinux_64_numpy1.17python3.8.____cpython - variant + variant
linux_aarch64_numpy1.16python3.6.____cpythonlinux_aarch64_numpy1.17python3.6.____cpython - variant + variant
linux_aarch64_numpy1.16python3.7.____cpythonlinux_aarch64_numpy1.17python3.7.____cpython - variant + variant
linux_aarch64_numpy1.16python3.8.____cpythonlinux_aarch64_numpy1.17python3.8.____cpython - variant + variant
linux_ppc64le_numpy1.16python3.6.____cpythonlinux_ppc64le_numpy1.17python3.6.____cpython - variant + variant
linux_ppc64le_numpy1.16python3.7.____cpythonlinux_ppc64le_numpy1.17python3.7.____cpython - variant + variant
linux_ppc64le_numpy1.16python3.8.____cpythonlinux_ppc64le_numpy1.17python3.8.____cpython - variant + variant
osx_64_numpy1.16python3.6.____cpythonosx_64_numpy1.17python3.6.____cpython - variant + variant
osx_64_numpy1.16python3.7.____cpythonosx_64_numpy1.17python3.7.____cpython - variant + variant
osx_64_numpy1.16python3.8.____cpythonosx_64_numpy1.17python3.8.____cpython - variant + variant
win_64_numpy1.16python3.6.____cpythonwin_64_numpy1.17python3.6.____cpython - variant + variant
win_64_numpy1.16python3.7.____cpythonwin_64_numpy1.17python3.7.____cpython - variant + variant
win_64_numpy1.16python3.8.____cpythonwin_64_numpy1.17python3.8.____cpython - variant + variant