From 7f4aafb050439991f9ead684b2908e8780c282f9 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Thu, 21 Sep 2023 13:40:49 +0000 Subject: [PATCH 1/2] updated v0.58.0 --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 25448b5..a8d246c 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,6 +1,6 @@ {% set name = "numba" %} -{% set version = "0.57.1" %} -{% set sha256 = "33c0500170d213e66d90558ad6aca57d3e03e97bb11da82e6d87ab793648cb17" %} +{% set version = "0.58.0" %} +{% set sha256 = "e5d5a318dc65a101ef846d7fd93f3cf2f7942494019e8342e51238b360739125" %} package: name: numba From 055a7e5d1fd6582bf7995328773f178cc27f0836 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Thu, 21 Sep 2023 13:41:05 +0000 Subject: [PATCH 2/2] MNT: Re-rendered with conda-build 3.26.1, conda-smithy 3.26.2, and conda-forge-pinning 2023.09.21.07.24.16 --- .azure-pipelines/azure-pipelines-linux.yml | 17 +-- .azure-pipelines/azure-pipelines-osx.yml | 24 ++-- .azure-pipelines/azure-pipelines-win.yml | 65 +++------- ...x_64_numpy1.22python3.10.____cpython.yaml} | 2 +- ...ux_64_numpy1.22python3.8.____cpython.yaml} | 2 +- ...ux_64_numpy1.22python3.9.____cpython.yaml} | 2 +- ...ch64_numpy1.22python3.10.____cpython.yaml} | 2 +- ...rch64_numpy1.22python3.8.____cpython.yaml} | 2 +- ...rch64_numpy1.22python3.9.____cpython.yaml} | 2 +- ...64le_numpy1.22python3.10.____cpython.yaml} | 2 +- ...c64le_numpy1.22python3.8.____cpython.yaml} | 2 +- ...c64le_numpy1.22python3.9.____cpython.yaml} | 2 +- ...x_64_numpy1.22python3.10.____cpython.yaml} | 2 +- ...sx_64_numpy1.22python3.8.____cpython.yaml} | 2 +- ...sx_64_numpy1.22python3.9.____cpython.yaml} | 2 +- ...rm64_numpy1.22python3.10.____cpython.yaml} | 2 +- ...arm64_numpy1.22python3.8.____cpython.yaml} | 2 +- ...arm64_numpy1.22python3.9.____cpython.yaml} | 2 +- ...n_64_numpy1.22python3.10.____cpython.yaml} | 2 +- ...in_64_numpy1.22python3.8.____cpython.yaml} | 2 +- ...in_64_numpy1.22python3.9.____cpython.yaml} | 2 +- .scripts/build_steps.sh | 9 +- .scripts/logging_utils.sh | 4 +- .scripts/run_osx_build.sh | 18 +-- .scripts/run_win_build.bat | 115 ++++++++++++++++++ .travis.yml | 12 +- README.md | 72 +++++------ 27 files changed, 222 insertions(+), 150 deletions(-) rename .ci_support/{linux_64_numpy1.21python3.10.____cpython.yaml => linux_64_numpy1.22python3.10.____cpython.yaml} (98%) rename .ci_support/{linux_64_numpy1.21python3.8.____cpython.yaml => linux_64_numpy1.22python3.8.____cpython.yaml} (98%) rename .ci_support/{linux_64_numpy1.21python3.9.____cpython.yaml => linux_64_numpy1.22python3.9.____cpython.yaml} (98%) rename .ci_support/{linux_aarch64_numpy1.21python3.10.____cpython.yaml => linux_aarch64_numpy1.22python3.10.____cpython.yaml} (98%) rename .ci_support/{linux_aarch64_numpy1.21python3.8.____cpython.yaml => linux_aarch64_numpy1.22python3.8.____cpython.yaml} (98%) rename .ci_support/{linux_aarch64_numpy1.21python3.9.____cpython.yaml => linux_aarch64_numpy1.22python3.9.____cpython.yaml} (98%) rename .ci_support/{linux_ppc64le_numpy1.21python3.10.____cpython.yaml => linux_ppc64le_numpy1.22python3.10.____cpython.yaml} (98%) rename .ci_support/{linux_ppc64le_numpy1.21python3.8.____cpython.yaml => linux_ppc64le_numpy1.22python3.8.____cpython.yaml} (98%) rename .ci_support/{linux_ppc64le_numpy1.21python3.9.____cpython.yaml => linux_ppc64le_numpy1.22python3.9.____cpython.yaml} (98%) rename .ci_support/{osx_64_numpy1.21python3.10.____cpython.yaml => osx_64_numpy1.22python3.10.____cpython.yaml} (98%) rename .ci_support/{osx_64_numpy1.21python3.8.____cpython.yaml => osx_64_numpy1.22python3.8.____cpython.yaml} (98%) rename .ci_support/{osx_64_numpy1.21python3.9.____cpython.yaml => osx_64_numpy1.22python3.9.____cpython.yaml} (98%) rename .ci_support/{osx_arm64_numpy1.21python3.10.____cpython.yaml => osx_arm64_numpy1.22python3.10.____cpython.yaml} (98%) rename .ci_support/{osx_arm64_numpy1.21python3.8.____cpython.yaml => osx_arm64_numpy1.22python3.8.____cpython.yaml} (98%) rename .ci_support/{osx_arm64_numpy1.21python3.9.____cpython.yaml => osx_arm64_numpy1.22python3.9.____cpython.yaml} (98%) rename .ci_support/{win_64_numpy1.21python3.10.____cpython.yaml => win_64_numpy1.22python3.10.____cpython.yaml} (97%) rename .ci_support/{win_64_numpy1.21python3.8.____cpython.yaml => win_64_numpy1.22python3.8.____cpython.yaml} (97%) rename .ci_support/{win_64_numpy1.21python3.9.____cpython.yaml => win_64_numpy1.22python3.9.____cpython.yaml} (97%) create mode 100755 .scripts/run_win_build.bat diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 5c2f926..37affe6 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,16 +8,16 @@ jobs: vmImage: ubuntu-latest strategy: matrix: - linux_64_numpy1.21python3.10.____cpython: - CONFIG: linux_64_numpy1.21python3.10.____cpython + linux_64_numpy1.22python3.10.____cpython: + CONFIG: linux_64_numpy1.22python3.10.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-comp7 - linux_64_numpy1.21python3.8.____cpython: - CONFIG: linux_64_numpy1.21python3.8.____cpython + linux_64_numpy1.22python3.8.____cpython: + CONFIG: linux_64_numpy1.22python3.8.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-comp7 - linux_64_numpy1.21python3.9.____cpython: - CONFIG: linux_64_numpy1.21python3.9.____cpython + linux_64_numpy1.22python3.9.____cpython: + CONFIG: linux_64_numpy1.22python3.9.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-comp7 linux_64_numpy1.23python3.11.____cpython: @@ -27,11 +27,6 @@ jobs: timeoutInMinutes: 360 steps: - - script: | - rm -rf /opt/ghc - df -h - displayName: Manage disk space - # configure qemu binfmt-misc running. This allows us to run docker containers # embedded qemu-static - script: | diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 6fa537e..1fd61d2 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -8,26 +8,26 @@ jobs: vmImage: macOS-11 strategy: matrix: - osx_64_numpy1.21python3.10.____cpython: - CONFIG: osx_64_numpy1.21python3.10.____cpython + osx_64_numpy1.22python3.10.____cpython: + CONFIG: osx_64_numpy1.22python3.10.____cpython UPLOAD_PACKAGES: 'True' - osx_64_numpy1.21python3.8.____cpython: - CONFIG: osx_64_numpy1.21python3.8.____cpython + osx_64_numpy1.22python3.8.____cpython: + CONFIG: osx_64_numpy1.22python3.8.____cpython UPLOAD_PACKAGES: 'True' - osx_64_numpy1.21python3.9.____cpython: - CONFIG: osx_64_numpy1.21python3.9.____cpython + osx_64_numpy1.22python3.9.____cpython: + CONFIG: osx_64_numpy1.22python3.9.____cpython UPLOAD_PACKAGES: 'True' osx_64_numpy1.23python3.11.____cpython: CONFIG: osx_64_numpy1.23python3.11.____cpython UPLOAD_PACKAGES: 'True' - osx_arm64_numpy1.21python3.10.____cpython: - CONFIG: osx_arm64_numpy1.21python3.10.____cpython + osx_arm64_numpy1.22python3.10.____cpython: + CONFIG: osx_arm64_numpy1.22python3.10.____cpython UPLOAD_PACKAGES: 'True' - osx_arm64_numpy1.21python3.8.____cpython: - CONFIG: osx_arm64_numpy1.21python3.8.____cpython + osx_arm64_numpy1.22python3.8.____cpython: + CONFIG: osx_arm64_numpy1.22python3.8.____cpython UPLOAD_PACKAGES: 'True' - osx_arm64_numpy1.21python3.9.____cpython: - CONFIG: osx_arm64_numpy1.21python3.9.____cpython + osx_arm64_numpy1.22python3.9.____cpython: + CONFIG: osx_arm64_numpy1.22python3.9.____cpython UPLOAD_PACKAGES: 'True' osx_arm64_numpy1.23python3.11.____cpython: CONFIG: osx_arm64_numpy1.23python3.11.____cpython diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index fe514a3..07c0877 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -8,14 +8,14 @@ jobs: vmImage: windows-2022 strategy: matrix: - win_64_numpy1.21python3.10.____cpython: - CONFIG: win_64_numpy1.21python3.10.____cpython + win_64_numpy1.22python3.10.____cpython: + CONFIG: win_64_numpy1.22python3.10.____cpython UPLOAD_PACKAGES: 'True' - win_64_numpy1.21python3.8.____cpython: - CONFIG: win_64_numpy1.21python3.8.____cpython + win_64_numpy1.22python3.8.____cpython: + CONFIG: win_64_numpy1.22python3.8.____cpython UPLOAD_PACKAGES: 'True' - win_64_numpy1.21python3.9.____cpython: - CONFIG: win_64_numpy1.21python3.9.____cpython + win_64_numpy1.22python3.9.____cpython: + CONFIG: win_64_numpy1.22python3.9.____cpython UPLOAD_PACKAGES: 'True' win_64_numpy1.23python3.11.____cpython: CONFIG: win_64_numpy1.23python3.11.____cpython @@ -26,6 +26,7 @@ jobs: UPLOAD_TEMP: D:\\tmp steps: + - task: PythonScript@0 displayName: 'Download Miniforge' inputs: @@ -44,52 +45,14 @@ jobs: displayName: Add conda to PATH - script: | - call activate base - mamba.exe install "python=3.10" conda-build conda pip boa conda-forge-ci-setup=3 -c conda-forge --strict-channel-priority --yes - displayName: Install conda-build - - - script: set PYTHONUNBUFFERED=1 - displayName: Set PYTHONUNBUFFERED - - # Configure the VM - - script: | - call activate base - setup_conda_rc .\ ".\recipe" .\.ci_support\%CONFIG%.yaml - displayName: conda-forge CI setup - - # Configure the VM. - - script: | - set "CI=azure" - call activate base - run_conda_forge_build_setup - displayName: conda-forge build setup - - - script: | - call activate base - if EXIST LICENSE.txt ( - copy LICENSE.txt "recipe\\recipe-scripts-license.txt" - ) - conda.exe mambabuild "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables - displayName: Build recipe + call ".scripts\run_win_build.bat" + displayName: Run Windows build env: PYTHONUNBUFFERED: 1 - - script: | - set "FEEDSTOCK_NAME=%BUILD_REPOSITORY_NAME:*/=%" - call activate base - validate_recipe_outputs "%FEEDSTOCK_NAME%" - displayName: Validate Recipe Outputs - - - script: | - set "GIT_BRANCH=%BUILD_SOURCEBRANCHNAME%" - set "FEEDSTOCK_NAME=%BUILD_REPOSITORY_NAME:*/=%" - set "TEMP=$(UPLOAD_TEMP)" - if not exist "%TEMP%\" md "%TEMP%" - set "TMP=%TEMP%" - call activate base - upload_package --validate --feedstock-name="%FEEDSTOCK_NAME%" .\ ".\recipe" .ci_support\%CONFIG%.yaml - displayName: Upload package - env: + CONFIG: $(CONFIG) + CI: azure + UPLOAD_PACKAGES: $(UPLOAD_PACKAGES) + UPLOAD_TEMP: $(UPLOAD_TEMP) BINSTAR_TOKEN: $(BINSTAR_TOKEN) FEEDSTOCK_TOKEN: $(FEEDSTOCK_TOKEN) - STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) - condition: and(succeeded(), not(eq(variables['UPLOAD_PACKAGES'], 'False')), not(eq(variables['Build.Reason'], 'PullRequest'))) \ No newline at end of file + STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) \ No newline at end of file diff --git a/.ci_support/linux_64_numpy1.21python3.10.____cpython.yaml b/.ci_support/linux_64_numpy1.22python3.10.____cpython.yaml similarity index 98% rename from .ci_support/linux_64_numpy1.21python3.10.____cpython.yaml rename to .ci_support/linux_64_numpy1.22python3.10.____cpython.yaml index 3ecc7b0..2400cf9 100644 --- a/.ci_support/linux_64_numpy1.21python3.10.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.22python3.10.____cpython.yaml @@ -15,7 +15,7 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-comp7 numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/linux_64_numpy1.21python3.8.____cpython.yaml b/.ci_support/linux_64_numpy1.22python3.8.____cpython.yaml similarity index 98% rename from .ci_support/linux_64_numpy1.21python3.8.____cpython.yaml rename to .ci_support/linux_64_numpy1.22python3.8.____cpython.yaml index ecbe232..fb8564f 100644 --- a/.ci_support/linux_64_numpy1.21python3.8.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.22python3.8.____cpython.yaml @@ -15,7 +15,7 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-comp7 numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/linux_64_numpy1.21python3.9.____cpython.yaml b/.ci_support/linux_64_numpy1.22python3.9.____cpython.yaml similarity index 98% rename from .ci_support/linux_64_numpy1.21python3.9.____cpython.yaml rename to .ci_support/linux_64_numpy1.22python3.9.____cpython.yaml index 0193f77..1ea2a78 100644 --- a/.ci_support/linux_64_numpy1.21python3.9.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.22python3.9.____cpython.yaml @@ -15,7 +15,7 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-comp7 numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/linux_aarch64_numpy1.21python3.10.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml similarity index 98% rename from .ci_support/linux_aarch64_numpy1.21python3.10.____cpython.yaml rename to .ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml index 278a906..456a257 100644 --- a/.ci_support/linux_aarch64_numpy1.21python3.10.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml @@ -19,7 +19,7 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-aarch64 numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/linux_aarch64_numpy1.21python3.8.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.22python3.8.____cpython.yaml similarity index 98% rename from .ci_support/linux_aarch64_numpy1.21python3.8.____cpython.yaml rename to .ci_support/linux_aarch64_numpy1.22python3.8.____cpython.yaml index 97b0407..2b65590 100644 --- a/.ci_support/linux_aarch64_numpy1.21python3.8.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.22python3.8.____cpython.yaml @@ -19,7 +19,7 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-aarch64 numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/linux_aarch64_numpy1.21python3.9.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.22python3.9.____cpython.yaml similarity index 98% rename from .ci_support/linux_aarch64_numpy1.21python3.9.____cpython.yaml rename to .ci_support/linux_aarch64_numpy1.22python3.9.____cpython.yaml index c05fe66..87f1b09 100644 --- a/.ci_support/linux_aarch64_numpy1.21python3.9.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.22python3.9.____cpython.yaml @@ -19,7 +19,7 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-aarch64 numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/linux_ppc64le_numpy1.21python3.10.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.22python3.10.____cpython.yaml similarity index 98% rename from .ci_support/linux_ppc64le_numpy1.21python3.10.____cpython.yaml rename to .ci_support/linux_ppc64le_numpy1.22python3.10.____cpython.yaml index 741a5b1..b9fb690 100644 --- a/.ci_support/linux_ppc64le_numpy1.21python3.10.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.22python3.10.____cpython.yaml @@ -15,7 +15,7 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-ppc64le numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/linux_ppc64le_numpy1.21python3.8.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.22python3.8.____cpython.yaml similarity index 98% rename from .ci_support/linux_ppc64le_numpy1.21python3.8.____cpython.yaml rename to .ci_support/linux_ppc64le_numpy1.22python3.8.____cpython.yaml index c077bc4..5e5922f 100644 --- a/.ci_support/linux_ppc64le_numpy1.21python3.8.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.22python3.8.____cpython.yaml @@ -15,7 +15,7 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-ppc64le numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/linux_ppc64le_numpy1.21python3.9.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.22python3.9.____cpython.yaml similarity index 98% rename from .ci_support/linux_ppc64le_numpy1.21python3.9.____cpython.yaml rename to .ci_support/linux_ppc64le_numpy1.22python3.9.____cpython.yaml index 081b849..d8e02bd 100644 --- a/.ci_support/linux_ppc64le_numpy1.21python3.9.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.22python3.9.____cpython.yaml @@ -15,7 +15,7 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-ppc64le numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/osx_64_numpy1.21python3.10.____cpython.yaml b/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml similarity index 98% rename from .ci_support/osx_64_numpy1.21python3.10.____cpython.yaml rename to .ci_support/osx_64_numpy1.22python3.10.____cpython.yaml index cd151e1..6911175 100644 --- a/.ci_support/osx_64_numpy1.21python3.10.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml @@ -17,7 +17,7 @@ llvm_openmp: macos_machine: - x86_64-apple-darwin13.4.0 numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/osx_64_numpy1.21python3.8.____cpython.yaml b/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml similarity index 98% rename from .ci_support/osx_64_numpy1.21python3.8.____cpython.yaml rename to .ci_support/osx_64_numpy1.22python3.8.____cpython.yaml index eadb380..1a9d1ef 100644 --- a/.ci_support/osx_64_numpy1.21python3.8.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml @@ -17,7 +17,7 @@ llvm_openmp: macos_machine: - x86_64-apple-darwin13.4.0 numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/osx_64_numpy1.21python3.9.____cpython.yaml b/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml similarity index 98% rename from .ci_support/osx_64_numpy1.21python3.9.____cpython.yaml rename to .ci_support/osx_64_numpy1.22python3.9.____cpython.yaml index 5d31c62..a0734e4 100644 --- a/.ci_support/osx_64_numpy1.21python3.9.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml @@ -17,7 +17,7 @@ llvm_openmp: macos_machine: - x86_64-apple-darwin13.4.0 numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/osx_arm64_numpy1.21python3.10.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml similarity index 98% rename from .ci_support/osx_arm64_numpy1.21python3.10.____cpython.yaml rename to .ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml index 8b3a2ef..92c22db 100644 --- a/.ci_support/osx_arm64_numpy1.21python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml @@ -17,7 +17,7 @@ llvm_openmp: macos_machine: - arm64-apple-darwin20.0.0 numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/osx_arm64_numpy1.21python3.8.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml similarity index 98% rename from .ci_support/osx_arm64_numpy1.21python3.8.____cpython.yaml rename to .ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml index f9d2287..a7c1bb2 100644 --- a/.ci_support/osx_arm64_numpy1.21python3.8.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml @@ -17,7 +17,7 @@ llvm_openmp: macos_machine: - arm64-apple-darwin20.0.0 numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/osx_arm64_numpy1.21python3.9.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml similarity index 98% rename from .ci_support/osx_arm64_numpy1.21python3.9.____cpython.yaml rename to .ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml index b5e6c36..038f977 100644 --- a/.ci_support/osx_arm64_numpy1.21python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml @@ -17,7 +17,7 @@ llvm_openmp: macos_machine: - arm64-apple-darwin20.0.0 numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/win_64_numpy1.21python3.10.____cpython.yaml b/.ci_support/win_64_numpy1.22python3.10.____cpython.yaml similarity index 97% rename from .ci_support/win_64_numpy1.21python3.10.____cpython.yaml rename to .ci_support/win_64_numpy1.22python3.10.____cpython.yaml index 4c9bdc1..8e9b9a8 100644 --- a/.ci_support/win_64_numpy1.21python3.10.____cpython.yaml +++ b/.ci_support/win_64_numpy1.22python3.10.____cpython.yaml @@ -7,7 +7,7 @@ channel_targets: cxx_compiler: - vs2019 numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/win_64_numpy1.21python3.8.____cpython.yaml b/.ci_support/win_64_numpy1.22python3.8.____cpython.yaml similarity index 97% rename from .ci_support/win_64_numpy1.21python3.8.____cpython.yaml rename to .ci_support/win_64_numpy1.22python3.8.____cpython.yaml index 2a323dc..fc1af03 100644 --- a/.ci_support/win_64_numpy1.21python3.8.____cpython.yaml +++ b/.ci_support/win_64_numpy1.22python3.8.____cpython.yaml @@ -7,7 +7,7 @@ channel_targets: cxx_compiler: - vs2019 numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/win_64_numpy1.21python3.9.____cpython.yaml b/.ci_support/win_64_numpy1.22python3.9.____cpython.yaml similarity index 97% rename from .ci_support/win_64_numpy1.21python3.9.____cpython.yaml rename to .ci_support/win_64_numpy1.22python3.9.____cpython.yaml index ab6d0a9..b52ecc8 100644 --- a/.ci_support/win_64_numpy1.21python3.9.____cpython.yaml +++ b/.ci_support/win_64_numpy1.22python3.9.____cpython.yaml @@ -7,7 +7,7 @@ channel_targets: cxx_compiler: - vs2019 numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index a6b09f6..322832b 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -31,11 +31,10 @@ pkgs_dirs: CONDARC - -mamba install --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 -mamba update --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 +mamba install --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ + pip mamba conda-build boa conda-forge-ci-setup=3 +mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ + pip mamba conda-build boa conda-forge-ci-setup # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" diff --git a/.scripts/logging_utils.sh b/.scripts/logging_utils.sh index 57bc95c..aff009f 100644 --- a/.scripts/logging_utils.sh +++ b/.scripts/logging_utils.sh @@ -12,7 +12,7 @@ function startgroup { echo "##[group]$1";; travis ) echo "$1" - echo -en 'travis_fold:start:'"${1// /}"'\\r';; + echo -en 'travis_fold:start:'"${1// /}"'\r';; github_actions ) echo "::group::$1";; * ) @@ -28,7 +28,7 @@ function endgroup { azure ) echo "##[endgroup]";; travis ) - echo -en 'travis_fold:end:'"${1// /}"'\\r';; + echo -en 'travis_fold:end:'"${1// /}"'\r';; github_actions ) echo "::endgroup::";; esac diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index bb00584..cd9a88f 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -23,10 +23,10 @@ bash $MINIFORGE_FILE -b -p ${MINIFORGE_HOME} source ${MINIFORGE_HOME}/etc/profile.d/conda.sh conda activate base -mamba install --update-specs --quiet --yes --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 -mamba update --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 +mamba install --update-specs --quiet --yes --channel conda-forge --strict-channel-priority \ + pip mamba conda-build boa conda-forge-ci-setup=3 +mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ + pip mamba conda-build boa conda-forge-ci-setup @@ -55,11 +55,6 @@ source run_conda_forge_build_setup 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 - - if [[ -f LICENSE.txt ]]; then cp LICENSE.txt "recipe/recipe-scripts-license.txt" fi @@ -75,6 +70,11 @@ if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then # Drop into an interactive shell /bin/bash else + + if [[ "${HOST_PLATFORM}" != "${BUILD_PLATFORM}" ]]; then + EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --no-test" + fi + conda mambabuild ./recipe -m ./.ci_support/${CONFIG}.yaml \ --suppress-variables ${EXTRA_CB_OPTIONS:-} \ --clobber-file ./.ci_support/clobber_${CONFIG}.yaml diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat new file mode 100755 index 0000000..07d3445 --- /dev/null +++ b/.scripts/run_win_build.bat @@ -0,0 +1,115 @@ +:: PLEASE NOTE: This script has been automatically generated by conda-smithy. Any changes here +:: will be lost next time ``conda smithy rerender`` is run. If you would like to make permanent +:: changes to this script, consider a proposal to conda-smithy so that other feedstocks can also +:: benefit from the improvement. + +:: Note: we assume a Miniforge installation is available + +:: INPUTS (required environment variables) +:: CONFIG: name of the .ci_support/*.yaml file for this job +:: CI: azure, github_actions, or unset +:: UPLOAD_PACKAGES: true or false +:: UPLOAD_ON_BRANCH: true or false + +setlocal enableextensions enabledelayedexpansion + +call :start_group "Configuring conda" + +:: Activate the base conda environment +call activate base + +:: Provision the necessary dependencies to build the recipe later +echo Installing dependencies +mamba.exe install "python=3.10" pip mamba conda-build boa conda-forge-ci-setup=3 -c conda-forge --strict-channel-priority --yes +if !errorlevel! neq 0 exit /b !errorlevel! + +:: Set basic configuration +echo Setting up configuration +setup_conda_rc .\ ".\recipe" .\.ci_support\%CONFIG%.yaml +if !errorlevel! neq 0 exit /b !errorlevel! +echo Running build setup +CALL run_conda_forge_build_setup + + +if !errorlevel! neq 0 exit /b !errorlevel! + +if EXIST LICENSE.txt ( + echo Copying feedstock license + copy LICENSE.txt "recipe\\recipe-scripts-license.txt" +) +if NOT [%HOST_PLATFORM%] == [%BUILD_PLATFORM%] ( + set "EXTRA_CB_OPTIONS=%EXTRA_CB_OPTIONS% --no-test" +) + +call :end_group + +:: Build the recipe +echo Building recipe +conda.exe mambabuild "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTRA_CB_OPTIONS% +if !errorlevel! neq 0 exit /b !errorlevel! + +:: Prepare some environment variables for the upload step +if /i "%CI%" == "github_actions" ( + set "FEEDSTOCK_NAME=%GITHUB_REPOSITORY:*/=%" + set "GIT_BRANCH=%GITHUB_REF:refs/heads/=%" + if /i "%GITHUB_EVENT_NAME%" == "pull_request" ( + set "IS_PR_BUILD=True" + ) else ( + set "IS_PR_BUILD=False" + ) + set "TEMP=%RUNNER_TEMP%" +) +if /i "%CI%" == "azure" ( + set "FEEDSTOCK_NAME=%BUILD_REPOSITORY_NAME:*/=%" + set "GIT_BRANCH=%BUILD_SOURCEBRANCHNAME%" + if /i "%BUILD_REASON%" == "PullRequest" ( + set "IS_PR_BUILD=True" + ) else ( + set "IS_PR_BUILD=False" + ) + set "TEMP=%UPLOAD_TEMP%" +) + +:: Validate +call :start_group "Validating outputs" +validate_recipe_outputs "%FEEDSTOCK_NAME%" +if !errorlevel! neq 0 exit /b !errorlevel! +call :end_group + +if /i "%UPLOAD_PACKAGES%" == "true" ( + if /i "%IS_PR_BUILD%" == "false" ( + call :start_group "Uploading packages" + if not exist "%TEMP%\" md "%TEMP%" + set "TMP=%TEMP%" + upload_package --validate --feedstock-name="%FEEDSTOCK_NAME%" .\ ".\recipe" .ci_support\%CONFIG%.yaml + if !errorlevel! neq 0 exit /b !errorlevel! + call :end_group + ) +) + +exit + +:: Logging subroutines + +:start_group +if /i "%CI%" == "github_actions" ( + echo ::group::%~1 + exit /b +) +if /i "%CI%" == "azure" ( + echo ##[group]%~1 + exit /b +) +echo %~1 +exit /b + +:end_group +if /i "%CI%" == "github_actions" ( + echo ::endgroup:: + exit /b +) +if /i "%CI%" == "azure" ( + echo ##[endgroup] + exit /b +) +exit /b \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index 9d2e49a..5b5c4ee 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,17 +7,17 @@ language: generic matrix: include: - - env: CONFIG=linux_aarch64_numpy1.21python3.10.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-aarch64 DOCKER_IMAGE=quay.io/condaforge/linux-anvil-aarch64 + - env: CONFIG=linux_aarch64_numpy1.22python3.10.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-aarch64 DOCKER_IMAGE=quay.io/condaforge/linux-anvil-aarch64 os: linux arch: arm64 dist: focal - - env: CONFIG=linux_aarch64_numpy1.21python3.8.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-aarch64 DOCKER_IMAGE=quay.io/condaforge/linux-anvil-aarch64 + - env: CONFIG=linux_aarch64_numpy1.22python3.8.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-aarch64 DOCKER_IMAGE=quay.io/condaforge/linux-anvil-aarch64 os: linux arch: arm64 dist: focal - - env: CONFIG=linux_aarch64_numpy1.21python3.9.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-aarch64 DOCKER_IMAGE=quay.io/condaforge/linux-anvil-aarch64 + - env: CONFIG=linux_aarch64_numpy1.22python3.9.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-aarch64 DOCKER_IMAGE=quay.io/condaforge/linux-anvil-aarch64 os: linux arch: arm64 dist: focal @@ -27,17 +27,17 @@ matrix: arch: arm64 dist: focal - - env: CONFIG=linux_ppc64le_numpy1.21python3.10.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le + - env: CONFIG=linux_ppc64le_numpy1.22python3.10.____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.21python3.8.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le + - env: CONFIG=linux_ppc64le_numpy1.22python3.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.21python3.9.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le + - env: CONFIG=linux_ppc64le_numpy1.22python3.9.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le os: linux arch: ppc64le dist: focal diff --git a/README.md b/README.md index bc15ec2..8b8a373 100644 --- a/README.md +++ b/README.md @@ -43,24 +43,24 @@ Current build status - + - + - + @@ -71,24 +71,24 @@ Current build status - + - + - + @@ -99,24 +99,24 @@ Current build status - + - + - + @@ -127,24 +127,24 @@ Current build status - + - + - + @@ -155,24 +155,24 @@ Current build status - + - + - + @@ -183,24 +183,24 @@ Current build status - + - + - +
VariantStatus
linux_64_numpy1.21python3.10.____cpythonlinux_64_numpy1.22python3.10.____cpython - variant + variant
linux_64_numpy1.21python3.8.____cpythonlinux_64_numpy1.22python3.8.____cpython - variant + variant
linux_64_numpy1.21python3.9.____cpythonlinux_64_numpy1.22python3.9.____cpython - variant + variant
linux_aarch64_numpy1.21python3.10.____cpythonlinux_aarch64_numpy1.22python3.10.____cpython - variant + variant
linux_aarch64_numpy1.21python3.8.____cpythonlinux_aarch64_numpy1.22python3.8.____cpython - variant + variant
linux_aarch64_numpy1.21python3.9.____cpythonlinux_aarch64_numpy1.22python3.9.____cpython - variant + variant
linux_ppc64le_numpy1.21python3.10.____cpythonlinux_ppc64le_numpy1.22python3.10.____cpython - variant + variant
linux_ppc64le_numpy1.21python3.8.____cpythonlinux_ppc64le_numpy1.22python3.8.____cpython - variant + variant
linux_ppc64le_numpy1.21python3.9.____cpythonlinux_ppc64le_numpy1.22python3.9.____cpython - variant + variant
osx_64_numpy1.21python3.10.____cpythonosx_64_numpy1.22python3.10.____cpython - variant + variant
osx_64_numpy1.21python3.8.____cpythonosx_64_numpy1.22python3.8.____cpython - variant + variant
osx_64_numpy1.21python3.9.____cpythonosx_64_numpy1.22python3.9.____cpython - variant + variant
osx_arm64_numpy1.21python3.10.____cpythonosx_arm64_numpy1.22python3.10.____cpython - variant + variant
osx_arm64_numpy1.21python3.8.____cpythonosx_arm64_numpy1.22python3.8.____cpython - variant + variant
osx_arm64_numpy1.21python3.9.____cpythonosx_arm64_numpy1.22python3.9.____cpython - variant + variant
win_64_numpy1.21python3.10.____cpythonwin_64_numpy1.22python3.10.____cpython - variant + variant
win_64_numpy1.21python3.8.____cpythonwin_64_numpy1.22python3.8.____cpython - variant + variant
win_64_numpy1.21python3.9.____cpythonwin_64_numpy1.22python3.9.____cpython - variant + variant