From c0872d99a1b95ebfcb6ed083584d91a7749c90e7 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Thu, 1 Feb 2024 00:32:52 +0000 Subject: [PATCH 01/49] updated v0.59.0 --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 5d30567..c7b22f3 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,6 +1,6 @@ {% set name = "numba" %} -{% set version = "0.58.1" %} -{% set sha256 = "487ded0633efccd9ca3a46364b40006dbdaca0f95e99b8b83e778d1195ebcbaa" %} +{% set version = "0.59.0" %} +{% set sha256 = "12b9b064a3e4ad00e2371fc5212ef0396c80f41caec9b5ec391c8b04b6eaf2a8" %} package: name: numba From 35bec95b876cdaf5de1a54ab1f04522e9410c245 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Thu, 1 Feb 2024 00:33:03 +0000 Subject: [PATCH 02/49] MNT: Re-rendered with conda-build 3.28.4, conda-smithy 3.30.4, and conda-forge-pinning 2024.01.31.14.25.19 --- .azure-pipelines/azure-pipelines-linux.yml | 3 +++ .azure-pipelines/azure-pipelines-osx.yml | 3 +++ .azure-pipelines/azure-pipelines-win.yml | 3 +++ .gitignore | 25 ++++++++++++++++++++-- .scripts/build_steps.sh | 9 +++++--- .scripts/run_docker_build.sh | 9 ++++++++ .scripts/run_osx_build.sh | 13 ++++++++--- .scripts/run_win_build.bat | 14 ++++++++++-- .travis.yml | 3 +++ README.md | 2 +- 10 files changed, 73 insertions(+), 11 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 3c2a28a..536fd7c 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -37,6 +37,9 @@ jobs: - script: | export CI=azure + export flow_run_id=azure_$(Build.BuildNumber).$(System.JobAttempt) + export remote_url=$(Build.Repository.Uri) + export sha=$(Build.SourceVersion) export GIT_BRANCH=$BUILD_SOURCEBRANCHNAME export FEEDSTOCK_NAME=$(basename ${BUILD_REPOSITORY_NAME}) if [[ "${BUILD_REASON:-}" == "PullRequest" ]]; then diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 1fd61d2..2e1f707 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -38,6 +38,9 @@ jobs: # TODO: Fast finish on azure pipelines? - script: | export CI=azure + export flow_run_id=azure_$(Build.BuildNumber).$(System.JobAttempt) + export remote_url=$(Build.Repository.Uri) + export sha=$(Build.SourceVersion) export OSX_FORCE_SDK_DOWNLOAD="1" export GIT_BRANCH=$BUILD_SOURCEBRANCHNAME export FEEDSTOCK_NAME=$(basename ${BUILD_REPOSITORY_NAME}) diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 07c0877..eedfd44 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -51,6 +51,9 @@ jobs: PYTHONUNBUFFERED: 1 CONFIG: $(CONFIG) CI: azure + flow_run_id: azure_$(Build.BuildNumber).$(System.JobAttempt) + remote_url: $(Build.Repository.Uri) + sha: $(Build.SourceVersion) UPLOAD_PACKAGES: $(UPLOAD_PACKAGES) UPLOAD_TEMP: $(UPLOAD_TEMP) BINSTAR_TOKEN: $(BINSTAR_TOKEN) diff --git a/.gitignore b/.gitignore index c89ecb7..179afe5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,24 @@ -*.pyc +# User content belongs under recipe/. +# Feedstock configuration goes in `conda-forge.yml` +# Everything else is managed by the conda-smithy rerender process. +# Please do not modify + +# Ignore all files and folders in root +* +!/conda-forge.yml + +# Don't ignore any files/folders if the parent folder is 'un-ignored' +# This also avoids warnings when adding an already-checked file with an ignored parent. +!/**/ +# Don't ignore any files/folders recursively in the following folders +!/recipe/** +!/.ci_support/** -build_artifacts +# Since we ignore files/folders recursively, any folders inside +# build_artifacts gets ignored which trips some build systems. +# To avoid that we 'un-ignore' all files/folders recursively +# and only ignore the root build_artifacts folder. +!/build_artifacts/** +/build_artifacts + +*.pyc diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index bd9e671..beda247 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -28,13 +28,15 @@ conda-build: pkgs_dirs: - ${FEEDSTOCK_ROOT}/build_artifacts/pkg_cache - /opt/conda/pkgs +solver: libmamba CONDARC +export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 mamba install --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build boa conda-forge-ci-setup=3 + pip mamba conda-build boa conda-forge-ci-setup=4 mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build boa conda-forge-ci-setup=3 + pip mamba conda-build boa conda-forge-ci-setup=4 # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" @@ -68,7 +70,8 @@ if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then else conda mambabuild "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ --suppress-variables ${EXTRA_CB_OPTIONS:-} \ - --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" + --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" \ + --extra-meta flow_run_id="${flow_run_id:-}" remote_url="${remote_url:-}" sha="${sha:-}" ( startgroup "Validating outputs" ) 2> /dev/null validate_recipe_outputs "${FEEDSTOCK_NAME}" diff --git a/.scripts/run_docker_build.sh b/.scripts/run_docker_build.sh index 9236239..00f377a 100755 --- a/.scripts/run_docker_build.sh +++ b/.scripts/run_docker_build.sh @@ -21,6 +21,12 @@ if [ -z ${FEEDSTOCK_NAME} ]; then export FEEDSTOCK_NAME=$(basename ${FEEDSTOCK_ROOT}) fi +if [[ "${sha:-}" == "" ]]; then + pushd "${FEEDSTOCK_ROOT}" + sha=$(git rev-parse HEAD) + popd +fi + docker info # In order for the conda-build process in the container to write to the mounted @@ -91,6 +97,9 @@ docker run ${DOCKER_RUN_ARGS} \ -e CPU_COUNT \ -e BUILD_WITH_CONDA_DEBUG \ -e BUILD_OUTPUT_ID \ + -e flow_run_id \ + -e remote_url \ + -e sha \ -e BINSTAR_TOKEN \ -e FEEDSTOCK_TOKEN \ -e STAGING_BINSTAR_TOKEN \ diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 870c49a..9259eb9 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -22,11 +22,13 @@ bash $MINIFORGE_FILE -b -p ${MINIFORGE_HOME} source ${MINIFORGE_HOME}/etc/profile.d/conda.sh conda activate base +export CONDA_SOLVER="libmamba" +export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 mamba install --update-specs --quiet --yes --channel conda-forge --strict-channel-priority \ - pip mamba conda-build boa conda-forge-ci-setup=3 + pip mamba conda-build boa conda-forge-ci-setup=4 mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build boa conda-forge-ci-setup=3 + pip mamba conda-build boa conda-forge-ci-setup=4 @@ -45,6 +47,10 @@ else echo -e "\n\nNot mangling homebrew as we are not running in CI" fi +if [[ "${sha:-}" == "" ]]; then + sha=$(git rev-parse HEAD) +fi + echo -e "\n\nRunning the build setup script." source run_conda_forge_build_setup @@ -77,7 +83,8 @@ else conda mambabuild ./recipe -m ./.ci_support/${CONFIG}.yaml \ --suppress-variables ${EXTRA_CB_OPTIONS:-} \ - --clobber-file ./.ci_support/clobber_${CONFIG}.yaml + --clobber-file ./.ci_support/clobber_${CONFIG}.yaml \ + --extra-meta flow_run_id="$flow_run_id" remote_url="$remote_url" sha="$sha" ( startgroup "Validating outputs" ) 2> /dev/null validate_recipe_outputs "${FEEDSTOCK_NAME}" diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat index 07d3445..48734de 100755 --- a/.scripts/run_win_build.bat +++ b/.scripts/run_win_build.bat @@ -17,10 +17,14 @@ call :start_group "Configuring conda" :: Activate the base conda environment call activate base +:: Configure the solver +set "CONDA_SOLVER=libmamba" +if !errorlevel! neq 0 exit /b !errorlevel! +set "CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1" :: 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 +mamba.exe install "python=3.10" pip mamba conda-build boa conda-forge-ci-setup=4 -c conda-forge --strict-channel-priority --yes if !errorlevel! neq 0 exit /b !errorlevel! :: Set basic configuration @@ -38,7 +42,13 @@ if EXIST LICENSE.txt ( copy LICENSE.txt "recipe\\recipe-scripts-license.txt" ) if NOT [%HOST_PLATFORM%] == [%BUILD_PLATFORM%] ( - set "EXTRA_CB_OPTIONS=%EXTRA_CB_OPTIONS% --no-test" + if [%CROSSCOMPILING_EMULATOR%] == [] ( + set "EXTRA_CB_OPTIONS=%EXTRA_CB_OPTIONS% --no-test" + ) +) + +if NOT [%flow_run_id%] == [] ( + set "EXTRA_CB_OPTIONS=%EXTRA_CB_OPTIONS% --extra-meta flow_run_id=%flow_run_id% remote_url=%remote_url% sha=%sha%" ) call :end_group diff --git a/.travis.yml b/.travis.yml index 5b5c4ee..5028544 100644 --- a/.travis.yml +++ b/.travis.yml @@ -50,6 +50,9 @@ matrix: script: - export CI=travis - export GIT_BRANCH="$TRAVIS_BRANCH" + - export flow_run_id="travis_$TRAVIS_JOB_ID" + - export sha="$TRAVIS_COMMIT" + - export remote_url="https://github.com/$TRAVIS_REPO_SLUG" - export FEEDSTOCK_NAME=$(basename ${TRAVIS_REPO_SLUG}) - if [[ "${TRAVIS_PULL_REQUEST:-}" == "false" ]]; then export IS_PR_BUILD="False"; else export IS_PR_BUILD="True"; fi diff --git a/README.md b/README.md index 8b8a373..4dbd56e 100644 --- a/README.md +++ b/README.md @@ -291,7 +291,7 @@ available continuous integration services. Thanks to the awesome service provide [CircleCI](https://circleci.com/), [AppVeyor](https://www.appveyor.com/), [Drone](https://cloud.drone.io/welcome), and [TravisCI](https://travis-ci.com/) it is possible to build and upload installable packages to the -[conda-forge](https://anaconda.org/conda-forge) [Anaconda-Cloud](https://anaconda.org/) +[conda-forge](https://anaconda.org/conda-forge) [anaconda.org](https://anaconda.org/) channel for Linux, Windows and OSX respectively. To manage the continuous integration and simplify feedstock maintenance From 4f5928626269263b15278129f943d118c1e65333 Mon Sep 17 00:00:00 2001 From: jakirkham <jakirkham@gmail.com> Date: Fri, 2 Feb 2024 16:38:19 -0800 Subject: [PATCH 03/49] Bump `llvmlite` to `0.42` --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index c7b22f3..1e1b90a 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -39,7 +39,7 @@ requirements: - python - pip - setuptools - - llvmlite 0.41.* + - llvmlite 0.42.* - numpy - tbb-devel 2021.6.0 From d96439424a8a41fa6e2a03af8e75fa17ceee86e4 Mon Sep 17 00:00:00 2001 From: jakirkham <jakirkham@gmail.com> Date: Fri, 2 Feb 2024 16:38:31 -0800 Subject: [PATCH 04/49] Drop Python 3.8 --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 1e1b90a..ccdd305 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -22,7 +22,7 @@ build: ignore_run_exports: # tbb-devel triggers hard dependency on tbb, this is not the case. - tbb - skip: true # [py<38 or (python_impl == 'pypy')] + skip: true # [py<39 or (python_impl == 'pypy')] requirements: build: From 177d0ecdb46bf38eb67dfea866e95e22a1553925 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Sat, 3 Feb 2024 00:40:19 +0000 Subject: [PATCH 05/49] MNT: Re-rendered with conda-build 3.28.4, conda-smithy 3.30.4, and conda-forge-pinning 2024.02.02.14.47.44 --- .azure-pipelines/azure-pipelines-linux.yml | 4 -- .azure-pipelines/azure-pipelines-osx.yml | 6 --- .azure-pipelines/azure-pipelines-win.yml | 3 -- ...nux_64_numpy1.22python3.8.____cpython.yaml | 36 ---------------- ...arch64_numpy1.22python3.8.____cpython.yaml | 40 ------------------ ...pc64le_numpy1.22python3.8.____cpython.yaml | 36 ---------------- ...osx_64_numpy1.22python3.8.____cpython.yaml | 38 ----------------- ..._arm64_numpy1.22python3.8.____cpython.yaml | 38 ----------------- ...win_64_numpy1.22python3.8.____cpython.yaml | 26 ------------ .travis.yml | 10 ----- README.md | 42 ------------------- 11 files changed, 279 deletions(-) delete mode 100644 .ci_support/linux_64_numpy1.22python3.8.____cpython.yaml delete mode 100644 .ci_support/linux_aarch64_numpy1.22python3.8.____cpython.yaml delete mode 100644 .ci_support/linux_ppc64le_numpy1.22python3.8.____cpython.yaml delete mode 100644 .ci_support/osx_64_numpy1.22python3.8.____cpython.yaml delete mode 100644 .ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml delete mode 100644 .ci_support/win_64_numpy1.22python3.8.____cpython.yaml diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 536fd7c..781ed28 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -12,10 +12,6 @@ jobs: CONFIG: linux_64_numpy1.22python3.10.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_numpy1.22python3.8.____cpython: - CONFIG: linux_64_numpy1.22python3.8.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_64_numpy1.22python3.9.____cpython: CONFIG: linux_64_numpy1.22python3.9.____cpython UPLOAD_PACKAGES: 'True' diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 2e1f707..9fbbfa5 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -11,9 +11,6 @@ jobs: osx_64_numpy1.22python3.10.____cpython: CONFIG: osx_64_numpy1.22python3.10.____cpython UPLOAD_PACKAGES: 'True' - osx_64_numpy1.22python3.8.____cpython: - CONFIG: osx_64_numpy1.22python3.8.____cpython - UPLOAD_PACKAGES: 'True' osx_64_numpy1.22python3.9.____cpython: CONFIG: osx_64_numpy1.22python3.9.____cpython UPLOAD_PACKAGES: 'True' @@ -23,9 +20,6 @@ jobs: osx_arm64_numpy1.22python3.10.____cpython: CONFIG: osx_arm64_numpy1.22python3.10.____cpython UPLOAD_PACKAGES: 'True' - osx_arm64_numpy1.22python3.8.____cpython: - CONFIG: osx_arm64_numpy1.22python3.8.____cpython - UPLOAD_PACKAGES: 'True' osx_arm64_numpy1.22python3.9.____cpython: CONFIG: osx_arm64_numpy1.22python3.9.____cpython UPLOAD_PACKAGES: 'True' diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index eedfd44..e2307e3 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -11,9 +11,6 @@ jobs: win_64_numpy1.22python3.10.____cpython: CONFIG: win_64_numpy1.22python3.10.____cpython UPLOAD_PACKAGES: 'True' - win_64_numpy1.22python3.8.____cpython: - CONFIG: win_64_numpy1.22python3.8.____cpython - UPLOAD_PACKAGES: 'True' win_64_numpy1.22python3.9.____cpython: CONFIG: win_64_numpy1.22python3.9.____cpython UPLOAD_PACKAGES: 'True' diff --git a/.ci_support/linux_64_numpy1.22python3.8.____cpython.yaml b/.ci_support/linux_64_numpy1.22python3.8.____cpython.yaml deleted file mode 100644 index 1f23555..0000000 --- a/.ci_support/linux_64_numpy1.22python3.8.____cpython.yaml +++ /dev/null @@ -1,36 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '12' -cdt_name: -- cos6 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- gxx -cxx_compiler_version: -- '12' -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -numpy: -- '1.22' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.8.* *_cpython -python_impl: -- cpython -target_platform: -- linux-64 -tbb: -- '2021' -zip_keys: -- - c_compiler_version - - cxx_compiler_version -- - python - - numpy - - python_impl diff --git a/.ci_support/linux_aarch64_numpy1.22python3.8.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.22python3.8.____cpython.yaml deleted file mode 100644 index 2b65590..0000000 --- a/.ci_support/linux_aarch64_numpy1.22python3.8.____cpython.yaml +++ /dev/null @@ -1,40 +0,0 @@ -BUILD: -- aarch64-conda_cos7-linux-gnu -c_compiler: -- gcc -c_compiler_version: -- '12' -cdt_arch: -- aarch64 -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- gxx -cxx_compiler_version: -- '12' -docker_image: -- quay.io/condaforge/linux-anvil-aarch64 -numpy: -- '1.22' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.8.* *_cpython -python_impl: -- cpython -target_platform: -- linux-aarch64 -tbb: -- '2021' -zip_keys: -- - c_compiler_version - - cxx_compiler_version -- - python - - numpy - - python_impl diff --git a/.ci_support/linux_ppc64le_numpy1.22python3.8.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.22python3.8.____cpython.yaml deleted file mode 100644 index 5e5922f..0000000 --- a/.ci_support/linux_ppc64le_numpy1.22python3.8.____cpython.yaml +++ /dev/null @@ -1,36 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '12' -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- gxx -cxx_compiler_version: -- '12' -docker_image: -- quay.io/condaforge/linux-anvil-ppc64le -numpy: -- '1.22' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.8.* *_cpython -python_impl: -- cpython -target_platform: -- linux-ppc64le -tbb: -- '2021' -zip_keys: -- - c_compiler_version - - cxx_compiler_version -- - python - - numpy - - python_impl diff --git a/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml b/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml deleted file mode 100644 index 574bfcc..0000000 --- a/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml +++ /dev/null @@ -1,38 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '10.9' -c_compiler: -- clang -c_compiler_version: -- '16' -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- clangxx -cxx_compiler_version: -- '16' -llvm_openmp: -- '16' -macos_machine: -- x86_64-apple-darwin13.4.0 -numpy: -- '1.22' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.8.* *_cpython -python_impl: -- cpython -target_platform: -- osx-64 -tbb: -- '2021' -zip_keys: -- - c_compiler_version - - cxx_compiler_version -- - python - - numpy - - python_impl diff --git a/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml deleted file mode 100644 index d1ee8bc..0000000 --- a/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml +++ /dev/null @@ -1,38 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '11.0' -c_compiler: -- clang -c_compiler_version: -- '16' -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- clangxx -cxx_compiler_version: -- '16' -llvm_openmp: -- '16' -macos_machine: -- arm64-apple-darwin20.0.0 -numpy: -- '1.22' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.8.* *_cpython -python_impl: -- cpython -target_platform: -- osx-arm64 -tbb: -- '2021' -zip_keys: -- - c_compiler_version - - cxx_compiler_version -- - python - - numpy - - python_impl diff --git a/.ci_support/win_64_numpy1.22python3.8.____cpython.yaml b/.ci_support/win_64_numpy1.22python3.8.____cpython.yaml deleted file mode 100644 index fc1af03..0000000 --- a/.ci_support/win_64_numpy1.22python3.8.____cpython.yaml +++ /dev/null @@ -1,26 +0,0 @@ -c_compiler: -- vs2019 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- vs2019 -numpy: -- '1.22' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.8.* *_cpython -python_impl: -- cpython -target_platform: -- win-64 -tbb: -- '2021' -zip_keys: -- - python - - numpy - - python_impl diff --git a/.travis.yml b/.travis.yml index 5028544..a042e0d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,11 +12,6 @@ matrix: arch: arm64 dist: focal - - 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.22python3.9.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-aarch64 DOCKER_IMAGE=quay.io/condaforge/linux-anvil-aarch64 os: linux arch: arm64 @@ -32,11 +27,6 @@ matrix: arch: ppc64le dist: focal - - 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.22python3.9.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le os: linux arch: ppc64le diff --git a/README.md b/README.md index 4dbd56e..750c739 100644 --- a/README.md +++ b/README.md @@ -49,13 +49,6 @@ Current build status <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=linux&configuration=linux%20linux_64_numpy1.22python3.10.____cpython" alt="variant"> </a> </td> - </tr><tr> - <td>linux_64_numpy1.22python3.8.____cpython</td> - <td> - <a href="https://dev.azure.com/conda-forge/feedstock-builds/_build/latest?definitionId=700&branchName=main"> - <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=linux&configuration=linux%20linux_64_numpy1.22python3.8.____cpython" alt="variant"> - </a> - </td> </tr><tr> <td>linux_64_numpy1.22python3.9.____cpython</td> <td> @@ -77,13 +70,6 @@ Current build status <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=linux&configuration=linux%20linux_aarch64_numpy1.22python3.10.____cpython" alt="variant"> </a> </td> - </tr><tr> - <td>linux_aarch64_numpy1.22python3.8.____cpython</td> - <td> - <a href="https://dev.azure.com/conda-forge/feedstock-builds/_build/latest?definitionId=700&branchName=main"> - <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=linux&configuration=linux%20linux_aarch64_numpy1.22python3.8.____cpython" alt="variant"> - </a> - </td> </tr><tr> <td>linux_aarch64_numpy1.22python3.9.____cpython</td> <td> @@ -105,13 +91,6 @@ Current build status <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=linux&configuration=linux%20linux_ppc64le_numpy1.22python3.10.____cpython" alt="variant"> </a> </td> - </tr><tr> - <td>linux_ppc64le_numpy1.22python3.8.____cpython</td> - <td> - <a href="https://dev.azure.com/conda-forge/feedstock-builds/_build/latest?definitionId=700&branchName=main"> - <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=linux&configuration=linux%20linux_ppc64le_numpy1.22python3.8.____cpython" alt="variant"> - </a> - </td> </tr><tr> <td>linux_ppc64le_numpy1.22python3.9.____cpython</td> <td> @@ -133,13 +112,6 @@ Current build status <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=osx&configuration=osx%20osx_64_numpy1.22python3.10.____cpython" alt="variant"> </a> </td> - </tr><tr> - <td>osx_64_numpy1.22python3.8.____cpython</td> - <td> - <a href="https://dev.azure.com/conda-forge/feedstock-builds/_build/latest?definitionId=700&branchName=main"> - <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=osx&configuration=osx%20osx_64_numpy1.22python3.8.____cpython" alt="variant"> - </a> - </td> </tr><tr> <td>osx_64_numpy1.22python3.9.____cpython</td> <td> @@ -161,13 +133,6 @@ Current build status <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=osx&configuration=osx%20osx_arm64_numpy1.22python3.10.____cpython" alt="variant"> </a> </td> - </tr><tr> - <td>osx_arm64_numpy1.22python3.8.____cpython</td> - <td> - <a href="https://dev.azure.com/conda-forge/feedstock-builds/_build/latest?definitionId=700&branchName=main"> - <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=osx&configuration=osx%20osx_arm64_numpy1.22python3.8.____cpython" alt="variant"> - </a> - </td> </tr><tr> <td>osx_arm64_numpy1.22python3.9.____cpython</td> <td> @@ -189,13 +154,6 @@ Current build status <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=win&configuration=win%20win_64_numpy1.22python3.10.____cpython" alt="variant"> </a> </td> - </tr><tr> - <td>win_64_numpy1.22python3.8.____cpython</td> - <td> - <a href="https://dev.azure.com/conda-forge/feedstock-builds/_build/latest?definitionId=700&branchName=main"> - <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=win&configuration=win%20win_64_numpy1.22python3.8.____cpython" alt="variant"> - </a> - </td> </tr><tr> <td>win_64_numpy1.22python3.9.____cpython</td> <td> From e77e4536d80bb1687536e7e3c29717be7bde34d1 Mon Sep 17 00:00:00 2001 From: jakirkham <jakirkham@gmail.com> Date: Fri, 2 Feb 2024 16:41:40 -0800 Subject: [PATCH 06/49] Drop `importlib-metadata` No longer needed with the Python 3.9 minimum. --- recipe/meta.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index ccdd305..b4a525b 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -47,7 +47,6 @@ requirements: - python - {{ pin_compatible('llvmlite', max_pin='x.x') }} - {{ pin_compatible('numpy') }} - - importlib-metadata # [py < 39] run_constrained: - {{ pin_compatible('tbb', max_pin=None) }} From 605b6cee637484e9d04e4fd534c1ae1bce723e48 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Sat, 3 Feb 2024 03:55:41 +0000 Subject: [PATCH 07/49] Rebuild for python312 --- .ci_support/migrations/python312.yaml | 38 +++++++++++++++++++++++++++ conda-forge.yml | 12 +++++---- recipe/meta.yaml | 2 +- 3 files changed, 46 insertions(+), 6 deletions(-) create mode 100644 .ci_support/migrations/python312.yaml diff --git a/.ci_support/migrations/python312.yaml b/.ci_support/migrations/python312.yaml new file mode 100644 index 0000000..b39b1bb --- /dev/null +++ b/.ci_support/migrations/python312.yaml @@ -0,0 +1,38 @@ +migrator_ts: 1695046563 +__migrator: + migration_number: 1 + operation: key_add + primary_key: python + ordering: + python: + - 3.6.* *_cpython + - 3.7.* *_cpython + - 3.8.* *_cpython + - 3.9.* *_cpython + - 3.10.* *_cpython + - 3.11.* *_cpython + - 3.12.* *_cpython # new entry + - 3.6.* *_73_pypy + - 3.7.* *_73_pypy + - 3.8.* *_73_pypy + - 3.9.* *_73_pypy + paused: false + longterm: True + pr_limit: 30 + max_solver_attempts: 6 # this will make the bot retry "not solvable" stuff 6 times + exclude: + # this shouldn't attempt to modify the python feedstocks + - python + - pypy3.6 + - pypy-meta + - cross-python + - python_abi + exclude_pinned_pkgs: false + +python: + - 3.12.* *_cpython +# additional entries to add for zip_keys +numpy: + - 1.26 +python_impl: + - cpython diff --git a/conda-forge.yml b/conda-forge.yml index 2cdba53..092b9fd 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -1,12 +1,14 @@ build_platform: + linux_aarch64: linux_64 + linux_ppc64le: linux_64 osx_arm64: osx_64 +conda_build: + pkg_format: '2' conda_forge_output_validation: true +github: + branch_name: main + tooling_branch_name: main provider: linux_aarch64: default linux_ppc64le: default test_on_native_only: true -github: - branch_name: main - tooling_branch_name: main -conda_build: - pkg_format: '2' diff --git a/recipe/meta.yaml b/recipe/meta.yaml index b4a525b..467cb61 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -12,7 +12,7 @@ source: sha256: {{ sha256 }} build: - number: 0 + number: 1 entry_points: - numba = numba.misc.numba_entry:main script: From b4c27f893d3fc2a975f4d788caeae1376bf7261f Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Sat, 3 Feb 2024 03:55:53 +0000 Subject: [PATCH 08/49] MNT: Re-rendered with conda-build 3.28.4, conda-smithy 3.30.4, and conda-forge-pinning 2024.02.03.02.35.01 --- .azure-pipelines/azure-pipelines-linux.yml | 36 +++++++++++++ .azure-pipelines/azure-pipelines-osx.yml | 6 +++ .azure-pipelines/azure-pipelines-win.yml | 3 ++ ...ux_64_numpy1.26python3.12.____cpython.yaml | 36 +++++++++++++ ...rch64_numpy1.22python3.10.____cpython.yaml | 2 +- ...arch64_numpy1.22python3.9.____cpython.yaml | 2 +- ...rch64_numpy1.23python3.11.____cpython.yaml | 2 +- ...rch64_numpy1.26python3.12.____cpython.yaml | 40 +++++++++++++++ ...c64le_numpy1.22python3.10.____cpython.yaml | 2 +- ...pc64le_numpy1.22python3.9.____cpython.yaml | 2 +- ...c64le_numpy1.23python3.11.____cpython.yaml | 2 +- ...c64le_numpy1.26python3.12.____cpython.yaml | 36 +++++++++++++ ...sx_64_numpy1.26python3.12.____cpython.yaml | 38 ++++++++++++++ ...arm64_numpy1.26python3.12.____cpython.yaml | 38 ++++++++++++++ ...in_64_numpy1.26python3.12.____cpython.yaml | 26 ++++++++++ .travis.yml | 50 ------------------ README.md | 51 ++++++++++++++++--- 17 files changed, 308 insertions(+), 64 deletions(-) create mode 100644 .ci_support/linux_64_numpy1.26python3.12.____cpython.yaml create mode 100644 .ci_support/linux_aarch64_numpy1.26python3.12.____cpython.yaml create mode 100644 .ci_support/linux_ppc64le_numpy1.26python3.12.____cpython.yaml create mode 100644 .ci_support/osx_64_numpy1.26python3.12.____cpython.yaml create mode 100644 .ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml create mode 100644 .ci_support/win_64_numpy1.26python3.12.____cpython.yaml delete mode 100644 .travis.yml diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 781ed28..4c6e4e5 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -20,6 +20,42 @@ jobs: CONFIG: linux_64_numpy1.23python3.11.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_64_numpy1.26python3.12.____cpython: + CONFIG: linux_64_numpy1.26python3.12.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_aarch64_numpy1.22python3.10.____cpython: + CONFIG: linux_aarch64_numpy1.22python3.10.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_aarch64_numpy1.22python3.9.____cpython: + CONFIG: linux_aarch64_numpy1.22python3.9.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_aarch64_numpy1.23python3.11.____cpython: + CONFIG: linux_aarch64_numpy1.23python3.11.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_aarch64_numpy1.26python3.12.____cpython: + CONFIG: linux_aarch64_numpy1.26python3.12.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_ppc64le_numpy1.22python3.10.____cpython: + CONFIG: linux_ppc64le_numpy1.22python3.10.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_ppc64le_numpy1.22python3.9.____cpython: + CONFIG: linux_ppc64le_numpy1.22python3.9.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_ppc64le_numpy1.23python3.11.____cpython: + CONFIG: linux_ppc64le_numpy1.23python3.11.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_ppc64le_numpy1.26python3.12.____cpython: + CONFIG: linux_ppc64le_numpy1.26python3.12.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 timeoutInMinutes: 360 steps: diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 9fbbfa5..43d8987 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -17,6 +17,9 @@ jobs: osx_64_numpy1.23python3.11.____cpython: CONFIG: osx_64_numpy1.23python3.11.____cpython UPLOAD_PACKAGES: 'True' + osx_64_numpy1.26python3.12.____cpython: + CONFIG: osx_64_numpy1.26python3.12.____cpython + UPLOAD_PACKAGES: 'True' osx_arm64_numpy1.22python3.10.____cpython: CONFIG: osx_arm64_numpy1.22python3.10.____cpython UPLOAD_PACKAGES: 'True' @@ -26,6 +29,9 @@ jobs: osx_arm64_numpy1.23python3.11.____cpython: CONFIG: osx_arm64_numpy1.23python3.11.____cpython UPLOAD_PACKAGES: 'True' + osx_arm64_numpy1.26python3.12.____cpython: + CONFIG: osx_arm64_numpy1.26python3.12.____cpython + UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 steps: diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index e2307e3..5d7e6ac 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -17,6 +17,9 @@ jobs: win_64_numpy1.23python3.11.____cpython: CONFIG: win_64_numpy1.23python3.11.____cpython UPLOAD_PACKAGES: 'True' + win_64_numpy1.26python3.12.____cpython: + CONFIG: win_64_numpy1.26python3.12.____cpython + UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 variables: CONDA_BLD_PATH: D:\\bld\\ diff --git a/.ci_support/linux_64_numpy1.26python3.12.____cpython.yaml b/.ci_support/linux_64_numpy1.26python3.12.____cpython.yaml new file mode 100644 index 0000000..8e1b718 --- /dev/null +++ b/.ci_support/linux_64_numpy1.26python3.12.____cpython.yaml @@ -0,0 +1,36 @@ +c_compiler: +- gcc +c_compiler_version: +- '12' +cdt_name: +- cos6 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- gxx +cxx_compiler_version: +- '12' +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +numpy: +- '1.26' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.12.* *_cpython +python_impl: +- cpython +target_platform: +- linux-64 +tbb: +- '2021' +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - python + - numpy + - python_impl diff --git a/.ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml index 456a257..d90b873 100644 --- a/.ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml @@ -17,7 +17,7 @@ cxx_compiler: cxx_compiler_version: - '12' docker_image: -- quay.io/condaforge/linux-anvil-aarch64 +- quay.io/condaforge/linux-anvil-cos7-x86_64 numpy: - '1.22' pin_run_as_build: diff --git a/.ci_support/linux_aarch64_numpy1.22python3.9.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.22python3.9.____cpython.yaml index 87f1b09..0fba583 100644 --- a/.ci_support/linux_aarch64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.22python3.9.____cpython.yaml @@ -17,7 +17,7 @@ cxx_compiler: cxx_compiler_version: - '12' docker_image: -- quay.io/condaforge/linux-anvil-aarch64 +- quay.io/condaforge/linux-anvil-cos7-x86_64 numpy: - '1.22' pin_run_as_build: diff --git a/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml index ae0b8c6..63a1275 100644 --- a/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml @@ -17,7 +17,7 @@ cxx_compiler: cxx_compiler_version: - '12' docker_image: -- quay.io/condaforge/linux-anvil-aarch64 +- quay.io/condaforge/linux-anvil-cos7-x86_64 numpy: - '1.23' pin_run_as_build: diff --git a/.ci_support/linux_aarch64_numpy1.26python3.12.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.26python3.12.____cpython.yaml new file mode 100644 index 0000000..b4dc3aa --- /dev/null +++ b/.ci_support/linux_aarch64_numpy1.26python3.12.____cpython.yaml @@ -0,0 +1,40 @@ +BUILD: +- aarch64-conda_cos7-linux-gnu +c_compiler: +- gcc +c_compiler_version: +- '12' +cdt_arch: +- aarch64 +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- gxx +cxx_compiler_version: +- '12' +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +numpy: +- '1.26' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.12.* *_cpython +python_impl: +- cpython +target_platform: +- linux-aarch64 +tbb: +- '2021' +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - python + - numpy + - python_impl diff --git a/.ci_support/linux_ppc64le_numpy1.22python3.10.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.22python3.10.____cpython.yaml index b9fb690..0036479 100644 --- a/.ci_support/linux_ppc64le_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.22python3.10.____cpython.yaml @@ -13,7 +13,7 @@ cxx_compiler: cxx_compiler_version: - '12' docker_image: -- quay.io/condaforge/linux-anvil-ppc64le +- quay.io/condaforge/linux-anvil-cos7-x86_64 numpy: - '1.22' pin_run_as_build: diff --git a/.ci_support/linux_ppc64le_numpy1.22python3.9.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.22python3.9.____cpython.yaml index d8e02bd..58a943c 100644 --- a/.ci_support/linux_ppc64le_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.22python3.9.____cpython.yaml @@ -13,7 +13,7 @@ cxx_compiler: cxx_compiler_version: - '12' docker_image: -- quay.io/condaforge/linux-anvil-ppc64le +- quay.io/condaforge/linux-anvil-cos7-x86_64 numpy: - '1.22' pin_run_as_build: diff --git a/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml index 1d11b04..8332bb5 100644 --- a/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml @@ -13,7 +13,7 @@ cxx_compiler: cxx_compiler_version: - '12' docker_image: -- quay.io/condaforge/linux-anvil-ppc64le +- quay.io/condaforge/linux-anvil-cos7-x86_64 numpy: - '1.23' pin_run_as_build: diff --git a/.ci_support/linux_ppc64le_numpy1.26python3.12.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.26python3.12.____cpython.yaml new file mode 100644 index 0000000..e472117 --- /dev/null +++ b/.ci_support/linux_ppc64le_numpy1.26python3.12.____cpython.yaml @@ -0,0 +1,36 @@ +c_compiler: +- gcc +c_compiler_version: +- '12' +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- gxx +cxx_compiler_version: +- '12' +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +numpy: +- '1.26' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.12.* *_cpython +python_impl: +- cpython +target_platform: +- linux-ppc64le +tbb: +- '2021' +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - python + - numpy + - python_impl diff --git a/.ci_support/osx_64_numpy1.26python3.12.____cpython.yaml b/.ci_support/osx_64_numpy1.26python3.12.____cpython.yaml new file mode 100644 index 0000000..a75e369 --- /dev/null +++ b/.ci_support/osx_64_numpy1.26python3.12.____cpython.yaml @@ -0,0 +1,38 @@ +MACOSX_DEPLOYMENT_TARGET: +- '10.9' +c_compiler: +- clang +c_compiler_version: +- '16' +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- clangxx +cxx_compiler_version: +- '16' +llvm_openmp: +- '16' +macos_machine: +- x86_64-apple-darwin13.4.0 +numpy: +- '1.26' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.12.* *_cpython +python_impl: +- cpython +target_platform: +- osx-64 +tbb: +- '2021' +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - python + - numpy + - python_impl diff --git a/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml b/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml new file mode 100644 index 0000000..19d0dc7 --- /dev/null +++ b/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml @@ -0,0 +1,38 @@ +MACOSX_DEPLOYMENT_TARGET: +- '11.0' +c_compiler: +- clang +c_compiler_version: +- '16' +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- clangxx +cxx_compiler_version: +- '16' +llvm_openmp: +- '16' +macos_machine: +- arm64-apple-darwin20.0.0 +numpy: +- '1.26' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.12.* *_cpython +python_impl: +- cpython +target_platform: +- osx-arm64 +tbb: +- '2021' +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - python + - numpy + - python_impl diff --git a/.ci_support/win_64_numpy1.26python3.12.____cpython.yaml b/.ci_support/win_64_numpy1.26python3.12.____cpython.yaml new file mode 100644 index 0000000..6a0c489 --- /dev/null +++ b/.ci_support/win_64_numpy1.26python3.12.____cpython.yaml @@ -0,0 +1,26 @@ +c_compiler: +- vs2019 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- vs2019 +numpy: +- '1.26' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.12.* *_cpython +python_impl: +- cpython +target_platform: +- win-64 +tbb: +- '2021' +zip_keys: +- - python + - numpy + - python_impl diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index a042e0d..0000000 --- a/.travis.yml +++ /dev/null @@ -1,50 +0,0 @@ -# This file was generated automatically from conda-smithy. To update this configuration, -# update the conda-forge.yml and/or the recipe/meta.yaml. - -language: generic - - - -matrix: - include: - - 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.22python3.9.____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.23python3.11.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-aarch64 DOCKER_IMAGE=quay.io/condaforge/linux-anvil-aarch64 - os: linux - arch: arm64 - dist: focal - - - 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.22python3.9.____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.23python3.11.____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 - - export GIT_BRANCH="$TRAVIS_BRANCH" - - export flow_run_id="travis_$TRAVIS_JOB_ID" - - export sha="$TRAVIS_COMMIT" - - export remote_url="https://github.com/$TRAVIS_REPO_SLUG" - - export FEEDSTOCK_NAME=$(basename ${TRAVIS_REPO_SLUG}) - - if [[ "${TRAVIS_PULL_REQUEST:-}" == "false" ]]; then export IS_PR_BUILD="False"; else export IS_PR_BUILD="True"; fi - - - - if [[ ${PLATFORM} =~ .*linux.* ]]; then CONDA_FORGE_DOCKER_RUN_ARGS="--network=host --security-opt=seccomp=unconfined" ./.scripts/run_docker_build.sh; fi \ No newline at end of file diff --git a/README.md b/README.md index 750c739..93688d0 100644 --- a/README.md +++ b/README.md @@ -22,14 +22,7 @@ Current build status ==================== -<table><tr> - <td>Travis</td> - <td> - <a href="https://app.travis-ci.com/conda-forge/numba-feedstock"> - <img alt="linux" src="https://img.shields.io/travis/com/conda-forge/numba-feedstock/main.svg?label=Linux"> - </a> - </td> - </tr> +<table> <tr> <td>Azure</td> @@ -63,6 +56,13 @@ Current build status <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=linux&configuration=linux%20linux_64_numpy1.23python3.11.____cpython" alt="variant"> </a> </td> + </tr><tr> + <td>linux_64_numpy1.26python3.12.____cpython</td> + <td> + <a href="https://dev.azure.com/conda-forge/feedstock-builds/_build/latest?definitionId=700&branchName=main"> + <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=linux&configuration=linux%20linux_64_numpy1.26python3.12.____cpython" alt="variant"> + </a> + </td> </tr><tr> <td>linux_aarch64_numpy1.22python3.10.____cpython</td> <td> @@ -84,6 +84,13 @@ Current build status <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=linux&configuration=linux%20linux_aarch64_numpy1.23python3.11.____cpython" alt="variant"> </a> </td> + </tr><tr> + <td>linux_aarch64_numpy1.26python3.12.____cpython</td> + <td> + <a href="https://dev.azure.com/conda-forge/feedstock-builds/_build/latest?definitionId=700&branchName=main"> + <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=linux&configuration=linux%20linux_aarch64_numpy1.26python3.12.____cpython" alt="variant"> + </a> + </td> </tr><tr> <td>linux_ppc64le_numpy1.22python3.10.____cpython</td> <td> @@ -105,6 +112,13 @@ Current build status <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=linux&configuration=linux%20linux_ppc64le_numpy1.23python3.11.____cpython" alt="variant"> </a> </td> + </tr><tr> + <td>linux_ppc64le_numpy1.26python3.12.____cpython</td> + <td> + <a href="https://dev.azure.com/conda-forge/feedstock-builds/_build/latest?definitionId=700&branchName=main"> + <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=linux&configuration=linux%20linux_ppc64le_numpy1.26python3.12.____cpython" alt="variant"> + </a> + </td> </tr><tr> <td>osx_64_numpy1.22python3.10.____cpython</td> <td> @@ -126,6 +140,13 @@ Current build status <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=osx&configuration=osx%20osx_64_numpy1.23python3.11.____cpython" alt="variant"> </a> </td> + </tr><tr> + <td>osx_64_numpy1.26python3.12.____cpython</td> + <td> + <a href="https://dev.azure.com/conda-forge/feedstock-builds/_build/latest?definitionId=700&branchName=main"> + <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=osx&configuration=osx%20osx_64_numpy1.26python3.12.____cpython" alt="variant"> + </a> + </td> </tr><tr> <td>osx_arm64_numpy1.22python3.10.____cpython</td> <td> @@ -147,6 +168,13 @@ Current build status <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=osx&configuration=osx%20osx_arm64_numpy1.23python3.11.____cpython" alt="variant"> </a> </td> + </tr><tr> + <td>osx_arm64_numpy1.26python3.12.____cpython</td> + <td> + <a href="https://dev.azure.com/conda-forge/feedstock-builds/_build/latest?definitionId=700&branchName=main"> + <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=osx&configuration=osx%20osx_arm64_numpy1.26python3.12.____cpython" alt="variant"> + </a> + </td> </tr><tr> <td>win_64_numpy1.22python3.10.____cpython</td> <td> @@ -168,6 +196,13 @@ Current build status <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=win&configuration=win%20win_64_numpy1.23python3.11.____cpython" alt="variant"> </a> </td> + </tr><tr> + <td>win_64_numpy1.26python3.12.____cpython</td> + <td> + <a href="https://dev.azure.com/conda-forge/feedstock-builds/_build/latest?definitionId=700&branchName=main"> + <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=win&configuration=win%20win_64_numpy1.26python3.12.____cpython" alt="variant"> + </a> + </td> </tr> </tbody> </table> From 798e05dfa968483eeda3bf91e311ea0afaddc526 Mon Sep 17 00:00:00 2001 From: jakirkham <jakirkham@gmail.com> Date: Sat, 3 Feb 2024 19:42:33 -0800 Subject: [PATCH 09/49] Use native compilation for Linux arch --- conda-forge.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/conda-forge.yml b/conda-forge.yml index 092b9fd..f37d44e 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -1,6 +1,4 @@ build_platform: - linux_aarch64: linux_64 - linux_ppc64le: linux_64 osx_arm64: osx_64 conda_build: pkg_format: '2' From 62e333003851c7207983c5c20c5461be3d378b3a Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Sun, 4 Feb 2024 03:44:35 +0000 Subject: [PATCH 10/49] MNT: Re-rendered with conda-build 3.28.4, conda-smithy 3.30.4, and conda-forge-pinning 2024.02.03.22.07.48 --- .azure-pipelines/azure-pipelines-linux.yml | 32 ---------- ...rch64_numpy1.22python3.10.____cpython.yaml | 2 +- ...arch64_numpy1.22python3.9.____cpython.yaml | 2 +- ...rch64_numpy1.23python3.11.____cpython.yaml | 2 +- ...rch64_numpy1.26python3.12.____cpython.yaml | 2 +- ...c64le_numpy1.22python3.10.____cpython.yaml | 2 +- ...pc64le_numpy1.22python3.9.____cpython.yaml | 2 +- ...c64le_numpy1.23python3.11.____cpython.yaml | 2 +- ...c64le_numpy1.26python3.12.____cpython.yaml | 2 +- .travis.yml | 60 +++++++++++++++++++ README.md | 9 ++- 11 files changed, 76 insertions(+), 41 deletions(-) create mode 100644 .travis.yml diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 4c6e4e5..0c0b2c5 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -24,38 +24,6 @@ jobs: CONFIG: linux_64_numpy1.26python3.12.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_numpy1.22python3.10.____cpython: - CONFIG: linux_aarch64_numpy1.22python3.10.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_numpy1.22python3.9.____cpython: - CONFIG: linux_aarch64_numpy1.22python3.9.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_numpy1.23python3.11.____cpython: - CONFIG: linux_aarch64_numpy1.23python3.11.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_numpy1.26python3.12.____cpython: - CONFIG: linux_aarch64_numpy1.26python3.12.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_numpy1.22python3.10.____cpython: - CONFIG: linux_ppc64le_numpy1.22python3.10.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_numpy1.22python3.9.____cpython: - CONFIG: linux_ppc64le_numpy1.22python3.9.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_numpy1.23python3.11.____cpython: - CONFIG: linux_ppc64le_numpy1.23python3.11.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_numpy1.26python3.12.____cpython: - CONFIG: linux_ppc64le_numpy1.26python3.12.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 timeoutInMinutes: 360 steps: diff --git a/.ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml index d90b873..456a257 100644 --- a/.ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml @@ -17,7 +17,7 @@ cxx_compiler: cxx_compiler_version: - '12' docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 +- quay.io/condaforge/linux-anvil-aarch64 numpy: - '1.22' pin_run_as_build: diff --git a/.ci_support/linux_aarch64_numpy1.22python3.9.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.22python3.9.____cpython.yaml index 0fba583..87f1b09 100644 --- a/.ci_support/linux_aarch64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.22python3.9.____cpython.yaml @@ -17,7 +17,7 @@ cxx_compiler: cxx_compiler_version: - '12' docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 +- quay.io/condaforge/linux-anvil-aarch64 numpy: - '1.22' pin_run_as_build: diff --git a/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml index 63a1275..ae0b8c6 100644 --- a/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml @@ -17,7 +17,7 @@ cxx_compiler: cxx_compiler_version: - '12' docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 +- quay.io/condaforge/linux-anvil-aarch64 numpy: - '1.23' pin_run_as_build: diff --git a/.ci_support/linux_aarch64_numpy1.26python3.12.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.26python3.12.____cpython.yaml index b4dc3aa..a9d8edd 100644 --- a/.ci_support/linux_aarch64_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.26python3.12.____cpython.yaml @@ -17,7 +17,7 @@ cxx_compiler: cxx_compiler_version: - '12' docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 +- quay.io/condaforge/linux-anvil-aarch64 numpy: - '1.26' pin_run_as_build: diff --git a/.ci_support/linux_ppc64le_numpy1.22python3.10.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.22python3.10.____cpython.yaml index 0036479..b9fb690 100644 --- a/.ci_support/linux_ppc64le_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.22python3.10.____cpython.yaml @@ -13,7 +13,7 @@ cxx_compiler: cxx_compiler_version: - '12' docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 +- quay.io/condaforge/linux-anvil-ppc64le numpy: - '1.22' pin_run_as_build: diff --git a/.ci_support/linux_ppc64le_numpy1.22python3.9.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.22python3.9.____cpython.yaml index 58a943c..d8e02bd 100644 --- a/.ci_support/linux_ppc64le_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.22python3.9.____cpython.yaml @@ -13,7 +13,7 @@ cxx_compiler: cxx_compiler_version: - '12' docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 +- quay.io/condaforge/linux-anvil-ppc64le numpy: - '1.22' pin_run_as_build: diff --git a/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml index 8332bb5..1d11b04 100644 --- a/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml @@ -13,7 +13,7 @@ cxx_compiler: cxx_compiler_version: - '12' docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 +- quay.io/condaforge/linux-anvil-ppc64le numpy: - '1.23' pin_run_as_build: diff --git a/.ci_support/linux_ppc64le_numpy1.26python3.12.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.26python3.12.____cpython.yaml index e472117..b4968e1 100644 --- a/.ci_support/linux_ppc64le_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.26python3.12.____cpython.yaml @@ -13,7 +13,7 @@ cxx_compiler: cxx_compiler_version: - '12' docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 +- quay.io/condaforge/linux-anvil-ppc64le numpy: - '1.26' pin_run_as_build: diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..fbfbff5 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,60 @@ +# This file was generated automatically from conda-smithy. To update this configuration, +# update the conda-forge.yml and/or the recipe/meta.yaml. + +language: generic + + + +matrix: + include: + - 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.22python3.9.____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.23python3.11.____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.26python3.12.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-aarch64 DOCKER_IMAGE=quay.io/condaforge/linux-anvil-aarch64 + os: linux + arch: arm64 + dist: focal + + - 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.22python3.9.____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.23python3.11.____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.26python3.12.____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 + - export GIT_BRANCH="$TRAVIS_BRANCH" + - export flow_run_id="travis_$TRAVIS_JOB_ID" + - export sha="$TRAVIS_COMMIT" + - export remote_url="https://github.com/$TRAVIS_REPO_SLUG" + - export FEEDSTOCK_NAME=$(basename ${TRAVIS_REPO_SLUG}) + - if [[ "${TRAVIS_PULL_REQUEST:-}" == "false" ]]; then export IS_PR_BUILD="False"; else export IS_PR_BUILD="True"; fi + + + - if [[ ${PLATFORM} =~ .*linux.* ]]; then CONDA_FORGE_DOCKER_RUN_ARGS="--network=host --security-opt=seccomp=unconfined" ./.scripts/run_docker_build.sh; fi \ No newline at end of file diff --git a/README.md b/README.md index 93688d0..1c4cd7d 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,14 @@ Current build status ==================== -<table> +<table><tr> + <td>Travis</td> + <td> + <a href="https://app.travis-ci.com/conda-forge/numba-feedstock"> + <img alt="linux" src="https://img.shields.io/travis/com/conda-forge/numba-feedstock/main.svg?label=Linux"> + </a> + </td> + </tr> <tr> <td>Azure</td> From c8755c42bbe4410b6f6fb497e3e3d7af24a713da Mon Sep 17 00:00:00 2001 From: "conda-forge-curator[bot]" <79913779+conda-forge-curator[bot]@users.noreply.github.com> Date: Fri, 15 Mar 2024 20:13:46 +0000 Subject: [PATCH 11/49] [ci skip] [skip ci] [cf admin skip] ***NO_CI*** admin migration CondaForgeYAMLTest --- conda-forge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda-forge.yml b/conda-forge.yml index f37d44e..edab33f 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -9,4 +9,4 @@ github: provider: linux_aarch64: default linux_ppc64le: default -test_on_native_only: true +test: native_and_emulated From 38b50a5c9315987d8ad0144178da352af6929f32 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Tue, 19 Mar 2024 16:36:27 +0000 Subject: [PATCH 12/49] updated v0.59.1 --- recipe/meta.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 467cb61..9a50c70 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,6 +1,6 @@ {% set name = "numba" %} -{% set version = "0.59.0" %} -{% set sha256 = "12b9b064a3e4ad00e2371fc5212ef0396c80f41caec9b5ec391c8b04b6eaf2a8" %} +{% set version = "0.59.1" %} +{% set sha256 = "76f69132b96028d2774ed20415e8c528a34e3299a40581bae178f0994a2f370b" %} package: name: numba @@ -12,7 +12,7 @@ source: sha256: {{ sha256 }} build: - number: 1 + number: 0 entry_points: - numba = numba.misc.numba_entry:main script: From fbc65f1af28a81c13a0ea0f28cbfd03fb9ef71f1 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Tue, 19 Mar 2024 16:36:47 +0000 Subject: [PATCH 13/49] 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 | 1 + .azure-pipelines/azure-pipelines-osx.yml | 1 + .scripts/build_steps.sh | 6 +++--- .scripts/run_osx_build.sh | 6 +++--- .scripts/run_win_build.bat | 4 ++-- azure-pipelines.yml | 4 ++-- build-locally.py | 5 +++-- 7 files changed, 15 insertions(+), 12 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 0c0b2c5..a9ee22f 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -25,6 +25,7 @@ jobs: 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 43d8987..d775f84 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -33,6 +33,7 @@ jobs: CONFIG: osx_arm64_numpy1.26python3.12.____cpython UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 + variables: {} steps: # TODO: Fast finish on azure pipelines? diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index beda247..899ba03 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -34,9 +34,9 @@ CONDARC export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 mamba install --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build boa conda-forge-ci-setup=4 + pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build boa conda-forge-ci-setup=4 + pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" @@ -68,7 +68,7 @@ if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then # Drop into an interactive shell /bin/bash else - conda mambabuild "${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 9259eb9..07dff21 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -26,9 +26,9 @@ export CONDA_SOLVER="libmamba" export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 mamba install --update-specs --quiet --yes --channel conda-forge --strict-channel-priority \ - pip mamba conda-build boa conda-forge-ci-setup=4 + pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build boa conda-forge-ci-setup=4 + pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" @@ -81,7 +81,7 @@ else EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --no-test" fi - conda mambabuild ./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/.scripts/run_win_build.bat b/.scripts/run_win_build.bat index 48734de..6d54697 100755 --- a/.scripts/run_win_build.bat +++ b/.scripts/run_win_build.bat @@ -24,7 +24,7 @@ set "CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1" :: 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=4 -c conda-forge --strict-channel-priority --yes +mamba.exe install "python=3.10" pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" -c conda-forge --strict-channel-priority --yes if !errorlevel! neq 0 exit /b !errorlevel! :: Set basic configuration @@ -55,7 +55,7 @@ call :end_group :: Build the recipe echo Building recipe -conda.exe mambabuild "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTRA_CB_OPTIONS% +conda-build.exe "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 diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 6b346f5..e5306da 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -4,5 +4,5 @@ jobs: - template: ./.azure-pipelines/azure-pipelines-linux.yml - - template: ./.azure-pipelines/azure-pipelines-win.yml - - template: ./.azure-pipelines/azure-pipelines-osx.yml \ No newline at end of file + - template: ./.azure-pipelines/azure-pipelines-osx.yml + - template: ./.azure-pipelines/azure-pipelines-win.yml \ No newline at end of file diff --git a/build-locally.py b/build-locally.py index 3f4b7a7..e0d408d 100755 --- a/build-locally.py +++ b/build-locally.py @@ -64,8 +64,9 @@ def verify_config(ns): elif ns.config.startswith("osx"): if "OSX_SDK_DIR" not in os.environ: raise RuntimeError( - "Need OSX_SDK_DIR env variable set. Run 'export OSX_SDK_DIR=SDKs' " - "to download the SDK automatically to 'SDKs/MacOSX<ver>.sdk'. " + "Need OSX_SDK_DIR env variable set. Run 'export OSX_SDK_DIR=$PWD/SDKs' " + "to download the SDK automatically to '$PWD/SDKs/MacOSX<ver>.sdk'. " + "Note: OSX_SDK_DIR must be set to an absolute path. " "Setting this variable implies agreement to the licensing terms of the SDK by Apple." ) From 2524bac3cbb372422692365f111c01794cdc84ff Mon Sep 17 00:00:00 2001 From: Graham Markall <gmarkall@nvidia.com> Date: Mon, 29 Apr 2024 11:29:51 +0100 Subject: [PATCH 14/49] MNT: Re-rendered with conda-build 24.3.0, conda-smithy 3.34.1, and conda-forge-pinning 2024.04.29.07.49.04 --- ...linux_64_numpy1.22python3.10.____cpython.yaml | 8 +++++++- .../linux_64_numpy1.22python3.9.____cpython.yaml | 8 +++++++- ...linux_64_numpy1.23python3.11.____cpython.yaml | 8 +++++++- ...linux_64_numpy1.26python3.12.____cpython.yaml | 8 +++++++- ..._aarch64_numpy1.22python3.10.____cpython.yaml | 8 +++++++- ...x_aarch64_numpy1.22python3.9.____cpython.yaml | 8 +++++++- ..._aarch64_numpy1.23python3.11.____cpython.yaml | 8 +++++++- ..._aarch64_numpy1.26python3.12.____cpython.yaml | 8 +++++++- ..._ppc64le_numpy1.22python3.10.____cpython.yaml | 8 +++++++- ...x_ppc64le_numpy1.22python3.9.____cpython.yaml | 8 +++++++- ..._ppc64le_numpy1.23python3.11.____cpython.yaml | 8 +++++++- ..._ppc64le_numpy1.26python3.12.____cpython.yaml | 8 +++++++- .../osx_64_numpy1.22python3.10.____cpython.yaml | 6 +++++- .../osx_64_numpy1.22python3.9.____cpython.yaml | 6 +++++- .../osx_64_numpy1.23python3.11.____cpython.yaml | 6 +++++- .../osx_64_numpy1.26python3.12.____cpython.yaml | 6 +++++- ...sx_arm64_numpy1.22python3.10.____cpython.yaml | 6 +++++- ...osx_arm64_numpy1.22python3.9.____cpython.yaml | 6 +++++- ...sx_arm64_numpy1.23python3.11.____cpython.yaml | 6 +++++- ...sx_arm64_numpy1.26python3.12.____cpython.yaml | 6 +++++- .../win_64_numpy1.22python3.10.____cpython.yaml | 4 +++- .../win_64_numpy1.22python3.9.____cpython.yaml | 4 +++- .../win_64_numpy1.23python3.11.____cpython.yaml | 4 +++- .../win_64_numpy1.26python3.12.____cpython.yaml | 4 +++- README.md | 16 ++++++++-------- 25 files changed, 144 insertions(+), 32 deletions(-) diff --git a/.ci_support/linux_64_numpy1.22python3.10.____cpython.yaml b/.ci_support/linux_64_numpy1.22python3.10.____cpython.yaml index fed021f..4a25642 100644 --- a/.ci_support/linux_64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.22python3.10.____cpython.yaml @@ -2,12 +2,16 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.12' cdt_name: - cos6 channel_sources: - conda-forge channel_targets: -- conda-forge main +- conda-forge numba_rc cxx_compiler: - gxx cxx_compiler_version: @@ -31,6 +35,8 @@ tbb: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - numpy - python_impl diff --git a/.ci_support/linux_64_numpy1.22python3.9.____cpython.yaml b/.ci_support/linux_64_numpy1.22python3.9.____cpython.yaml index 18a7ce8..08da003 100644 --- a/.ci_support/linux_64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.22python3.9.____cpython.yaml @@ -2,12 +2,16 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.12' cdt_name: - cos6 channel_sources: - conda-forge channel_targets: -- conda-forge main +- conda-forge numba_rc cxx_compiler: - gxx cxx_compiler_version: @@ -31,6 +35,8 @@ tbb: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - numpy - python_impl diff --git a/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml index 1ec43c5..20ec1b8 100644 --- a/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml @@ -2,12 +2,16 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.12' cdt_name: - cos6 channel_sources: - conda-forge channel_targets: -- conda-forge main +- conda-forge numba_rc cxx_compiler: - gxx cxx_compiler_version: @@ -31,6 +35,8 @@ tbb: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - numpy - python_impl diff --git a/.ci_support/linux_64_numpy1.26python3.12.____cpython.yaml b/.ci_support/linux_64_numpy1.26python3.12.____cpython.yaml index 8e1b718..dee1208 100644 --- a/.ci_support/linux_64_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.26python3.12.____cpython.yaml @@ -2,12 +2,16 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.12' cdt_name: - cos6 channel_sources: - conda-forge channel_targets: -- conda-forge main +- conda-forge numba_rc cxx_compiler: - gxx cxx_compiler_version: @@ -31,6 +35,8 @@ tbb: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - numpy - python_impl diff --git a/.ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml index 456a257..1578bc5 100644 --- a/.ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml @@ -4,6 +4,10 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_arch: - aarch64 cdt_name: @@ -11,7 +15,7 @@ cdt_name: channel_sources: - conda-forge channel_targets: -- conda-forge main +- conda-forge numba_rc cxx_compiler: - gxx cxx_compiler_version: @@ -35,6 +39,8 @@ tbb: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - numpy - python_impl diff --git a/.ci_support/linux_aarch64_numpy1.22python3.9.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.22python3.9.____cpython.yaml index 87f1b09..71492c9 100644 --- a/.ci_support/linux_aarch64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.22python3.9.____cpython.yaml @@ -4,6 +4,10 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_arch: - aarch64 cdt_name: @@ -11,7 +15,7 @@ cdt_name: channel_sources: - conda-forge channel_targets: -- conda-forge main +- conda-forge numba_rc cxx_compiler: - gxx cxx_compiler_version: @@ -35,6 +39,8 @@ tbb: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - numpy - python_impl diff --git a/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml index ae0b8c6..1297a2a 100644 --- a/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml @@ -4,6 +4,10 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_arch: - aarch64 cdt_name: @@ -11,7 +15,7 @@ cdt_name: channel_sources: - conda-forge channel_targets: -- conda-forge main +- conda-forge numba_rc cxx_compiler: - gxx cxx_compiler_version: @@ -35,6 +39,8 @@ tbb: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - numpy - python_impl diff --git a/.ci_support/linux_aarch64_numpy1.26python3.12.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.26python3.12.____cpython.yaml index a9d8edd..52f2d9e 100644 --- a/.ci_support/linux_aarch64_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.26python3.12.____cpython.yaml @@ -4,6 +4,10 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_arch: - aarch64 cdt_name: @@ -11,7 +15,7 @@ cdt_name: channel_sources: - conda-forge channel_targets: -- conda-forge main +- conda-forge numba_rc cxx_compiler: - gxx cxx_compiler_version: @@ -35,6 +39,8 @@ tbb: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - numpy - python_impl diff --git a/.ci_support/linux_ppc64le_numpy1.22python3.10.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.22python3.10.____cpython.yaml index b9fb690..b5b0e6a 100644 --- a/.ci_support/linux_ppc64le_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.22python3.10.____cpython.yaml @@ -2,12 +2,16 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: - conda-forge channel_targets: -- conda-forge main +- conda-forge numba_rc cxx_compiler: - gxx cxx_compiler_version: @@ -31,6 +35,8 @@ tbb: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - numpy - python_impl diff --git a/.ci_support/linux_ppc64le_numpy1.22python3.9.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.22python3.9.____cpython.yaml index d8e02bd..a7cc007 100644 --- a/.ci_support/linux_ppc64le_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.22python3.9.____cpython.yaml @@ -2,12 +2,16 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: - conda-forge channel_targets: -- conda-forge main +- conda-forge numba_rc cxx_compiler: - gxx cxx_compiler_version: @@ -31,6 +35,8 @@ tbb: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - numpy - python_impl diff --git a/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml index 1d11b04..19cceaf 100644 --- a/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml @@ -2,12 +2,16 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: - conda-forge channel_targets: -- conda-forge main +- conda-forge numba_rc cxx_compiler: - gxx cxx_compiler_version: @@ -31,6 +35,8 @@ tbb: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - numpy - python_impl diff --git a/.ci_support/linux_ppc64le_numpy1.26python3.12.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.26python3.12.____cpython.yaml index b4968e1..77c7c41 100644 --- a/.ci_support/linux_ppc64le_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.26python3.12.____cpython.yaml @@ -2,12 +2,16 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: - conda-forge channel_targets: -- conda-forge main +- conda-forge numba_rc cxx_compiler: - gxx cxx_compiler_version: @@ -31,6 +35,8 @@ tbb: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - numpy - python_impl diff --git a/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml b/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml index 77d1013..dafec1e 100644 --- a/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml @@ -4,10 +4,14 @@ c_compiler: - clang c_compiler_version: - '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.9' channel_sources: - conda-forge channel_targets: -- conda-forge main +- conda-forge numba_rc cxx_compiler: - clangxx cxx_compiler_version: diff --git a/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml b/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml index 2206e05..c8b3f68 100644 --- a/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml @@ -4,10 +4,14 @@ c_compiler: - clang c_compiler_version: - '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.9' channel_sources: - conda-forge channel_targets: -- conda-forge main +- conda-forge numba_rc cxx_compiler: - clangxx cxx_compiler_version: diff --git a/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml b/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml index 909bea9..ff6b6e5 100644 --- a/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml @@ -4,10 +4,14 @@ c_compiler: - clang c_compiler_version: - '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.9' channel_sources: - conda-forge channel_targets: -- conda-forge main +- conda-forge numba_rc cxx_compiler: - clangxx cxx_compiler_version: diff --git a/.ci_support/osx_64_numpy1.26python3.12.____cpython.yaml b/.ci_support/osx_64_numpy1.26python3.12.____cpython.yaml index a75e369..074a151 100644 --- a/.ci_support/osx_64_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.26python3.12.____cpython.yaml @@ -4,10 +4,14 @@ c_compiler: - clang c_compiler_version: - '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.9' channel_sources: - conda-forge channel_targets: -- conda-forge main +- conda-forge numba_rc cxx_compiler: - clangxx cxx_compiler_version: diff --git a/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml index ef21985..eb94344 100644 --- a/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml @@ -4,10 +4,14 @@ c_compiler: - clang c_compiler_version: - '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '11.0' channel_sources: - conda-forge channel_targets: -- conda-forge main +- conda-forge numba_rc cxx_compiler: - clangxx cxx_compiler_version: diff --git a/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml index a0c3ba8..0264f4f 100644 --- a/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml @@ -4,10 +4,14 @@ c_compiler: - clang c_compiler_version: - '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '11.0' channel_sources: - conda-forge channel_targets: -- conda-forge main +- conda-forge numba_rc cxx_compiler: - clangxx cxx_compiler_version: diff --git a/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml b/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml index 4b39ebb..ea99b38 100644 --- a/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml @@ -4,10 +4,14 @@ c_compiler: - clang c_compiler_version: - '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '11.0' channel_sources: - conda-forge channel_targets: -- conda-forge main +- conda-forge numba_rc cxx_compiler: - clangxx cxx_compiler_version: diff --git a/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml b/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml index 19d0dc7..4c40e5e 100644 --- a/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml @@ -4,10 +4,14 @@ c_compiler: - clang c_compiler_version: - '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '11.0' channel_sources: - conda-forge channel_targets: -- conda-forge main +- conda-forge numba_rc cxx_compiler: - clangxx cxx_compiler_version: diff --git a/.ci_support/win_64_numpy1.22python3.10.____cpython.yaml b/.ci_support/win_64_numpy1.22python3.10.____cpython.yaml index 8e9b9a8..e102d1e 100644 --- a/.ci_support/win_64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/win_64_numpy1.22python3.10.____cpython.yaml @@ -1,9 +1,11 @@ c_compiler: - vs2019 +c_stdlib: +- vs channel_sources: - conda-forge channel_targets: -- conda-forge main +- conda-forge numba_rc cxx_compiler: - vs2019 numpy: diff --git a/.ci_support/win_64_numpy1.22python3.9.____cpython.yaml b/.ci_support/win_64_numpy1.22python3.9.____cpython.yaml index b52ecc8..64a56a1 100644 --- a/.ci_support/win_64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/win_64_numpy1.22python3.9.____cpython.yaml @@ -1,9 +1,11 @@ c_compiler: - vs2019 +c_stdlib: +- vs channel_sources: - conda-forge channel_targets: -- conda-forge main +- conda-forge numba_rc cxx_compiler: - vs2019 numpy: diff --git a/.ci_support/win_64_numpy1.23python3.11.____cpython.yaml b/.ci_support/win_64_numpy1.23python3.11.____cpython.yaml index 5dcd582..ec339fc 100644 --- a/.ci_support/win_64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/win_64_numpy1.23python3.11.____cpython.yaml @@ -1,9 +1,11 @@ c_compiler: - vs2019 +c_stdlib: +- vs channel_sources: - conda-forge channel_targets: -- conda-forge main +- conda-forge numba_rc cxx_compiler: - vs2019 numpy: diff --git a/.ci_support/win_64_numpy1.26python3.12.____cpython.yaml b/.ci_support/win_64_numpy1.26python3.12.____cpython.yaml index 6a0c489..4fb9dc7 100644 --- a/.ci_support/win_64_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/win_64_numpy1.26python3.12.____cpython.yaml @@ -1,9 +1,11 @@ c_compiler: - vs2019 +c_stdlib: +- vs channel_sources: - conda-forge channel_targets: -- conda-forge main +- conda-forge numba_rc cxx_compiler: - vs2019 numpy: diff --git a/README.md b/README.md index 1c4cd7d..eae9251 100644 --- a/README.md +++ b/README.md @@ -228,14 +228,14 @@ Current release info Installing numba ================ -Installing `numba` from the `conda-forge` channel can be achieved by adding `conda-forge` to your channels with: +Installing `numba` from the `conda-forge/label/numba_rc` channel can be achieved by adding `conda-forge/label/numba_rc` to your channels with: ``` -conda config --add channels conda-forge +conda config --add channels conda-forge/label/numba_rc conda config --set channel_priority strict ``` -Once the `conda-forge` channel has been enabled, `numba` can be installed with `conda`: +Once the `conda-forge/label/numba_rc` channel has been enabled, `numba` can be installed with `conda`: ``` conda install numba @@ -250,26 +250,26 @@ mamba install numba It is possible to list all of the versions of `numba` available on your platform with `conda`: ``` -conda search numba --channel conda-forge +conda search numba --channel conda-forge/label/numba_rc ``` or with `mamba`: ``` -mamba search numba --channel conda-forge +mamba search numba --channel conda-forge/label/numba_rc ``` Alternatively, `mamba repoquery` may provide more information: ``` # Search all versions available on your platform: -mamba repoquery search numba --channel conda-forge +mamba repoquery search numba --channel conda-forge/label/numba_rc # List packages depending on `numba`: -mamba repoquery whoneeds numba --channel conda-forge +mamba repoquery whoneeds numba --channel conda-forge/label/numba_rc # List dependencies of `numba`: -mamba repoquery depends numba --channel conda-forge +mamba repoquery depends numba --channel conda-forge/label/numba_rc ``` From dcd1fefe5e619e18ec92605016143ec0cd6ebb26 Mon Sep 17 00:00:00 2001 From: Graham Markall <gmarkall@nvidia.com> Date: Mon, 29 Apr 2024 11:30:13 +0100 Subject: [PATCH 15/49] Add numba_rc channel target --- recipe/conda_build_config.yaml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 recipe/conda_build_config.yaml diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml new file mode 100644 index 0000000..057405f --- /dev/null +++ b/recipe/conda_build_config.yaml @@ -0,0 +1,4 @@ +channel_sources: + - conda-forge +channel_targets: + - conda-forge numba_rc From 9759ef9be0c27dd227a36d14126698d3aafcf300 Mon Sep 17 00:00:00 2001 From: Graham Markall <gmarkall@nvidia.com> Date: Mon, 29 Apr 2024 11:32:10 +0100 Subject: [PATCH 16/49] Try with what may become 0.60.0rc1 --- recipe/meta.yaml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 9a50c70..69f4a62 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,14 +1,13 @@ {% set name = "numba" %} -{% set version = "0.59.1" %} -{% set sha256 = "76f69132b96028d2774ed20415e8c528a34e3299a40581bae178f0994a2f370b" %} +{% set version = "0.60.0dev1" %} +{% set sha256 = "db653cfff996cffc8137cdb85682c4269383d8fc3f5f0988ccba93c160e095c9" %} package: name: numba version: {{ version }} source: - url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/{{ name }}-{{ version }}.tar.gz - # url: https://github.com/numba/numba/archive/{{ version }}.tar.gz + url: https://github.com/gmarkall/{{ name }}/archive/refs/tags/{{ version }}.tar.gz sha256: {{ sha256 }} build: From be12b9c9088a9dc21e3225ea123ad4112c9ddaa6 Mon Sep 17 00:00:00 2001 From: Graham Markall <gmarkall@nvidia.com> Date: Mon, 29 Apr 2024 11:49:37 +0100 Subject: [PATCH 17/49] Patch llvmlite version check in Numba --- recipe/llvmlite_version_check.patch | 14 ++++++++++++++ recipe/meta.yaml | 2 ++ 2 files changed, 16 insertions(+) create mode 100644 recipe/llvmlite_version_check.patch diff --git a/recipe/llvmlite_version_check.patch b/recipe/llvmlite_version_check.patch new file mode 100644 index 0000000..4a9d87a --- /dev/null +++ b/recipe/llvmlite_version_check.patch @@ -0,0 +1,14 @@ +diff --git a/numba/__init__.py b/numba/__init__.py +index 5e56ffe07..7d2ae72e2 100644 +--- a/numba/__init__.py ++++ b/numba/__init__.py +@@ -142,7 +142,7 @@ __all__ = """ + """.split() + types.__all__ + errors.__all__ + + +-_min_llvmlite_version = (0, 43, 0) ++_min_llvmlite_version = (0, 42, 0) + _min_llvm_version = (14, 0, 0) + + def _ensure_llvm(): + diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 69f4a62..bf314e6 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -9,6 +9,8 @@ package: source: url: https://github.com/gmarkall/{{ name }}/archive/refs/tags/{{ version }}.tar.gz sha256: {{ sha256 }} + patches: + - llvmlite_version_check.patch build: number: 0 From 2526c78c9c93dfa86df7d5f98b3b2b1781c7bd93 Mon Sep 17 00:00:00 2001 From: Graham Markall <gmarkall@nvidia.com> Date: Mon, 29 Apr 2024 12:32:19 +0100 Subject: [PATCH 18/49] Also patch requirements for llvmlite version --- recipe/llvmlite_version_check.patch | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/recipe/llvmlite_version_check.patch b/recipe/llvmlite_version_check.patch index 4a9d87a..781c590 100644 --- a/recipe/llvmlite_version_check.patch +++ b/recipe/llvmlite_version_check.patch @@ -11,4 +11,16 @@ index 5e56ffe07..7d2ae72e2 100644 _min_llvm_version = (14, 0, 0) def _ensure_llvm(): - +diff --git a/setup.py b/setup.py +index 56c180a5e..db28e3b8f 100644 +--- a/setup.py ++++ b/setup.py +@@ -23,7 +23,7 @@ min_python_version = "3.9" + max_python_version = "3.13" # exclusive + min_numpy_build_version = "1.11" + min_numpy_run_version = "1.22" +-min_llvmlite_version = "0.43.0dev0" ++min_llvmlite_version = "0.42.0dev0" + max_llvmlite_version = "0.44" + + if sys.platform.startswith('linux'): From 37b86d145dcd52e73a8502ca3848cf4008c964e1 Mon Sep 17 00:00:00 2001 From: Graham Markall <gmarkall@nvidia.com> Date: Mon, 29 Apr 2024 15:36:34 +0100 Subject: [PATCH 19/49] Use new style Numba errors when testing --- recipe/run_test.bat | 1 + recipe/run_test.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/recipe/run_test.bat b/recipe/run_test.bat index a33722d..265ae94 100644 --- a/recipe/run_test.bat +++ b/recipe/run_test.bat @@ -1,5 +1,6 @@ set NUMBA_DEVELOPER_MODE=1 set NUMBA_DISABLE_ERROR_MESSAGE_HIGHLIGHTING=1 +set NUMBA_CAPTURED_ERRORS=new_style @rem Validate Numba dependencies python -m pip check diff --git a/recipe/run_test.sh b/recipe/run_test.sh index a35063a..0384b75 100644 --- a/recipe/run_test.sh +++ b/recipe/run_test.sh @@ -5,6 +5,7 @@ set -e export NUMBA_DEVELOPER_MODE=1 export NUMBA_DISABLE_ERROR_MESSAGE_HIGHLIGHTING=1 export PYTHONFAULTHANDLER=1 +export NUMBA_CAPTURED_ERRORS="new_style" unamestr=`uname` if [[ "$unamestr" == 'Linux' ]]; then From 0b22e06aef564556191247ef109de15d474658a2 Mon Sep 17 00:00:00 2001 From: Graham Markall <gmarkall@nvidia.com> Date: Tue, 30 Apr 2024 08:35:29 +0100 Subject: [PATCH 20/49] Revert "Use new style Numba errors when testing" This reverts commit 37b86d145dcd52e73a8502ca3848cf4008c964e1. --- recipe/run_test.bat | 1 - recipe/run_test.sh | 1 - 2 files changed, 2 deletions(-) diff --git a/recipe/run_test.bat b/recipe/run_test.bat index 265ae94..a33722d 100644 --- a/recipe/run_test.bat +++ b/recipe/run_test.bat @@ -1,6 +1,5 @@ set NUMBA_DEVELOPER_MODE=1 set NUMBA_DISABLE_ERROR_MESSAGE_HIGHLIGHTING=1 -set NUMBA_CAPTURED_ERRORS=new_style @rem Validate Numba dependencies python -m pip check diff --git a/recipe/run_test.sh b/recipe/run_test.sh index 0384b75..a35063a 100644 --- a/recipe/run_test.sh +++ b/recipe/run_test.sh @@ -5,7 +5,6 @@ set -e export NUMBA_DEVELOPER_MODE=1 export NUMBA_DISABLE_ERROR_MESSAGE_HIGHLIGHTING=1 export PYTHONFAULTHANDLER=1 -export NUMBA_CAPTURED_ERRORS="new_style" unamestr=`uname` if [[ "$unamestr" == 'Linux' ]]; then From dbca88df664d4627367d853eafb23fe3348576a4 Mon Sep 17 00:00:00 2001 From: Graham Markall <gmarkall@nvidia.com> Date: Tue, 30 Apr 2024 08:36:22 +0100 Subject: [PATCH 21/49] Use 0.60.0dev2 --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index bf314e6..fafbd60 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,6 +1,6 @@ {% set name = "numba" %} -{% set version = "0.60.0dev1" %} -{% set sha256 = "db653cfff996cffc8137cdb85682c4269383d8fc3f5f0988ccba93c160e095c9" %} +{% set version = "0.60.0dev2" %} +{% set sha256 = "b1f0535ebab73d494ebc7a2b384d81a3da0180896fe001e5c8f950ceeabd2902" %} package: name: numba From 15b944591ecd978d7b6a7cad839d60f57af260c4 Mon Sep 17 00:00:00 2001 From: Graham Markall <gmarkall@nvidia.com> Date: Tue, 30 Apr 2024 10:09:08 +0100 Subject: [PATCH 22/49] Use 0.60.0dev3 --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index fafbd60..2f6bed9 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,6 +1,6 @@ {% set name = "numba" %} -{% set version = "0.60.0dev2" %} -{% set sha256 = "b1f0535ebab73d494ebc7a2b384d81a3da0180896fe001e5c8f950ceeabd2902" %} +{% set version = "0.60.0dev3" %} +{% set sha256 = "423300921c202e501b24925ecd3808e2b4692f165ee7171008e9663d1fa7bb6c" %} package: name: numba From 2d0898ce68dd48d3299e35f54827dd436f7fce39 Mon Sep 17 00:00:00 2001 From: "conda-forge-curator[bot]" <79913779+conda-forge-curator[bot]@users.noreply.github.com> Date: Sun, 12 May 2024 17:50:42 +0000 Subject: [PATCH 23/49] [ci skip] [skip ci] [cf admin skip] ***NO_CI*** admin migration CondaForgeAutomergeUpdate --- .github/workflows/automerge.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml index da1368a..0535f6a 100644 --- a/.github/workflows/automerge.yml +++ b/.github/workflows/automerge.yml @@ -9,8 +9,6 @@ jobs: runs-on: ubuntu-latest name: automerge steps: - - name: checkout - uses: actions/checkout@v3 - name: automerge-action id: automerge-action uses: conda-forge/automerge-action@main From 490f74597ed93eab51593d7035091ff44eebeb84 Mon Sep 17 00:00:00 2001 From: jakirkham <jakirkham@gmail.com> Date: Wed, 15 May 2024 20:40:58 -0700 Subject: [PATCH 24/49] [ci skip] Add `rc` branch to migrations --- conda-forge.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/conda-forge.yml b/conda-forge.yml index edab33f..9316619 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -1,3 +1,6 @@ +bot: + abi_migration_branches: + - rc build_platform: osx_arm64: osx_64 conda_build: From 568fd101fe31cff9f889941d88f6554f07ed2d22 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Thu, 16 May 2024 07:23:46 +0000 Subject: [PATCH 25/49] Rebuild for python312 --- .ci_support/migrations/python312.yaml | 38 +++++++++++++++++++++++++++ conda-forge.yml | 12 +++++---- recipe/meta.yaml | 3 ++- 3 files changed, 47 insertions(+), 6 deletions(-) create mode 100644 .ci_support/migrations/python312.yaml diff --git a/.ci_support/migrations/python312.yaml b/.ci_support/migrations/python312.yaml new file mode 100644 index 0000000..784a0a2 --- /dev/null +++ b/.ci_support/migrations/python312.yaml @@ -0,0 +1,38 @@ +migrator_ts: 1695046563 +__migrator: + migration_number: 1 + operation: key_add + primary_key: python + ordering: + python: + - 3.6.* *_cpython + - 3.7.* *_cpython + - 3.8.* *_cpython + - 3.9.* *_cpython + - 3.10.* *_cpython + - 3.11.* *_cpython + - 3.12.* *_cpython # new entry + - 3.6.* *_73_pypy + - 3.7.* *_73_pypy + - 3.8.* *_73_pypy + - 3.9.* *_73_pypy + paused: false + longterm: True + pr_limit: 30 + max_solver_attempts: 6 # this will make the bot retry "not solvable" stuff 6 times + exclude: + # this shouldn't attempt to modify the python feedstocks + - python + - pypy3.6 + - pypy-meta + - cross-python + - python_abi + exclude_pinned_pkgs: false + +python: + - 3.12.* *_cpython +# additional entries to add for zip_keys +numpy: + - 1.26 +python_impl: + - cpython diff --git a/conda-forge.yml b/conda-forge.yml index 44b85e1..2c603b9 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -1,12 +1,14 @@ build_platform: + linux_aarch64: linux_64 + linux_ppc64le: linux_64 osx_arm64: osx_64 +conda_build: + pkg_format: '2' conda_forge_output_validation: true -provider: - linux_aarch64: default - linux_ppc64le: default github: branch_name: main tooling_branch_name: main -conda_build: - pkg_format: '2' +provider: + linux_aarch64: default + linux_ppc64le: default test: native_and_emulated diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 5d30567..dc86445 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -12,7 +12,7 @@ source: sha256: {{ sha256 }} build: - number: 0 + number: 1 entry_points: - numba = numba.misc.numba_entry:main script: @@ -30,6 +30,7 @@ requirements: - cross-python_{{ target_platform }} # [build_platform != target_platform] - numpy # [build_platform != target_platform] - {{ compiler('c') }} + - {{ stdlib("c") }} - {{ compiler('cxx') }} # llvm is needed for the headers - llvm-openmp # [osx] From 1bedb2985c7e436d4bc0e705a8d3fe87d8d2b469 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Thu, 16 May 2024 07:25:29 +0000 Subject: [PATCH 26/49] MNT: Re-rendered with conda-build 24.5.0, conda-smithy 3.35.1, and conda-forge-pinning 2024.05.16.03.01.34 --- .azure-pipelines/azure-pipelines-linux.yml | 48 ++++++++++++++++ .azure-pipelines/azure-pipelines-osx.yml | 12 +++- .azure-pipelines/azure-pipelines-win.yml | 6 ++ ...ux_64_numpy1.22python3.10.____cpython.yaml | 6 ++ ...nux_64_numpy1.22python3.8.____cpython.yaml | 6 ++ ...nux_64_numpy1.22python3.9.____cpython.yaml | 6 ++ ...ux_64_numpy1.23python3.11.____cpython.yaml | 6 ++ ...ux_64_numpy1.26python3.12.____cpython.yaml | 42 ++++++++++++++ ...rch64_numpy1.22python3.10.____cpython.yaml | 8 ++- ...arch64_numpy1.22python3.8.____cpython.yaml | 8 ++- ...arch64_numpy1.22python3.9.____cpython.yaml | 8 ++- ...rch64_numpy1.23python3.11.____cpython.yaml | 8 ++- ...rch64_numpy1.26python3.12.____cpython.yaml | 46 +++++++++++++++ ...c64le_numpy1.22python3.10.____cpython.yaml | 8 ++- ...pc64le_numpy1.22python3.8.____cpython.yaml | 8 ++- ...pc64le_numpy1.22python3.9.____cpython.yaml | 8 ++- ...c64le_numpy1.23python3.11.____cpython.yaml | 8 ++- ...c64le_numpy1.26python3.12.____cpython.yaml | 42 ++++++++++++++ ...sx_64_numpy1.22python3.10.____cpython.yaml | 6 +- ...osx_64_numpy1.22python3.8.____cpython.yaml | 6 +- ...osx_64_numpy1.22python3.9.____cpython.yaml | 6 +- ...sx_64_numpy1.23python3.11.____cpython.yaml | 6 +- ...sx_64_numpy1.26python3.12.____cpython.yaml | 42 ++++++++++++++ ...arm64_numpy1.22python3.10.____cpython.yaml | 4 ++ ..._arm64_numpy1.22python3.8.____cpython.yaml | 4 ++ ..._arm64_numpy1.22python3.9.____cpython.yaml | 4 ++ ...arm64_numpy1.23python3.11.____cpython.yaml | 4 ++ ...arm64_numpy1.26python3.12.____cpython.yaml | 42 ++++++++++++++ ...in_64_numpy1.22python3.10.____cpython.yaml | 2 + ...win_64_numpy1.22python3.8.____cpython.yaml | 2 + ...win_64_numpy1.22python3.9.____cpython.yaml | 2 + ...in_64_numpy1.23python3.11.____cpython.yaml | 2 + ...in_64_numpy1.26python3.12.____cpython.yaml | 28 +++++++++ .gitignore | 25 +++++++- .scripts/build_steps.sh | 11 ++-- .scripts/run_docker_build.sh | 9 +++ .scripts/run_osx_build.sh | 15 +++-- .scripts/run_win_build.bat | 16 +++++- .travis.yml | 57 ------------------- README.md | 53 ++++++++++++++--- azure-pipelines.yml | 4 +- build-locally.py | 5 +- 42 files changed, 543 insertions(+), 96 deletions(-) create mode 100644 .ci_support/linux_64_numpy1.26python3.12.____cpython.yaml create mode 100644 .ci_support/linux_aarch64_numpy1.26python3.12.____cpython.yaml create mode 100644 .ci_support/linux_ppc64le_numpy1.26python3.12.____cpython.yaml create mode 100644 .ci_support/osx_64_numpy1.26python3.12.____cpython.yaml create mode 100644 .ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml create mode 100644 .ci_support/win_64_numpy1.26python3.12.____cpython.yaml delete mode 100644 .travis.yml diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 3c2a28a..215ce6d 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -24,7 +24,52 @@ jobs: CONFIG: linux_64_numpy1.23python3.11.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_64_numpy1.26python3.12.____cpython: + CONFIG: linux_64_numpy1.26python3.12.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_aarch64_numpy1.22python3.10.____cpython: + CONFIG: linux_aarch64_numpy1.22python3.10.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_aarch64_numpy1.22python3.8.____cpython: + CONFIG: linux_aarch64_numpy1.22python3.8.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_aarch64_numpy1.22python3.9.____cpython: + CONFIG: linux_aarch64_numpy1.22python3.9.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_aarch64_numpy1.23python3.11.____cpython: + CONFIG: linux_aarch64_numpy1.23python3.11.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_aarch64_numpy1.26python3.12.____cpython: + CONFIG: linux_aarch64_numpy1.26python3.12.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_ppc64le_numpy1.22python3.10.____cpython: + CONFIG: linux_ppc64le_numpy1.22python3.10.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_ppc64le_numpy1.22python3.8.____cpython: + CONFIG: linux_ppc64le_numpy1.22python3.8.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_ppc64le_numpy1.22python3.9.____cpython: + CONFIG: linux_ppc64le_numpy1.22python3.9.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_ppc64le_numpy1.23python3.11.____cpython: + CONFIG: linux_ppc64le_numpy1.23python3.11.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_ppc64le_numpy1.26python3.12.____cpython: + CONFIG: linux_ppc64le_numpy1.26python3.12.____cpython + 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 @@ -37,6 +82,9 @@ jobs: - script: | export CI=azure + export flow_run_id=azure_$(Build.BuildNumber).$(System.JobAttempt) + export remote_url=$(Build.Repository.Uri) + export sha=$(Build.SourceVersion) export GIT_BRANCH=$BUILD_SOURCEBRANCHNAME export FEEDSTOCK_NAME=$(basename ${BUILD_REPOSITORY_NAME}) if [[ "${BUILD_REASON:-}" == "PullRequest" ]]; then diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 1fd61d2..d5e3950 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -5,7 +5,7 @@ jobs: - job: osx pool: - vmImage: macOS-11 + vmImage: macOS-12 strategy: matrix: osx_64_numpy1.22python3.10.____cpython: @@ -20,6 +20,9 @@ jobs: osx_64_numpy1.23python3.11.____cpython: CONFIG: osx_64_numpy1.23python3.11.____cpython UPLOAD_PACKAGES: 'True' + osx_64_numpy1.26python3.12.____cpython: + CONFIG: osx_64_numpy1.26python3.12.____cpython + UPLOAD_PACKAGES: 'True' osx_arm64_numpy1.22python3.10.____cpython: CONFIG: osx_arm64_numpy1.22python3.10.____cpython UPLOAD_PACKAGES: 'True' @@ -32,12 +35,19 @@ jobs: osx_arm64_numpy1.23python3.11.____cpython: CONFIG: osx_arm64_numpy1.23python3.11.____cpython UPLOAD_PACKAGES: 'True' + osx_arm64_numpy1.26python3.12.____cpython: + CONFIG: osx_arm64_numpy1.26python3.12.____cpython + UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 + variables: {} steps: # TODO: Fast finish on azure pipelines? - script: | export CI=azure + export flow_run_id=azure_$(Build.BuildNumber).$(System.JobAttempt) + export remote_url=$(Build.Repository.Uri) + export sha=$(Build.SourceVersion) export OSX_FORCE_SDK_DOWNLOAD="1" export GIT_BRANCH=$BUILD_SOURCEBRANCHNAME export FEEDSTOCK_NAME=$(basename ${BUILD_REPOSITORY_NAME}) diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 07c0877..ffb38f2 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -20,6 +20,9 @@ jobs: win_64_numpy1.23python3.11.____cpython: CONFIG: win_64_numpy1.23python3.11.____cpython UPLOAD_PACKAGES: 'True' + win_64_numpy1.26python3.12.____cpython: + CONFIG: win_64_numpy1.26python3.12.____cpython + UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 variables: CONDA_BLD_PATH: D:\\bld\\ @@ -51,6 +54,9 @@ jobs: PYTHONUNBUFFERED: 1 CONFIG: $(CONFIG) CI: azure + flow_run_id: azure_$(Build.BuildNumber).$(System.JobAttempt) + remote_url: $(Build.Repository.Uri) + sha: $(Build.SourceVersion) UPLOAD_PACKAGES: $(UPLOAD_PACKAGES) UPLOAD_TEMP: $(UPLOAD_TEMP) BINSTAR_TOKEN: $(BINSTAR_TOKEN) diff --git a/.ci_support/linux_64_numpy1.22python3.10.____cpython.yaml b/.ci_support/linux_64_numpy1.22python3.10.____cpython.yaml index fed021f..3ee1e8a 100644 --- a/.ci_support/linux_64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.22python3.10.____cpython.yaml @@ -2,6 +2,10 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.12' cdt_name: - cos6 channel_sources: @@ -31,6 +35,8 @@ tbb: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - numpy - python_impl diff --git a/.ci_support/linux_64_numpy1.22python3.8.____cpython.yaml b/.ci_support/linux_64_numpy1.22python3.8.____cpython.yaml index 1f23555..e143317 100644 --- a/.ci_support/linux_64_numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.22python3.8.____cpython.yaml @@ -2,6 +2,10 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.12' cdt_name: - cos6 channel_sources: @@ -31,6 +35,8 @@ tbb: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - numpy - python_impl diff --git a/.ci_support/linux_64_numpy1.22python3.9.____cpython.yaml b/.ci_support/linux_64_numpy1.22python3.9.____cpython.yaml index 18a7ce8..d1da0ff 100644 --- a/.ci_support/linux_64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.22python3.9.____cpython.yaml @@ -2,6 +2,10 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.12' cdt_name: - cos6 channel_sources: @@ -31,6 +35,8 @@ tbb: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - numpy - python_impl diff --git a/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml index 1ec43c5..25700bc 100644 --- a/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml @@ -2,6 +2,10 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.12' cdt_name: - cos6 channel_sources: @@ -31,6 +35,8 @@ tbb: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - numpy - python_impl diff --git a/.ci_support/linux_64_numpy1.26python3.12.____cpython.yaml b/.ci_support/linux_64_numpy1.26python3.12.____cpython.yaml new file mode 100644 index 0000000..cabac14 --- /dev/null +++ b/.ci_support/linux_64_numpy1.26python3.12.____cpython.yaml @@ -0,0 +1,42 @@ +c_compiler: +- gcc +c_compiler_version: +- '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.12' +cdt_name: +- cos6 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- gxx +cxx_compiler_version: +- '12' +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +numpy: +- '1.26' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.12.* *_cpython +python_impl: +- cpython +target_platform: +- linux-64 +tbb: +- '2021' +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - c_stdlib_version + - cdt_name +- - python + - numpy + - python_impl diff --git a/.ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml index 456a257..6d8d12e 100644 --- a/.ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml @@ -4,6 +4,10 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_arch: - aarch64 cdt_name: @@ -17,7 +21,7 @@ cxx_compiler: cxx_compiler_version: - '12' docker_image: -- quay.io/condaforge/linux-anvil-aarch64 +- quay.io/condaforge/linux-anvil-cos7-x86_64 numpy: - '1.22' pin_run_as_build: @@ -35,6 +39,8 @@ tbb: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - numpy - python_impl diff --git a/.ci_support/linux_aarch64_numpy1.22python3.8.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.22python3.8.____cpython.yaml index 2b65590..74033af 100644 --- a/.ci_support/linux_aarch64_numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.22python3.8.____cpython.yaml @@ -4,6 +4,10 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_arch: - aarch64 cdt_name: @@ -17,7 +21,7 @@ cxx_compiler: cxx_compiler_version: - '12' docker_image: -- quay.io/condaforge/linux-anvil-aarch64 +- quay.io/condaforge/linux-anvil-cos7-x86_64 numpy: - '1.22' pin_run_as_build: @@ -35,6 +39,8 @@ tbb: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - numpy - python_impl diff --git a/.ci_support/linux_aarch64_numpy1.22python3.9.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.22python3.9.____cpython.yaml index 87f1b09..e887928 100644 --- a/.ci_support/linux_aarch64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.22python3.9.____cpython.yaml @@ -4,6 +4,10 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_arch: - aarch64 cdt_name: @@ -17,7 +21,7 @@ cxx_compiler: cxx_compiler_version: - '12' docker_image: -- quay.io/condaforge/linux-anvil-aarch64 +- quay.io/condaforge/linux-anvil-cos7-x86_64 numpy: - '1.22' pin_run_as_build: @@ -35,6 +39,8 @@ tbb: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - numpy - python_impl diff --git a/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml index ae0b8c6..6a4d6fa 100644 --- a/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml @@ -4,6 +4,10 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_arch: - aarch64 cdt_name: @@ -17,7 +21,7 @@ cxx_compiler: cxx_compiler_version: - '12' docker_image: -- quay.io/condaforge/linux-anvil-aarch64 +- quay.io/condaforge/linux-anvil-cos7-x86_64 numpy: - '1.23' pin_run_as_build: @@ -35,6 +39,8 @@ tbb: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - numpy - python_impl diff --git a/.ci_support/linux_aarch64_numpy1.26python3.12.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.26python3.12.____cpython.yaml new file mode 100644 index 0000000..d220d9a --- /dev/null +++ b/.ci_support/linux_aarch64_numpy1.26python3.12.____cpython.yaml @@ -0,0 +1,46 @@ +BUILD: +- aarch64-conda_cos7-linux-gnu +c_compiler: +- gcc +c_compiler_version: +- '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' +cdt_arch: +- aarch64 +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- gxx +cxx_compiler_version: +- '12' +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +numpy: +- '1.26' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.12.* *_cpython +python_impl: +- cpython +target_platform: +- linux-aarch64 +tbb: +- '2021' +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - c_stdlib_version + - cdt_name +- - python + - numpy + - python_impl diff --git a/.ci_support/linux_ppc64le_numpy1.22python3.10.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.22python3.10.____cpython.yaml index b9fb690..577f7a5 100644 --- a/.ci_support/linux_ppc64le_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.22python3.10.____cpython.yaml @@ -2,6 +2,10 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: @@ -13,7 +17,7 @@ cxx_compiler: cxx_compiler_version: - '12' docker_image: -- quay.io/condaforge/linux-anvil-ppc64le +- quay.io/condaforge/linux-anvil-cos7-x86_64 numpy: - '1.22' pin_run_as_build: @@ -31,6 +35,8 @@ tbb: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - numpy - python_impl diff --git a/.ci_support/linux_ppc64le_numpy1.22python3.8.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.22python3.8.____cpython.yaml index 5e5922f..b0e99e5 100644 --- a/.ci_support/linux_ppc64le_numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.22python3.8.____cpython.yaml @@ -2,6 +2,10 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: @@ -13,7 +17,7 @@ cxx_compiler: cxx_compiler_version: - '12' docker_image: -- quay.io/condaforge/linux-anvil-ppc64le +- quay.io/condaforge/linux-anvil-cos7-x86_64 numpy: - '1.22' pin_run_as_build: @@ -31,6 +35,8 @@ tbb: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - numpy - python_impl diff --git a/.ci_support/linux_ppc64le_numpy1.22python3.9.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.22python3.9.____cpython.yaml index d8e02bd..f12f598 100644 --- a/.ci_support/linux_ppc64le_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.22python3.9.____cpython.yaml @@ -2,6 +2,10 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: @@ -13,7 +17,7 @@ cxx_compiler: cxx_compiler_version: - '12' docker_image: -- quay.io/condaforge/linux-anvil-ppc64le +- quay.io/condaforge/linux-anvil-cos7-x86_64 numpy: - '1.22' pin_run_as_build: @@ -31,6 +35,8 @@ tbb: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - numpy - python_impl diff --git a/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml index 1d11b04..43e1ddd 100644 --- a/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml @@ -2,6 +2,10 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: @@ -13,7 +17,7 @@ cxx_compiler: cxx_compiler_version: - '12' docker_image: -- quay.io/condaforge/linux-anvil-ppc64le +- quay.io/condaforge/linux-anvil-cos7-x86_64 numpy: - '1.23' pin_run_as_build: @@ -31,6 +35,8 @@ tbb: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - numpy - python_impl diff --git a/.ci_support/linux_ppc64le_numpy1.26python3.12.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.26python3.12.____cpython.yaml new file mode 100644 index 0000000..3567c14 --- /dev/null +++ b/.ci_support/linux_ppc64le_numpy1.26python3.12.____cpython.yaml @@ -0,0 +1,42 @@ +c_compiler: +- gcc +c_compiler_version: +- '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- gxx +cxx_compiler_version: +- '12' +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +numpy: +- '1.26' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.12.* *_cpython +python_impl: +- cpython +target_platform: +- linux-ppc64le +tbb: +- '2021' +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - c_stdlib_version + - cdt_name +- - python + - numpy + - python_impl diff --git a/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml b/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml index 77d1013..c451eda 100644 --- a/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml @@ -1,9 +1,13 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.9' +- '10.13' c_compiler: - clang c_compiler_version: - '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.13' channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml b/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml index 574bfcc..d69f4a9 100644 --- a/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml @@ -1,9 +1,13 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.9' +- '10.13' c_compiler: - clang c_compiler_version: - '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.13' channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml b/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml index 2206e05..c7351b9 100644 --- a/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml @@ -1,9 +1,13 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.9' +- '10.13' c_compiler: - clang c_compiler_version: - '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.13' channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml b/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml index 909bea9..a3e04a7 100644 --- a/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml @@ -1,9 +1,13 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.9' +- '10.13' c_compiler: - clang c_compiler_version: - '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.13' channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/osx_64_numpy1.26python3.12.____cpython.yaml b/.ci_support/osx_64_numpy1.26python3.12.____cpython.yaml new file mode 100644 index 0000000..3705baa --- /dev/null +++ b/.ci_support/osx_64_numpy1.26python3.12.____cpython.yaml @@ -0,0 +1,42 @@ +MACOSX_DEPLOYMENT_TARGET: +- '10.13' +c_compiler: +- clang +c_compiler_version: +- '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.13' +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- clangxx +cxx_compiler_version: +- '16' +llvm_openmp: +- '16' +macos_machine: +- x86_64-apple-darwin13.4.0 +numpy: +- '1.26' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.12.* *_cpython +python_impl: +- cpython +target_platform: +- osx-64 +tbb: +- '2021' +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - python + - numpy + - python_impl diff --git a/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml index ef21985..579c7a2 100644 --- a/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml @@ -4,6 +4,10 @@ c_compiler: - clang c_compiler_version: - '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '11.0' channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml index d1ee8bc..c382662 100644 --- a/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml @@ -4,6 +4,10 @@ c_compiler: - clang c_compiler_version: - '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '11.0' channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml index a0c3ba8..0d0b7f3 100644 --- a/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml @@ -4,6 +4,10 @@ c_compiler: - clang c_compiler_version: - '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '11.0' channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml b/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml index 4b39ebb..ea292b3 100644 --- a/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml @@ -4,6 +4,10 @@ c_compiler: - clang c_compiler_version: - '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '11.0' channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml b/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml new file mode 100644 index 0000000..9a840b6 --- /dev/null +++ b/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml @@ -0,0 +1,42 @@ +MACOSX_DEPLOYMENT_TARGET: +- '11.0' +c_compiler: +- clang +c_compiler_version: +- '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '11.0' +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- clangxx +cxx_compiler_version: +- '16' +llvm_openmp: +- '16' +macos_machine: +- arm64-apple-darwin20.0.0 +numpy: +- '1.26' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.12.* *_cpython +python_impl: +- cpython +target_platform: +- osx-arm64 +tbb: +- '2021' +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - python + - numpy + - python_impl diff --git a/.ci_support/win_64_numpy1.22python3.10.____cpython.yaml b/.ci_support/win_64_numpy1.22python3.10.____cpython.yaml index 8e9b9a8..b2de0d2 100644 --- a/.ci_support/win_64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/win_64_numpy1.22python3.10.____cpython.yaml @@ -1,5 +1,7 @@ c_compiler: - vs2019 +c_stdlib: +- vs channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/win_64_numpy1.22python3.8.____cpython.yaml b/.ci_support/win_64_numpy1.22python3.8.____cpython.yaml index fc1af03..bfd798d 100644 --- a/.ci_support/win_64_numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/win_64_numpy1.22python3.8.____cpython.yaml @@ -1,5 +1,7 @@ c_compiler: - vs2019 +c_stdlib: +- vs channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/win_64_numpy1.22python3.9.____cpython.yaml b/.ci_support/win_64_numpy1.22python3.9.____cpython.yaml index b52ecc8..d222a37 100644 --- a/.ci_support/win_64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/win_64_numpy1.22python3.9.____cpython.yaml @@ -1,5 +1,7 @@ c_compiler: - vs2019 +c_stdlib: +- vs channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/win_64_numpy1.23python3.11.____cpython.yaml b/.ci_support/win_64_numpy1.23python3.11.____cpython.yaml index 5dcd582..a983712 100644 --- a/.ci_support/win_64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/win_64_numpy1.23python3.11.____cpython.yaml @@ -1,5 +1,7 @@ c_compiler: - vs2019 +c_stdlib: +- vs channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/win_64_numpy1.26python3.12.____cpython.yaml b/.ci_support/win_64_numpy1.26python3.12.____cpython.yaml new file mode 100644 index 0000000..cc12ede --- /dev/null +++ b/.ci_support/win_64_numpy1.26python3.12.____cpython.yaml @@ -0,0 +1,28 @@ +c_compiler: +- vs2019 +c_stdlib: +- vs +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- vs2019 +numpy: +- '1.26' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.12.* *_cpython +python_impl: +- cpython +target_platform: +- win-64 +tbb: +- '2021' +zip_keys: +- - python + - numpy + - python_impl diff --git a/.gitignore b/.gitignore index c89ecb7..179afe5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,24 @@ -*.pyc +# User content belongs under recipe/. +# Feedstock configuration goes in `conda-forge.yml` +# Everything else is managed by the conda-smithy rerender process. +# Please do not modify + +# Ignore all files and folders in root +* +!/conda-forge.yml + +# Don't ignore any files/folders if the parent folder is 'un-ignored' +# This also avoids warnings when adding an already-checked file with an ignored parent. +!/**/ +# Don't ignore any files/folders recursively in the following folders +!/recipe/** +!/.ci_support/** -build_artifacts +# Since we ignore files/folders recursively, any folders inside +# build_artifacts gets ignored which trips some build systems. +# To avoid that we 'un-ignore' all files/folders recursively +# and only ignore the root build_artifacts folder. +!/build_artifacts/** +/build_artifacts + +*.pyc diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index bd9e671..899ba03 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -28,13 +28,15 @@ conda-build: pkgs_dirs: - ${FEEDSTOCK_ROOT}/build_artifacts/pkg_cache - /opt/conda/pkgs +solver: libmamba CONDARC +export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 mamba install --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build boa conda-forge-ci-setup=3 + pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build boa conda-forge-ci-setup=3 + pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" @@ -66,9 +68,10 @@ if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then # Drop into an interactive shell /bin/bash else - conda mambabuild "${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" + --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" \ + --extra-meta flow_run_id="${flow_run_id:-}" remote_url="${remote_url:-}" sha="${sha:-}" ( startgroup "Validating outputs" ) 2> /dev/null validate_recipe_outputs "${FEEDSTOCK_NAME}" diff --git a/.scripts/run_docker_build.sh b/.scripts/run_docker_build.sh index 9236239..00f377a 100755 --- a/.scripts/run_docker_build.sh +++ b/.scripts/run_docker_build.sh @@ -21,6 +21,12 @@ if [ -z ${FEEDSTOCK_NAME} ]; then export FEEDSTOCK_NAME=$(basename ${FEEDSTOCK_ROOT}) fi +if [[ "${sha:-}" == "" ]]; then + pushd "${FEEDSTOCK_ROOT}" + sha=$(git rev-parse HEAD) + popd +fi + docker info # In order for the conda-build process in the container to write to the mounted @@ -91,6 +97,9 @@ docker run ${DOCKER_RUN_ARGS} \ -e CPU_COUNT \ -e BUILD_WITH_CONDA_DEBUG \ -e BUILD_OUTPUT_ID \ + -e flow_run_id \ + -e remote_url \ + -e sha \ -e BINSTAR_TOKEN \ -e FEEDSTOCK_TOKEN \ -e STAGING_BINSTAR_TOKEN \ diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 870c49a..07dff21 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -22,11 +22,13 @@ bash $MINIFORGE_FILE -b -p ${MINIFORGE_HOME} source ${MINIFORGE_HOME}/etc/profile.d/conda.sh conda activate base +export CONDA_SOLVER="libmamba" +export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 mamba install --update-specs --quiet --yes --channel conda-forge --strict-channel-priority \ - pip mamba conda-build boa conda-forge-ci-setup=3 + pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build boa conda-forge-ci-setup=3 + pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" @@ -45,6 +47,10 @@ else echo -e "\n\nNot mangling homebrew as we are not running in CI" fi +if [[ "${sha:-}" == "" ]]; then + sha=$(git rev-parse HEAD) +fi + echo -e "\n\nRunning the build setup script." source run_conda_forge_build_setup @@ -75,9 +81,10 @@ else EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --no-test" fi - conda mambabuild ./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 + --clobber-file ./.ci_support/clobber_${CONFIG}.yaml \ + --extra-meta flow_run_id="$flow_run_id" remote_url="$remote_url" sha="$sha" ( startgroup "Validating outputs" ) 2> /dev/null validate_recipe_outputs "${FEEDSTOCK_NAME}" diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat index 07d3445..6d54697 100755 --- a/.scripts/run_win_build.bat +++ b/.scripts/run_win_build.bat @@ -17,10 +17,14 @@ call :start_group "Configuring conda" :: Activate the base conda environment call activate base +:: Configure the solver +set "CONDA_SOLVER=libmamba" +if !errorlevel! neq 0 exit /b !errorlevel! +set "CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1" :: 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 +mamba.exe install "python=3.10" pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" -c conda-forge --strict-channel-priority --yes if !errorlevel! neq 0 exit /b !errorlevel! :: Set basic configuration @@ -38,14 +42,20 @@ if EXIST LICENSE.txt ( copy LICENSE.txt "recipe\\recipe-scripts-license.txt" ) if NOT [%HOST_PLATFORM%] == [%BUILD_PLATFORM%] ( - set "EXTRA_CB_OPTIONS=%EXTRA_CB_OPTIONS% --no-test" + if [%CROSSCOMPILING_EMULATOR%] == [] ( + set "EXTRA_CB_OPTIONS=%EXTRA_CB_OPTIONS% --no-test" + ) +) + +if NOT [%flow_run_id%] == [] ( + set "EXTRA_CB_OPTIONS=%EXTRA_CB_OPTIONS% --extra-meta flow_run_id=%flow_run_id% remote_url=%remote_url% sha=%sha%" ) call :end_group :: Build the recipe echo Building recipe -conda.exe mambabuild "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTRA_CB_OPTIONS% +conda-build.exe "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 diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 5b5c4ee..0000000 --- a/.travis.yml +++ /dev/null @@ -1,57 +0,0 @@ -# This file was generated automatically from conda-smithy. To update this configuration, -# update the conda-forge.yml and/or the recipe/meta.yaml. - -language: generic - - - -matrix: - include: - - 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.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.22python3.9.____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.23python3.11.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-aarch64 DOCKER_IMAGE=quay.io/condaforge/linux-anvil-aarch64 - os: linux - arch: arm64 - dist: focal - - - 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.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.22python3.9.____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.23python3.11.____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 - - export GIT_BRANCH="$TRAVIS_BRANCH" - - export FEEDSTOCK_NAME=$(basename ${TRAVIS_REPO_SLUG}) - - if [[ "${TRAVIS_PULL_REQUEST:-}" == "false" ]]; then export IS_PR_BUILD="False"; else export IS_PR_BUILD="True"; fi - - - - if [[ ${PLATFORM} =~ .*linux.* ]]; then CONDA_FORGE_DOCKER_RUN_ARGS="--network=host --security-opt=seccomp=unconfined" ./.scripts/run_docker_build.sh; fi \ No newline at end of file diff --git a/README.md b/README.md index 8b8a373..c66ce96 100644 --- a/README.md +++ b/README.md @@ -22,14 +22,7 @@ Current build status ==================== -<table><tr> - <td>Travis</td> - <td> - <a href="https://app.travis-ci.com/conda-forge/numba-feedstock"> - <img alt="linux" src="https://img.shields.io/travis/com/conda-forge/numba-feedstock/main.svg?label=Linux"> - </a> - </td> - </tr> +<table> <tr> <td>Azure</td> @@ -70,6 +63,13 @@ Current build status <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=linux&configuration=linux%20linux_64_numpy1.23python3.11.____cpython" alt="variant"> </a> </td> + </tr><tr> + <td>linux_64_numpy1.26python3.12.____cpython</td> + <td> + <a href="https://dev.azure.com/conda-forge/feedstock-builds/_build/latest?definitionId=700&branchName=main"> + <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=linux&configuration=linux%20linux_64_numpy1.26python3.12.____cpython" alt="variant"> + </a> + </td> </tr><tr> <td>linux_aarch64_numpy1.22python3.10.____cpython</td> <td> @@ -98,6 +98,13 @@ Current build status <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=linux&configuration=linux%20linux_aarch64_numpy1.23python3.11.____cpython" alt="variant"> </a> </td> + </tr><tr> + <td>linux_aarch64_numpy1.26python3.12.____cpython</td> + <td> + <a href="https://dev.azure.com/conda-forge/feedstock-builds/_build/latest?definitionId=700&branchName=main"> + <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=linux&configuration=linux%20linux_aarch64_numpy1.26python3.12.____cpython" alt="variant"> + </a> + </td> </tr><tr> <td>linux_ppc64le_numpy1.22python3.10.____cpython</td> <td> @@ -126,6 +133,13 @@ Current build status <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=linux&configuration=linux%20linux_ppc64le_numpy1.23python3.11.____cpython" alt="variant"> </a> </td> + </tr><tr> + <td>linux_ppc64le_numpy1.26python3.12.____cpython</td> + <td> + <a href="https://dev.azure.com/conda-forge/feedstock-builds/_build/latest?definitionId=700&branchName=main"> + <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=linux&configuration=linux%20linux_ppc64le_numpy1.26python3.12.____cpython" alt="variant"> + </a> + </td> </tr><tr> <td>osx_64_numpy1.22python3.10.____cpython</td> <td> @@ -154,6 +168,13 @@ Current build status <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=osx&configuration=osx%20osx_64_numpy1.23python3.11.____cpython" alt="variant"> </a> </td> + </tr><tr> + <td>osx_64_numpy1.26python3.12.____cpython</td> + <td> + <a href="https://dev.azure.com/conda-forge/feedstock-builds/_build/latest?definitionId=700&branchName=main"> + <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=osx&configuration=osx%20osx_64_numpy1.26python3.12.____cpython" alt="variant"> + </a> + </td> </tr><tr> <td>osx_arm64_numpy1.22python3.10.____cpython</td> <td> @@ -182,6 +203,13 @@ Current build status <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=osx&configuration=osx%20osx_arm64_numpy1.23python3.11.____cpython" alt="variant"> </a> </td> + </tr><tr> + <td>osx_arm64_numpy1.26python3.12.____cpython</td> + <td> + <a href="https://dev.azure.com/conda-forge/feedstock-builds/_build/latest?definitionId=700&branchName=main"> + <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=osx&configuration=osx%20osx_arm64_numpy1.26python3.12.____cpython" alt="variant"> + </a> + </td> </tr><tr> <td>win_64_numpy1.22python3.10.____cpython</td> <td> @@ -210,6 +238,13 @@ Current build status <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=win&configuration=win%20win_64_numpy1.23python3.11.____cpython" alt="variant"> </a> </td> + </tr><tr> + <td>win_64_numpy1.26python3.12.____cpython</td> + <td> + <a href="https://dev.azure.com/conda-forge/feedstock-builds/_build/latest?definitionId=700&branchName=main"> + <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=win&configuration=win%20win_64_numpy1.26python3.12.____cpython" alt="variant"> + </a> + </td> </tr> </tbody> </table> @@ -291,7 +326,7 @@ available continuous integration services. Thanks to the awesome service provide [CircleCI](https://circleci.com/), [AppVeyor](https://www.appveyor.com/), [Drone](https://cloud.drone.io/welcome), and [TravisCI](https://travis-ci.com/) it is possible to build and upload installable packages to the -[conda-forge](https://anaconda.org/conda-forge) [Anaconda-Cloud](https://anaconda.org/) +[conda-forge](https://anaconda.org/conda-forge) [anaconda.org](https://anaconda.org/) channel for Linux, Windows and OSX respectively. To manage the continuous integration and simplify feedstock maintenance diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 6b346f5..e5306da 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -4,5 +4,5 @@ jobs: - template: ./.azure-pipelines/azure-pipelines-linux.yml - - template: ./.azure-pipelines/azure-pipelines-win.yml - - template: ./.azure-pipelines/azure-pipelines-osx.yml \ No newline at end of file + - template: ./.azure-pipelines/azure-pipelines-osx.yml + - template: ./.azure-pipelines/azure-pipelines-win.yml \ No newline at end of file diff --git a/build-locally.py b/build-locally.py index 3f4b7a7..e0d408d 100755 --- a/build-locally.py +++ b/build-locally.py @@ -64,8 +64,9 @@ def verify_config(ns): elif ns.config.startswith("osx"): if "OSX_SDK_DIR" not in os.environ: raise RuntimeError( - "Need OSX_SDK_DIR env variable set. Run 'export OSX_SDK_DIR=SDKs' " - "to download the SDK automatically to 'SDKs/MacOSX<ver>.sdk'. " + "Need OSX_SDK_DIR env variable set. Run 'export OSX_SDK_DIR=$PWD/SDKs' " + "to download the SDK automatically to '$PWD/SDKs/MacOSX<ver>.sdk'. " + "Note: OSX_SDK_DIR must be set to an absolute path. " "Setting this variable implies agreement to the licensing terms of the SDK by Apple." ) From 6d769ec6c416304ff6d67866abc995cd288231c1 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Thu, 16 May 2024 08:08:54 +0000 Subject: [PATCH 27/49] Rebuild for numpy 2.0 TL;DR: The way we build against numpy has changed as of numpy 2.0. This bot PR has updated the recipe to account for the changes (see below for details). The numpy 2.0 package itself is currently only available from a special release channel (`conda-forge/label/numpy_rc`) and will not be available on the main `conda-forge` channel until the release of numpy 2.0 GA. The biggest change is that we no longer need to use the oldest available numpy version at build time in order to support old numpy version at runtime - numpy will by default use a compatible ABI for the oldest still-supported numpy versions. Additionally, we no longer need to use `{{ pin_compatible("numpy") }}` as a run requirement - this has been handled for more than two years now by a run-export on the numpy package itself. The migrator will therefore remove any occurrences of this. However, by default, building against numpy 2.0 will assume that the package is compatible with numpy 2.0, which is not necessarily the case. You should check that the upstream package explicitly supports numpy 2.0, otherwise you need to add a `- numpy <2` run requirement until that happens (check numpy issue 26191 for an overview of the most important packages). Note that the numpy release candidate promises to be ABI-compatible with the final 2.0 release. This means that building against 2.0.0rc1 produces packages that can be published to our main channels. If you already want to use the numpy 2.0 release candidate yourself, you can do ``` conda config --add channels conda-forge/label/numpy_rc ``` or add this channel to your `.condarc` file directly. ### To-Dos: * [ ] Match run-requirements for numpy (i.e. check upstream `pyproject.toml` or however the project specifies numpy compatibility) * If upstream is not yet compatible with numpy 2.0, add `numpy <2` upper bound under `run:`. * If upstream is already compatible with numpy 2.0, nothing else should be necessary in most cases. * If upstream requires a minimum numpy version newer than 1.19, you can add `numpy >=x.y` under `run:`. * [ ] Remove any remaining occurrences of `{{ pin_compatible("numpy") }}` that the bot may have missed. PS. If the build does not compile anymore, this is almost certainly a sign that the upstream project is not yet ready for numpy 2.0; do not close this PR until a version compatible with numpy 2.0 has been released upstream and on this feedstock (in the meantime, you can keep the bot from reopening this PR in case of git conflicts by marking it as a draft). --- .ci_support/migrations/numpy2.yaml | 72 ++++++++++++++++++++++++++++++ conda-forge.yml | 12 ++--- recipe/meta.yaml | 4 +- 3 files changed, 81 insertions(+), 7 deletions(-) create mode 100644 .ci_support/migrations/numpy2.yaml diff --git a/.ci_support/migrations/numpy2.yaml b/.ci_support/migrations/numpy2.yaml new file mode 100644 index 0000000..d19357f --- /dev/null +++ b/.ci_support/migrations/numpy2.yaml @@ -0,0 +1,72 @@ +__migrator: + build_number: 1 + kind: version + commit_message: | + Rebuild for numpy 2.0 + + TL;DR: The way we build against numpy has changed as of numpy 2.0. This bot + PR has updated the recipe to account for the changes (see below for details). + The numpy 2.0 package itself is currently only available from a special release + channel (`conda-forge/label/numpy_rc`) and will not be available on the main + `conda-forge` channel until the release of numpy 2.0 GA. + + The biggest change is that we no longer need to use the oldest available numpy + version at build time in order to support old numpy version at runtime - numpy + will by default use a compatible ABI for the oldest still-supported numpy versions. + + Additionally, we no longer need to use `{{ pin_compatible("numpy") }}` as a + run requirement - this has been handled for more than two years now by a + run-export on the numpy package itself. The migrator will therefore remove + any occurrences of this. + + However, by default, building against numpy 2.0 will assume that the package + is compatible with numpy 2.0, which is not necessarily the case. You should + check that the upstream package explicitly supports numpy 2.0, otherwise you + need to add a `- numpy <2` run requirement until that happens (check numpy + issue 26191 for an overview of the most important packages). + + Note that the numpy release candidate promises to be ABI-compatible with the + final 2.0 release. This means that building against 2.0.0rc1 produces packages + that can be published to our main channels. + + If you already want to use the numpy 2.0 release candidate yourself, you can do + ``` + conda config --add channels conda-forge/label/numpy_rc + ``` + or add this channel to your `.condarc` file directly. + + ### To-Dos: + * [ ] Match run-requirements for numpy (i.e. check upstream `pyproject.toml` or however the project specifies numpy compatibility) + * If upstream is not yet compatible with numpy 2.0, add `numpy <2` upper bound under `run:`. + * If upstream is already compatible with numpy 2.0, nothing else should be necessary in most cases. + * If upstream requires a minimum numpy version newer than 1.19, you can add `numpy >=x.y` under `run:`. + * [ ] Remove any remaining occurrences of `{{ pin_compatible("numpy") }}` that the bot may have missed. + + PS. If the build does not compile anymore, this is almost certainly a sign that + the upstream project is not yet ready for numpy 2.0; do not close this PR until + a version compatible with numpy 2.0 has been released upstream and on this + feedstock (in the meantime, you can keep the bot from reopening this PR in + case of git conflicts by marking it as a draft). + + migration_number: 1 + exclude: + # needs local overrides that get stomped on by the migrator, which then fails + - scipy + ordering: + # prefer channels including numpy_rc (otherwise smithy doesn't + # know which of the two values should be taken on merge) + channel_sources: + - conda-forge + - conda-forge/label/numpy_rc,conda-forge + +# needs to match length of zip {python, python_impl, numpy} +# as it is in global CBC in order to override it +numpy: + - 1.22 # no py38 support for numpy 2.0 + - 2.0 + - 2.0 + - 2.0 + - 2.0 +channel_sources: + - conda-forge/label/numpy_rc,conda-forge +migrator_ts: 1713572489.295986 diff --git a/conda-forge.yml b/conda-forge.yml index 44b85e1..2c603b9 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -1,12 +1,14 @@ build_platform: + linux_aarch64: linux_64 + linux_ppc64le: linux_64 osx_arm64: osx_64 +conda_build: + pkg_format: '2' conda_forge_output_validation: true -provider: - linux_aarch64: default - linux_ppc64le: default github: branch_name: main tooling_branch_name: main -conda_build: - pkg_format: '2' +provider: + linux_aarch64: default + linux_ppc64le: default test: native_and_emulated diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 5d30567..9ea6db3 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -12,7 +12,7 @@ source: sha256: {{ sha256 }} build: - number: 0 + number: 1 entry_points: - numba = numba.misc.numba_entry:main script: @@ -30,6 +30,7 @@ requirements: - cross-python_{{ target_platform }} # [build_platform != target_platform] - numpy # [build_platform != target_platform] - {{ compiler('c') }} + - {{ stdlib("c") }} - {{ compiler('cxx') }} # llvm is needed for the headers - llvm-openmp # [osx] @@ -46,7 +47,6 @@ requirements: run: - python - {{ pin_compatible('llvmlite', max_pin='x.x') }} - - {{ pin_compatible('numpy') }} - importlib-metadata # [py < 39] run_constrained: From b2cb94153fda95e2de0c3f737697a485180b6ce5 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Thu, 16 May 2024 08:10:16 +0000 Subject: [PATCH 28/49] MNT: Re-rendered with conda-build 24.5.0, conda-smithy 3.35.1, and conda-forge-pinning 2024.05.16.07.45.46 --- .azure-pipelines/azure-pipelines-linux.yml | 64 +++++++-- .azure-pipelines/azure-pipelines-osx.yml | 38 ++++-- .azure-pipelines/azure-pipelines-win.yml | 20 ++- ...nux_64_numpy1.22python3.8.____cpython.yaml | 8 +- ...ux_64_numpy2.0python3.10.____cpython.yaml} | 10 +- ...ux_64_numpy2.0python3.11.____cpython.yaml} | 10 +- ...nux_64_numpy2.0python3.12.____cpython.yaml | 42 ++++++ ...nux_64_numpy2.0python3.9.____cpython.yaml} | 10 +- ...arch64_numpy1.22python3.8.____cpython.yaml | 10 +- ...rch64_numpy2.0python3.10.____cpython.yaml} | 12 +- ...rch64_numpy2.0python3.11.____cpython.yaml} | 12 +- ...arch64_numpy2.0python3.12.____cpython.yaml | 46 +++++++ ...arch64_numpy2.0python3.9.____cpython.yaml} | 12 +- ...pc64le_numpy1.22python3.8.____cpython.yaml | 10 +- ...c64le_numpy2.0python3.10.____cpython.yaml} | 12 +- ...c64le_numpy2.0python3.11.____cpython.yaml} | 12 +- ...pc64le_numpy2.0python3.12.____cpython.yaml | 42 ++++++ ...pc64le_numpy2.0python3.9.____cpython.yaml} | 12 +- ...osx_64_numpy1.22python3.8.____cpython.yaml | 8 +- ...sx_64_numpy2.0python3.10.____cpython.yaml} | 10 +- ...sx_64_numpy2.0python3.11.____cpython.yaml} | 10 +- ...osx_64_numpy2.0python3.12.____cpython.yaml | 42 ++++++ ...osx_64_numpy2.0python3.9.____cpython.yaml} | 10 +- ..._arm64_numpy1.22python3.8.____cpython.yaml | 6 +- ...arm64_numpy2.0python3.10.____cpython.yaml} | 8 +- ...arm64_numpy2.0python3.11.____cpython.yaml} | 8 +- ..._arm64_numpy2.0python3.12.____cpython.yaml | 42 ++++++ ..._arm64_numpy2.0python3.9.____cpython.yaml} | 8 +- ...win_64_numpy1.22python3.8.____cpython.yaml | 4 +- ...in_64_numpy2.0python3.10.____cpython.yaml} | 6 +- ...in_64_numpy2.0python3.11.____cpython.yaml} | 6 +- ...win_64_numpy2.0python3.12.____cpython.yaml | 28 ++++ ...win_64_numpy2.0python3.9.____cpython.yaml} | 6 +- .gitignore | 25 +++- .scripts/build_steps.sh | 11 +- .scripts/run_docker_build.sh | 9 ++ .scripts/run_osx_build.sh | 15 +- .scripts/run_win_build.bat | 16 ++- .travis.yml | 57 -------- README.md | 129 +++++++++++------- azure-pipelines.yml | 4 +- build-locally.py | 5 +- 42 files changed, 651 insertions(+), 204 deletions(-) rename .ci_support/{linux_64_numpy1.22python3.10.____cpython.yaml => linux_64_numpy2.0python3.10.____cpython.yaml} (78%) rename .ci_support/{linux_64_numpy1.23python3.11.____cpython.yaml => linux_64_numpy2.0python3.11.____cpython.yaml} (78%) create mode 100644 .ci_support/linux_64_numpy2.0python3.12.____cpython.yaml rename .ci_support/{linux_64_numpy1.22python3.9.____cpython.yaml => linux_64_numpy2.0python3.9.____cpython.yaml} (78%) rename .ci_support/{linux_aarch64_numpy1.22python3.10.____cpython.yaml => linux_aarch64_numpy2.0python3.10.____cpython.yaml} (73%) rename .ci_support/{linux_aarch64_numpy1.23python3.11.____cpython.yaml => linux_aarch64_numpy2.0python3.11.____cpython.yaml} (73%) create mode 100644 .ci_support/linux_aarch64_numpy2.0python3.12.____cpython.yaml rename .ci_support/{linux_aarch64_numpy1.22python3.9.____cpython.yaml => linux_aarch64_numpy2.0python3.9.____cpython.yaml} (73%) rename .ci_support/{linux_ppc64le_numpy1.22python3.10.____cpython.yaml => linux_ppc64le_numpy2.0python3.10.____cpython.yaml} (71%) rename .ci_support/{linux_ppc64le_numpy1.23python3.11.____cpython.yaml => linux_ppc64le_numpy2.0python3.11.____cpython.yaml} (71%) create mode 100644 .ci_support/linux_ppc64le_numpy2.0python3.12.____cpython.yaml rename .ci_support/{linux_ppc64le_numpy1.22python3.9.____cpython.yaml => linux_ppc64le_numpy2.0python3.9.____cpython.yaml} (71%) rename .ci_support/{osx_64_numpy1.22python3.10.____cpython.yaml => osx_64_numpy2.0python3.10.____cpython.yaml} (80%) rename .ci_support/{osx_64_numpy1.23python3.11.____cpython.yaml => osx_64_numpy2.0python3.11.____cpython.yaml} (80%) create mode 100644 .ci_support/osx_64_numpy2.0python3.12.____cpython.yaml rename .ci_support/{osx_64_numpy1.22python3.9.____cpython.yaml => osx_64_numpy2.0python3.9.____cpython.yaml} (79%) rename .ci_support/{osx_arm64_numpy1.22python3.10.____cpython.yaml => osx_arm64_numpy2.0python3.10.____cpython.yaml} (81%) rename .ci_support/{osx_arm64_numpy1.23python3.11.____cpython.yaml => osx_arm64_numpy2.0python3.11.____cpython.yaml} (81%) create mode 100644 .ci_support/osx_arm64_numpy2.0python3.12.____cpython.yaml rename .ci_support/{osx_arm64_numpy1.22python3.9.____cpython.yaml => osx_arm64_numpy2.0python3.9.____cpython.yaml} (81%) rename .ci_support/{win_64_numpy1.22python3.10.____cpython.yaml => win_64_numpy2.0python3.10.____cpython.yaml} (82%) rename .ci_support/{win_64_numpy1.23python3.11.____cpython.yaml => win_64_numpy2.0python3.11.____cpython.yaml} (82%) create mode 100644 .ci_support/win_64_numpy2.0python3.12.____cpython.yaml rename .ci_support/{win_64_numpy1.22python3.9.____cpython.yaml => win_64_numpy2.0python3.9.____cpython.yaml} (82%) delete mode 100644 .travis.yml diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 3c2a28a..d0e47db 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,23 +8,68 @@ jobs: vmImage: ubuntu-latest strategy: matrix: - linux_64_numpy1.22python3.10.____cpython: - CONFIG: linux_64_numpy1.22python3.10.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_64_numpy1.22python3.8.____cpython: CONFIG: linux_64_numpy1.22python3.8.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_numpy1.22python3.9.____cpython: - CONFIG: linux_64_numpy1.22python3.9.____cpython + linux_64_numpy2.0python3.10.____cpython: + CONFIG: linux_64_numpy2.0python3.10.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_64_numpy2.0python3.11.____cpython: + CONFIG: linux_64_numpy2.0python3.11.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_64_numpy2.0python3.12.____cpython: + CONFIG: linux_64_numpy2.0python3.12.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_64_numpy2.0python3.9.____cpython: + CONFIG: linux_64_numpy2.0python3.9.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_aarch64_numpy1.22python3.8.____cpython: + CONFIG: linux_aarch64_numpy1.22python3.8.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_aarch64_numpy2.0python3.10.____cpython: + CONFIG: linux_aarch64_numpy2.0python3.10.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_aarch64_numpy2.0python3.11.____cpython: + CONFIG: linux_aarch64_numpy2.0python3.11.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_aarch64_numpy2.0python3.12.____cpython: + CONFIG: linux_aarch64_numpy2.0python3.12.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_aarch64_numpy2.0python3.9.____cpython: + CONFIG: linux_aarch64_numpy2.0python3.9.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_ppc64le_numpy1.22python3.8.____cpython: + CONFIG: linux_ppc64le_numpy1.22python3.8.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_ppc64le_numpy2.0python3.10.____cpython: + CONFIG: linux_ppc64le_numpy2.0python3.10.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_ppc64le_numpy2.0python3.11.____cpython: + CONFIG: linux_ppc64le_numpy2.0python3.11.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_ppc64le_numpy2.0python3.12.____cpython: + CONFIG: linux_ppc64le_numpy2.0python3.12.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_numpy1.23python3.11.____cpython: - CONFIG: linux_64_numpy1.23python3.11.____cpython + linux_ppc64le_numpy2.0python3.9.____cpython: + CONFIG: linux_ppc64le_numpy2.0python3.9.____cpython 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 @@ -37,6 +82,9 @@ jobs: - script: | export CI=azure + export flow_run_id=azure_$(Build.BuildNumber).$(System.JobAttempt) + export remote_url=$(Build.Repository.Uri) + export sha=$(Build.SourceVersion) export GIT_BRANCH=$BUILD_SOURCEBRANCHNAME export FEEDSTOCK_NAME=$(basename ${BUILD_REPOSITORY_NAME}) if [[ "${BUILD_REASON:-}" == "PullRequest" ]]; then diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 1fd61d2..15c5551 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -5,39 +5,49 @@ jobs: - job: osx pool: - vmImage: macOS-11 + vmImage: macOS-12 strategy: matrix: - osx_64_numpy1.22python3.10.____cpython: - CONFIG: osx_64_numpy1.22python3.10.____cpython - UPLOAD_PACKAGES: 'True' osx_64_numpy1.22python3.8.____cpython: CONFIG: osx_64_numpy1.22python3.8.____cpython UPLOAD_PACKAGES: 'True' - osx_64_numpy1.22python3.9.____cpython: - CONFIG: osx_64_numpy1.22python3.9.____cpython + osx_64_numpy2.0python3.10.____cpython: + CONFIG: osx_64_numpy2.0python3.10.____cpython + UPLOAD_PACKAGES: 'True' + osx_64_numpy2.0python3.11.____cpython: + CONFIG: osx_64_numpy2.0python3.11.____cpython UPLOAD_PACKAGES: 'True' - osx_64_numpy1.23python3.11.____cpython: - CONFIG: osx_64_numpy1.23python3.11.____cpython + osx_64_numpy2.0python3.12.____cpython: + CONFIG: osx_64_numpy2.0python3.12.____cpython UPLOAD_PACKAGES: 'True' - osx_arm64_numpy1.22python3.10.____cpython: - CONFIG: osx_arm64_numpy1.22python3.10.____cpython + osx_64_numpy2.0python3.9.____cpython: + CONFIG: osx_64_numpy2.0python3.9.____cpython UPLOAD_PACKAGES: 'True' osx_arm64_numpy1.22python3.8.____cpython: CONFIG: osx_arm64_numpy1.22python3.8.____cpython UPLOAD_PACKAGES: 'True' - osx_arm64_numpy1.22python3.9.____cpython: - CONFIG: osx_arm64_numpy1.22python3.9.____cpython + osx_arm64_numpy2.0python3.10.____cpython: + CONFIG: osx_arm64_numpy2.0python3.10.____cpython + UPLOAD_PACKAGES: 'True' + osx_arm64_numpy2.0python3.11.____cpython: + CONFIG: osx_arm64_numpy2.0python3.11.____cpython + UPLOAD_PACKAGES: 'True' + osx_arm64_numpy2.0python3.12.____cpython: + CONFIG: osx_arm64_numpy2.0python3.12.____cpython UPLOAD_PACKAGES: 'True' - osx_arm64_numpy1.23python3.11.____cpython: - CONFIG: osx_arm64_numpy1.23python3.11.____cpython + osx_arm64_numpy2.0python3.9.____cpython: + CONFIG: osx_arm64_numpy2.0python3.9.____cpython UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 + variables: {} steps: # TODO: Fast finish on azure pipelines? - script: | export CI=azure + export flow_run_id=azure_$(Build.BuildNumber).$(System.JobAttempt) + export remote_url=$(Build.Repository.Uri) + export sha=$(Build.SourceVersion) export OSX_FORCE_SDK_DOWNLOAD="1" export GIT_BRANCH=$BUILD_SOURCEBRANCHNAME export FEEDSTOCK_NAME=$(basename ${BUILD_REPOSITORY_NAME}) diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 07c0877..9795690 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -8,17 +8,20 @@ jobs: vmImage: windows-2022 strategy: matrix: - win_64_numpy1.22python3.10.____cpython: - CONFIG: win_64_numpy1.22python3.10.____cpython - UPLOAD_PACKAGES: 'True' win_64_numpy1.22python3.8.____cpython: CONFIG: win_64_numpy1.22python3.8.____cpython UPLOAD_PACKAGES: 'True' - win_64_numpy1.22python3.9.____cpython: - CONFIG: win_64_numpy1.22python3.9.____cpython + win_64_numpy2.0python3.10.____cpython: + CONFIG: win_64_numpy2.0python3.10.____cpython + UPLOAD_PACKAGES: 'True' + win_64_numpy2.0python3.11.____cpython: + CONFIG: win_64_numpy2.0python3.11.____cpython + UPLOAD_PACKAGES: 'True' + win_64_numpy2.0python3.12.____cpython: + CONFIG: win_64_numpy2.0python3.12.____cpython UPLOAD_PACKAGES: 'True' - win_64_numpy1.23python3.11.____cpython: - CONFIG: win_64_numpy1.23python3.11.____cpython + win_64_numpy2.0python3.9.____cpython: + CONFIG: win_64_numpy2.0python3.9.____cpython UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 variables: @@ -51,6 +54,9 @@ jobs: PYTHONUNBUFFERED: 1 CONFIG: $(CONFIG) CI: azure + flow_run_id: azure_$(Build.BuildNumber).$(System.JobAttempt) + remote_url: $(Build.Repository.Uri) + sha: $(Build.SourceVersion) UPLOAD_PACKAGES: $(UPLOAD_PACKAGES) UPLOAD_TEMP: $(UPLOAD_TEMP) BINSTAR_TOKEN: $(BINSTAR_TOKEN) diff --git a/.ci_support/linux_64_numpy1.22python3.8.____cpython.yaml b/.ci_support/linux_64_numpy1.22python3.8.____cpython.yaml index 1f23555..8ea0c03 100644 --- a/.ci_support/linux_64_numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.22python3.8.____cpython.yaml @@ -2,10 +2,14 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.12' cdt_name: - cos6 channel_sources: -- conda-forge +- conda-forge/label/numpy_rc,conda-forge channel_targets: - conda-forge main cxx_compiler: @@ -31,6 +35,8 @@ tbb: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - numpy - python_impl diff --git a/.ci_support/linux_64_numpy1.22python3.10.____cpython.yaml b/.ci_support/linux_64_numpy2.0python3.10.____cpython.yaml similarity index 78% rename from .ci_support/linux_64_numpy1.22python3.10.____cpython.yaml rename to .ci_support/linux_64_numpy2.0python3.10.____cpython.yaml index fed021f..a0124e2 100644 --- a/.ci_support/linux_64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/linux_64_numpy2.0python3.10.____cpython.yaml @@ -2,10 +2,14 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.12' cdt_name: - cos6 channel_sources: -- conda-forge +- conda-forge/label/numpy_rc,conda-forge channel_targets: - conda-forge main cxx_compiler: @@ -15,7 +19,7 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 numpy: -- '1.22' +- '2.0' pin_run_as_build: python: min_pin: x.x @@ -31,6 +35,8 @@ tbb: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - numpy - python_impl diff --git a/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_64_numpy2.0python3.11.____cpython.yaml similarity index 78% rename from .ci_support/linux_64_numpy1.23python3.11.____cpython.yaml rename to .ci_support/linux_64_numpy2.0python3.11.____cpython.yaml index 1ec43c5..cbbe69c 100644 --- a/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_64_numpy2.0python3.11.____cpython.yaml @@ -2,10 +2,14 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.12' cdt_name: - cos6 channel_sources: -- conda-forge +- conda-forge/label/numpy_rc,conda-forge channel_targets: - conda-forge main cxx_compiler: @@ -15,7 +19,7 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 numpy: -- '1.23' +- '2.0' pin_run_as_build: python: min_pin: x.x @@ -31,6 +35,8 @@ tbb: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - numpy - python_impl diff --git a/.ci_support/linux_64_numpy2.0python3.12.____cpython.yaml b/.ci_support/linux_64_numpy2.0python3.12.____cpython.yaml new file mode 100644 index 0000000..f5994d7 --- /dev/null +++ b/.ci_support/linux_64_numpy2.0python3.12.____cpython.yaml @@ -0,0 +1,42 @@ +c_compiler: +- gcc +c_compiler_version: +- '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.12' +cdt_name: +- cos6 +channel_sources: +- conda-forge/label/numpy_rc,conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- gxx +cxx_compiler_version: +- '12' +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +numpy: +- '2.0' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.12.* *_cpython +python_impl: +- cpython +target_platform: +- linux-64 +tbb: +- '2021' +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - c_stdlib_version + - cdt_name +- - python + - numpy + - python_impl diff --git a/.ci_support/linux_64_numpy1.22python3.9.____cpython.yaml b/.ci_support/linux_64_numpy2.0python3.9.____cpython.yaml similarity index 78% rename from .ci_support/linux_64_numpy1.22python3.9.____cpython.yaml rename to .ci_support/linux_64_numpy2.0python3.9.____cpython.yaml index 18a7ce8..c1dc3f2 100644 --- a/.ci_support/linux_64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/linux_64_numpy2.0python3.9.____cpython.yaml @@ -2,10 +2,14 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.12' cdt_name: - cos6 channel_sources: -- conda-forge +- conda-forge/label/numpy_rc,conda-forge channel_targets: - conda-forge main cxx_compiler: @@ -15,7 +19,7 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 numpy: -- '1.22' +- '2.0' pin_run_as_build: python: min_pin: x.x @@ -31,6 +35,8 @@ tbb: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - numpy - python_impl diff --git a/.ci_support/linux_aarch64_numpy1.22python3.8.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.22python3.8.____cpython.yaml index 2b65590..7d7378a 100644 --- a/.ci_support/linux_aarch64_numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.22python3.8.____cpython.yaml @@ -4,12 +4,16 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_arch: - aarch64 cdt_name: - cos7 channel_sources: -- conda-forge +- conda-forge/label/numpy_rc,conda-forge channel_targets: - conda-forge main cxx_compiler: @@ -17,7 +21,7 @@ cxx_compiler: cxx_compiler_version: - '12' docker_image: -- quay.io/condaforge/linux-anvil-aarch64 +- quay.io/condaforge/linux-anvil-cos7-x86_64 numpy: - '1.22' pin_run_as_build: @@ -35,6 +39,8 @@ tbb: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - numpy - python_impl diff --git a/.ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml b/.ci_support/linux_aarch64_numpy2.0python3.10.____cpython.yaml similarity index 73% rename from .ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml rename to .ci_support/linux_aarch64_numpy2.0python3.10.____cpython.yaml index 456a257..474184f 100644 --- a/.ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy2.0python3.10.____cpython.yaml @@ -4,12 +4,16 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_arch: - aarch64 cdt_name: - cos7 channel_sources: -- conda-forge +- conda-forge/label/numpy_rc,conda-forge channel_targets: - conda-forge main cxx_compiler: @@ -17,9 +21,9 @@ cxx_compiler: cxx_compiler_version: - '12' docker_image: -- quay.io/condaforge/linux-anvil-aarch64 +- quay.io/condaforge/linux-anvil-cos7-x86_64 numpy: -- '1.22' +- '2.0' pin_run_as_build: python: min_pin: x.x @@ -35,6 +39,8 @@ tbb: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - numpy - python_impl diff --git a/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_aarch64_numpy2.0python3.11.____cpython.yaml similarity index 73% rename from .ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml rename to .ci_support/linux_aarch64_numpy2.0python3.11.____cpython.yaml index ae0b8c6..00f4489 100644 --- a/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy2.0python3.11.____cpython.yaml @@ -4,12 +4,16 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_arch: - aarch64 cdt_name: - cos7 channel_sources: -- conda-forge +- conda-forge/label/numpy_rc,conda-forge channel_targets: - conda-forge main cxx_compiler: @@ -17,9 +21,9 @@ cxx_compiler: cxx_compiler_version: - '12' docker_image: -- quay.io/condaforge/linux-anvil-aarch64 +- quay.io/condaforge/linux-anvil-cos7-x86_64 numpy: -- '1.23' +- '2.0' pin_run_as_build: python: min_pin: x.x @@ -35,6 +39,8 @@ tbb: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - numpy - python_impl diff --git a/.ci_support/linux_aarch64_numpy2.0python3.12.____cpython.yaml b/.ci_support/linux_aarch64_numpy2.0python3.12.____cpython.yaml new file mode 100644 index 0000000..e31adab --- /dev/null +++ b/.ci_support/linux_aarch64_numpy2.0python3.12.____cpython.yaml @@ -0,0 +1,46 @@ +BUILD: +- aarch64-conda_cos7-linux-gnu +c_compiler: +- gcc +c_compiler_version: +- '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' +cdt_arch: +- aarch64 +cdt_name: +- cos7 +channel_sources: +- conda-forge/label/numpy_rc,conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- gxx +cxx_compiler_version: +- '12' +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +numpy: +- '2.0' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.12.* *_cpython +python_impl: +- cpython +target_platform: +- linux-aarch64 +tbb: +- '2021' +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - c_stdlib_version + - cdt_name +- - python + - numpy + - python_impl diff --git a/.ci_support/linux_aarch64_numpy1.22python3.9.____cpython.yaml b/.ci_support/linux_aarch64_numpy2.0python3.9.____cpython.yaml similarity index 73% rename from .ci_support/linux_aarch64_numpy1.22python3.9.____cpython.yaml rename to .ci_support/linux_aarch64_numpy2.0python3.9.____cpython.yaml index 87f1b09..fc5d686 100644 --- a/.ci_support/linux_aarch64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy2.0python3.9.____cpython.yaml @@ -4,12 +4,16 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_arch: - aarch64 cdt_name: - cos7 channel_sources: -- conda-forge +- conda-forge/label/numpy_rc,conda-forge channel_targets: - conda-forge main cxx_compiler: @@ -17,9 +21,9 @@ cxx_compiler: cxx_compiler_version: - '12' docker_image: -- quay.io/condaforge/linux-anvil-aarch64 +- quay.io/condaforge/linux-anvil-cos7-x86_64 numpy: -- '1.22' +- '2.0' pin_run_as_build: python: min_pin: x.x @@ -35,6 +39,8 @@ tbb: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - numpy - python_impl diff --git a/.ci_support/linux_ppc64le_numpy1.22python3.8.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.22python3.8.____cpython.yaml index 5e5922f..e34b931 100644 --- a/.ci_support/linux_ppc64le_numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.22python3.8.____cpython.yaml @@ -2,10 +2,14 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: -- conda-forge +- conda-forge/label/numpy_rc,conda-forge channel_targets: - conda-forge main cxx_compiler: @@ -13,7 +17,7 @@ cxx_compiler: cxx_compiler_version: - '12' docker_image: -- quay.io/condaforge/linux-anvil-ppc64le +- quay.io/condaforge/linux-anvil-cos7-x86_64 numpy: - '1.22' pin_run_as_build: @@ -31,6 +35,8 @@ tbb: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - numpy - python_impl diff --git a/.ci_support/linux_ppc64le_numpy1.22python3.10.____cpython.yaml b/.ci_support/linux_ppc64le_numpy2.0python3.10.____cpython.yaml similarity index 71% rename from .ci_support/linux_ppc64le_numpy1.22python3.10.____cpython.yaml rename to .ci_support/linux_ppc64le_numpy2.0python3.10.____cpython.yaml index b9fb690..801d561 100644 --- a/.ci_support/linux_ppc64le_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy2.0python3.10.____cpython.yaml @@ -2,10 +2,14 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: -- conda-forge +- conda-forge/label/numpy_rc,conda-forge channel_targets: - conda-forge main cxx_compiler: @@ -13,9 +17,9 @@ cxx_compiler: cxx_compiler_version: - '12' docker_image: -- quay.io/condaforge/linux-anvil-ppc64le +- quay.io/condaforge/linux-anvil-cos7-x86_64 numpy: -- '1.22' +- '2.0' pin_run_as_build: python: min_pin: x.x @@ -31,6 +35,8 @@ tbb: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - numpy - python_impl diff --git a/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_ppc64le_numpy2.0python3.11.____cpython.yaml similarity index 71% rename from .ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml rename to .ci_support/linux_ppc64le_numpy2.0python3.11.____cpython.yaml index 1d11b04..3f9092d 100644 --- a/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy2.0python3.11.____cpython.yaml @@ -2,10 +2,14 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: -- conda-forge +- conda-forge/label/numpy_rc,conda-forge channel_targets: - conda-forge main cxx_compiler: @@ -13,9 +17,9 @@ cxx_compiler: cxx_compiler_version: - '12' docker_image: -- quay.io/condaforge/linux-anvil-ppc64le +- quay.io/condaforge/linux-anvil-cos7-x86_64 numpy: -- '1.23' +- '2.0' pin_run_as_build: python: min_pin: x.x @@ -31,6 +35,8 @@ tbb: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - numpy - python_impl diff --git a/.ci_support/linux_ppc64le_numpy2.0python3.12.____cpython.yaml b/.ci_support/linux_ppc64le_numpy2.0python3.12.____cpython.yaml new file mode 100644 index 0000000..31e69fb --- /dev/null +++ b/.ci_support/linux_ppc64le_numpy2.0python3.12.____cpython.yaml @@ -0,0 +1,42 @@ +c_compiler: +- gcc +c_compiler_version: +- '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' +cdt_name: +- cos7 +channel_sources: +- conda-forge/label/numpy_rc,conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- gxx +cxx_compiler_version: +- '12' +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +numpy: +- '2.0' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.12.* *_cpython +python_impl: +- cpython +target_platform: +- linux-ppc64le +tbb: +- '2021' +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - c_stdlib_version + - cdt_name +- - python + - numpy + - python_impl diff --git a/.ci_support/linux_ppc64le_numpy1.22python3.9.____cpython.yaml b/.ci_support/linux_ppc64le_numpy2.0python3.9.____cpython.yaml similarity index 71% rename from .ci_support/linux_ppc64le_numpy1.22python3.9.____cpython.yaml rename to .ci_support/linux_ppc64le_numpy2.0python3.9.____cpython.yaml index d8e02bd..ec65280 100644 --- a/.ci_support/linux_ppc64le_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy2.0python3.9.____cpython.yaml @@ -2,10 +2,14 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: -- conda-forge +- conda-forge/label/numpy_rc,conda-forge channel_targets: - conda-forge main cxx_compiler: @@ -13,9 +17,9 @@ cxx_compiler: cxx_compiler_version: - '12' docker_image: -- quay.io/condaforge/linux-anvil-ppc64le +- quay.io/condaforge/linux-anvil-cos7-x86_64 numpy: -- '1.22' +- '2.0' pin_run_as_build: python: min_pin: x.x @@ -31,6 +35,8 @@ tbb: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - numpy - python_impl diff --git a/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml b/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml index 574bfcc..af1222a 100644 --- a/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml @@ -1,11 +1,15 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.9' +- '10.13' c_compiler: - clang c_compiler_version: - '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.13' channel_sources: -- conda-forge +- conda-forge/label/numpy_rc,conda-forge channel_targets: - conda-forge main cxx_compiler: diff --git a/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml b/.ci_support/osx_64_numpy2.0python3.10.____cpython.yaml similarity index 80% rename from .ci_support/osx_64_numpy1.22python3.10.____cpython.yaml rename to .ci_support/osx_64_numpy2.0python3.10.____cpython.yaml index 77d1013..f74e167 100644 --- a/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/osx_64_numpy2.0python3.10.____cpython.yaml @@ -1,11 +1,15 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.9' +- '10.13' c_compiler: - clang c_compiler_version: - '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.13' channel_sources: -- conda-forge +- conda-forge/label/numpy_rc,conda-forge channel_targets: - conda-forge main cxx_compiler: @@ -17,7 +21,7 @@ llvm_openmp: macos_machine: - x86_64-apple-darwin13.4.0 numpy: -- '1.22' +- '2.0' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml b/.ci_support/osx_64_numpy2.0python3.11.____cpython.yaml similarity index 80% rename from .ci_support/osx_64_numpy1.23python3.11.____cpython.yaml rename to .ci_support/osx_64_numpy2.0python3.11.____cpython.yaml index 909bea9..423d392 100644 --- a/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/osx_64_numpy2.0python3.11.____cpython.yaml @@ -1,11 +1,15 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.9' +- '10.13' c_compiler: - clang c_compiler_version: - '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.13' channel_sources: -- conda-forge +- conda-forge/label/numpy_rc,conda-forge channel_targets: - conda-forge main cxx_compiler: @@ -17,7 +21,7 @@ llvm_openmp: macos_machine: - x86_64-apple-darwin13.4.0 numpy: -- '1.23' +- '2.0' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/osx_64_numpy2.0python3.12.____cpython.yaml b/.ci_support/osx_64_numpy2.0python3.12.____cpython.yaml new file mode 100644 index 0000000..65964cf --- /dev/null +++ b/.ci_support/osx_64_numpy2.0python3.12.____cpython.yaml @@ -0,0 +1,42 @@ +MACOSX_DEPLOYMENT_TARGET: +- '10.13' +c_compiler: +- clang +c_compiler_version: +- '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.13' +channel_sources: +- conda-forge/label/numpy_rc,conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- clangxx +cxx_compiler_version: +- '16' +llvm_openmp: +- '16' +macos_machine: +- x86_64-apple-darwin13.4.0 +numpy: +- '2.0' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.12.* *_cpython +python_impl: +- cpython +target_platform: +- osx-64 +tbb: +- '2021' +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - python + - numpy + - python_impl diff --git a/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml b/.ci_support/osx_64_numpy2.0python3.9.____cpython.yaml similarity index 79% rename from .ci_support/osx_64_numpy1.22python3.9.____cpython.yaml rename to .ci_support/osx_64_numpy2.0python3.9.____cpython.yaml index 2206e05..b49c4c5 100644 --- a/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/osx_64_numpy2.0python3.9.____cpython.yaml @@ -1,11 +1,15 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.9' +- '10.13' c_compiler: - clang c_compiler_version: - '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.13' channel_sources: -- conda-forge +- conda-forge/label/numpy_rc,conda-forge channel_targets: - conda-forge main cxx_compiler: @@ -17,7 +21,7 @@ llvm_openmp: macos_machine: - x86_64-apple-darwin13.4.0 numpy: -- '1.22' +- '2.0' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml index d1ee8bc..d29e9e2 100644 --- a/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml @@ -4,8 +4,12 @@ c_compiler: - clang c_compiler_version: - '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '11.0' channel_sources: -- conda-forge +- conda-forge/label/numpy_rc,conda-forge channel_targets: - conda-forge main cxx_compiler: diff --git a/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml b/.ci_support/osx_arm64_numpy2.0python3.10.____cpython.yaml similarity index 81% rename from .ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml rename to .ci_support/osx_arm64_numpy2.0python3.10.____cpython.yaml index ef21985..1f3e189 100644 --- a/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy2.0python3.10.____cpython.yaml @@ -4,8 +4,12 @@ c_compiler: - clang c_compiler_version: - '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '11.0' channel_sources: -- conda-forge +- conda-forge/label/numpy_rc,conda-forge channel_targets: - conda-forge main cxx_compiler: @@ -17,7 +21,7 @@ llvm_openmp: macos_machine: - arm64-apple-darwin20.0.0 numpy: -- '1.22' +- '2.0' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml b/.ci_support/osx_arm64_numpy2.0python3.11.____cpython.yaml similarity index 81% rename from .ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml rename to .ci_support/osx_arm64_numpy2.0python3.11.____cpython.yaml index 4b39ebb..659a098 100644 --- a/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy2.0python3.11.____cpython.yaml @@ -4,8 +4,12 @@ c_compiler: - clang c_compiler_version: - '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '11.0' channel_sources: -- conda-forge +- conda-forge/label/numpy_rc,conda-forge channel_targets: - conda-forge main cxx_compiler: @@ -17,7 +21,7 @@ llvm_openmp: macos_machine: - arm64-apple-darwin20.0.0 numpy: -- '1.23' +- '2.0' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/osx_arm64_numpy2.0python3.12.____cpython.yaml b/.ci_support/osx_arm64_numpy2.0python3.12.____cpython.yaml new file mode 100644 index 0000000..e8e2111 --- /dev/null +++ b/.ci_support/osx_arm64_numpy2.0python3.12.____cpython.yaml @@ -0,0 +1,42 @@ +MACOSX_DEPLOYMENT_TARGET: +- '11.0' +c_compiler: +- clang +c_compiler_version: +- '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '11.0' +channel_sources: +- conda-forge/label/numpy_rc,conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- clangxx +cxx_compiler_version: +- '16' +llvm_openmp: +- '16' +macos_machine: +- arm64-apple-darwin20.0.0 +numpy: +- '2.0' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.12.* *_cpython +python_impl: +- cpython +target_platform: +- osx-arm64 +tbb: +- '2021' +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - python + - numpy + - python_impl diff --git a/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml b/.ci_support/osx_arm64_numpy2.0python3.9.____cpython.yaml similarity index 81% rename from .ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml rename to .ci_support/osx_arm64_numpy2.0python3.9.____cpython.yaml index a0c3ba8..ecd3b8a 100644 --- a/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy2.0python3.9.____cpython.yaml @@ -4,8 +4,12 @@ c_compiler: - clang c_compiler_version: - '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '11.0' channel_sources: -- conda-forge +- conda-forge/label/numpy_rc,conda-forge channel_targets: - conda-forge main cxx_compiler: @@ -17,7 +21,7 @@ llvm_openmp: macos_machine: - arm64-apple-darwin20.0.0 numpy: -- '1.22' +- '2.0' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/win_64_numpy1.22python3.8.____cpython.yaml b/.ci_support/win_64_numpy1.22python3.8.____cpython.yaml index fc1af03..2477e53 100644 --- a/.ci_support/win_64_numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/win_64_numpy1.22python3.8.____cpython.yaml @@ -1,7 +1,9 @@ c_compiler: - vs2019 +c_stdlib: +- vs channel_sources: -- conda-forge +- conda-forge/label/numpy_rc,conda-forge channel_targets: - conda-forge main cxx_compiler: diff --git a/.ci_support/win_64_numpy1.22python3.10.____cpython.yaml b/.ci_support/win_64_numpy2.0python3.10.____cpython.yaml similarity index 82% rename from .ci_support/win_64_numpy1.22python3.10.____cpython.yaml rename to .ci_support/win_64_numpy2.0python3.10.____cpython.yaml index 8e9b9a8..a48e88c 100644 --- a/.ci_support/win_64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/win_64_numpy2.0python3.10.____cpython.yaml @@ -1,13 +1,15 @@ c_compiler: - vs2019 +c_stdlib: +- vs channel_sources: -- conda-forge +- conda-forge/label/numpy_rc,conda-forge channel_targets: - conda-forge main cxx_compiler: - vs2019 numpy: -- '1.22' +- '2.0' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/win_64_numpy1.23python3.11.____cpython.yaml b/.ci_support/win_64_numpy2.0python3.11.____cpython.yaml similarity index 82% rename from .ci_support/win_64_numpy1.23python3.11.____cpython.yaml rename to .ci_support/win_64_numpy2.0python3.11.____cpython.yaml index 5dcd582..b30e330 100644 --- a/.ci_support/win_64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/win_64_numpy2.0python3.11.____cpython.yaml @@ -1,13 +1,15 @@ c_compiler: - vs2019 +c_stdlib: +- vs channel_sources: -- conda-forge +- conda-forge/label/numpy_rc,conda-forge channel_targets: - conda-forge main cxx_compiler: - vs2019 numpy: -- '1.23' +- '2.0' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/win_64_numpy2.0python3.12.____cpython.yaml b/.ci_support/win_64_numpy2.0python3.12.____cpython.yaml new file mode 100644 index 0000000..d99a98b --- /dev/null +++ b/.ci_support/win_64_numpy2.0python3.12.____cpython.yaml @@ -0,0 +1,28 @@ +c_compiler: +- vs2019 +c_stdlib: +- vs +channel_sources: +- conda-forge/label/numpy_rc,conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- vs2019 +numpy: +- '2.0' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.12.* *_cpython +python_impl: +- cpython +target_platform: +- win-64 +tbb: +- '2021' +zip_keys: +- - python + - numpy + - python_impl diff --git a/.ci_support/win_64_numpy1.22python3.9.____cpython.yaml b/.ci_support/win_64_numpy2.0python3.9.____cpython.yaml similarity index 82% rename from .ci_support/win_64_numpy1.22python3.9.____cpython.yaml rename to .ci_support/win_64_numpy2.0python3.9.____cpython.yaml index b52ecc8..37328d7 100644 --- a/.ci_support/win_64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/win_64_numpy2.0python3.9.____cpython.yaml @@ -1,13 +1,15 @@ c_compiler: - vs2019 +c_stdlib: +- vs channel_sources: -- conda-forge +- conda-forge/label/numpy_rc,conda-forge channel_targets: - conda-forge main cxx_compiler: - vs2019 numpy: -- '1.22' +- '2.0' pin_run_as_build: python: min_pin: x.x diff --git a/.gitignore b/.gitignore index c89ecb7..179afe5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,24 @@ -*.pyc +# User content belongs under recipe/. +# Feedstock configuration goes in `conda-forge.yml` +# Everything else is managed by the conda-smithy rerender process. +# Please do not modify + +# Ignore all files and folders in root +* +!/conda-forge.yml + +# Don't ignore any files/folders if the parent folder is 'un-ignored' +# This also avoids warnings when adding an already-checked file with an ignored parent. +!/**/ +# Don't ignore any files/folders recursively in the following folders +!/recipe/** +!/.ci_support/** -build_artifacts +# Since we ignore files/folders recursively, any folders inside +# build_artifacts gets ignored which trips some build systems. +# To avoid that we 'un-ignore' all files/folders recursively +# and only ignore the root build_artifacts folder. +!/build_artifacts/** +/build_artifacts + +*.pyc diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index bd9e671..899ba03 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -28,13 +28,15 @@ conda-build: pkgs_dirs: - ${FEEDSTOCK_ROOT}/build_artifacts/pkg_cache - /opt/conda/pkgs +solver: libmamba CONDARC +export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 mamba install --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build boa conda-forge-ci-setup=3 + pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build boa conda-forge-ci-setup=3 + pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" @@ -66,9 +68,10 @@ if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then # Drop into an interactive shell /bin/bash else - conda mambabuild "${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" + --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" \ + --extra-meta flow_run_id="${flow_run_id:-}" remote_url="${remote_url:-}" sha="${sha:-}" ( startgroup "Validating outputs" ) 2> /dev/null validate_recipe_outputs "${FEEDSTOCK_NAME}" diff --git a/.scripts/run_docker_build.sh b/.scripts/run_docker_build.sh index 9236239..00f377a 100755 --- a/.scripts/run_docker_build.sh +++ b/.scripts/run_docker_build.sh @@ -21,6 +21,12 @@ if [ -z ${FEEDSTOCK_NAME} ]; then export FEEDSTOCK_NAME=$(basename ${FEEDSTOCK_ROOT}) fi +if [[ "${sha:-}" == "" ]]; then + pushd "${FEEDSTOCK_ROOT}" + sha=$(git rev-parse HEAD) + popd +fi + docker info # In order for the conda-build process in the container to write to the mounted @@ -91,6 +97,9 @@ docker run ${DOCKER_RUN_ARGS} \ -e CPU_COUNT \ -e BUILD_WITH_CONDA_DEBUG \ -e BUILD_OUTPUT_ID \ + -e flow_run_id \ + -e remote_url \ + -e sha \ -e BINSTAR_TOKEN \ -e FEEDSTOCK_TOKEN \ -e STAGING_BINSTAR_TOKEN \ diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 870c49a..07dff21 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -22,11 +22,13 @@ bash $MINIFORGE_FILE -b -p ${MINIFORGE_HOME} source ${MINIFORGE_HOME}/etc/profile.d/conda.sh conda activate base +export CONDA_SOLVER="libmamba" +export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 mamba install --update-specs --quiet --yes --channel conda-forge --strict-channel-priority \ - pip mamba conda-build boa conda-forge-ci-setup=3 + pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build boa conda-forge-ci-setup=3 + pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" @@ -45,6 +47,10 @@ else echo -e "\n\nNot mangling homebrew as we are not running in CI" fi +if [[ "${sha:-}" == "" ]]; then + sha=$(git rev-parse HEAD) +fi + echo -e "\n\nRunning the build setup script." source run_conda_forge_build_setup @@ -75,9 +81,10 @@ else EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --no-test" fi - conda mambabuild ./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 + --clobber-file ./.ci_support/clobber_${CONFIG}.yaml \ + --extra-meta flow_run_id="$flow_run_id" remote_url="$remote_url" sha="$sha" ( startgroup "Validating outputs" ) 2> /dev/null validate_recipe_outputs "${FEEDSTOCK_NAME}" diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat index 07d3445..6d54697 100755 --- a/.scripts/run_win_build.bat +++ b/.scripts/run_win_build.bat @@ -17,10 +17,14 @@ call :start_group "Configuring conda" :: Activate the base conda environment call activate base +:: Configure the solver +set "CONDA_SOLVER=libmamba" +if !errorlevel! neq 0 exit /b !errorlevel! +set "CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1" :: 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 +mamba.exe install "python=3.10" pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" -c conda-forge --strict-channel-priority --yes if !errorlevel! neq 0 exit /b !errorlevel! :: Set basic configuration @@ -38,14 +42,20 @@ if EXIST LICENSE.txt ( copy LICENSE.txt "recipe\\recipe-scripts-license.txt" ) if NOT [%HOST_PLATFORM%] == [%BUILD_PLATFORM%] ( - set "EXTRA_CB_OPTIONS=%EXTRA_CB_OPTIONS% --no-test" + if [%CROSSCOMPILING_EMULATOR%] == [] ( + set "EXTRA_CB_OPTIONS=%EXTRA_CB_OPTIONS% --no-test" + ) +) + +if NOT [%flow_run_id%] == [] ( + set "EXTRA_CB_OPTIONS=%EXTRA_CB_OPTIONS% --extra-meta flow_run_id=%flow_run_id% remote_url=%remote_url% sha=%sha%" ) call :end_group :: Build the recipe echo Building recipe -conda.exe mambabuild "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTRA_CB_OPTIONS% +conda-build.exe "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 diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 5b5c4ee..0000000 --- a/.travis.yml +++ /dev/null @@ -1,57 +0,0 @@ -# This file was generated automatically from conda-smithy. To update this configuration, -# update the conda-forge.yml and/or the recipe/meta.yaml. - -language: generic - - - -matrix: - include: - - 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.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.22python3.9.____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.23python3.11.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-aarch64 DOCKER_IMAGE=quay.io/condaforge/linux-anvil-aarch64 - os: linux - arch: arm64 - dist: focal - - - 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.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.22python3.9.____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.23python3.11.____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 - - export GIT_BRANCH="$TRAVIS_BRANCH" - - export FEEDSTOCK_NAME=$(basename ${TRAVIS_REPO_SLUG}) - - if [[ "${TRAVIS_PULL_REQUEST:-}" == "false" ]]; then export IS_PR_BUILD="False"; else export IS_PR_BUILD="True"; fi - - - - if [[ ${PLATFORM} =~ .*linux.* ]]; then CONDA_FORGE_DOCKER_RUN_ARGS="--network=host --security-opt=seccomp=unconfined" ./.scripts/run_docker_build.sh; fi \ No newline at end of file diff --git a/README.md b/README.md index 8b8a373..ab94986 100644 --- a/README.md +++ b/README.md @@ -22,14 +22,7 @@ Current build status ==================== -<table><tr> - <td>Travis</td> - <td> - <a href="https://app.travis-ci.com/conda-forge/numba-feedstock"> - <img alt="linux" src="https://img.shields.io/travis/com/conda-forge/numba-feedstock/main.svg?label=Linux"> - </a> - </td> - </tr> +<table> <tr> <td>Azure</td> @@ -43,38 +36,38 @@ Current build status <table> <thead><tr><th>Variant</th><th>Status</th></tr></thead> <tbody><tr> - <td>linux_64_numpy1.22python3.10.____cpython</td> + <td>linux_64_numpy1.22python3.8.____cpython</td> <td> <a href="https://dev.azure.com/conda-forge/feedstock-builds/_build/latest?definitionId=700&branchName=main"> - <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=linux&configuration=linux%20linux_64_numpy1.22python3.10.____cpython" alt="variant"> + <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=linux&configuration=linux%20linux_64_numpy1.22python3.8.____cpython" alt="variant"> </a> </td> </tr><tr> - <td>linux_64_numpy1.22python3.8.____cpython</td> + <td>linux_64_numpy2.0python3.10.____cpython</td> <td> <a href="https://dev.azure.com/conda-forge/feedstock-builds/_build/latest?definitionId=700&branchName=main"> - <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=linux&configuration=linux%20linux_64_numpy1.22python3.8.____cpython" alt="variant"> + <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=linux&configuration=linux%20linux_64_numpy2.0python3.10.____cpython" alt="variant"> </a> </td> </tr><tr> - <td>linux_64_numpy1.22python3.9.____cpython</td> + <td>linux_64_numpy2.0python3.11.____cpython</td> <td> <a href="https://dev.azure.com/conda-forge/feedstock-builds/_build/latest?definitionId=700&branchName=main"> - <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=linux&configuration=linux%20linux_64_numpy1.22python3.9.____cpython" alt="variant"> + <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=linux&configuration=linux%20linux_64_numpy2.0python3.11.____cpython" alt="variant"> </a> </td> </tr><tr> - <td>linux_64_numpy1.23python3.11.____cpython</td> + <td>linux_64_numpy2.0python3.12.____cpython</td> <td> <a href="https://dev.azure.com/conda-forge/feedstock-builds/_build/latest?definitionId=700&branchName=main"> - <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=linux&configuration=linux%20linux_64_numpy1.23python3.11.____cpython" alt="variant"> + <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=linux&configuration=linux%20linux_64_numpy2.0python3.12.____cpython" alt="variant"> </a> </td> </tr><tr> - <td>linux_aarch64_numpy1.22python3.10.____cpython</td> + <td>linux_64_numpy2.0python3.9.____cpython</td> <td> <a href="https://dev.azure.com/conda-forge/feedstock-builds/_build/latest?definitionId=700&branchName=main"> - <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=linux&configuration=linux%20linux_aarch64_numpy1.22python3.10.____cpython" alt="variant"> + <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=linux&configuration=linux%20linux_64_numpy2.0python3.9.____cpython" alt="variant"> </a> </td> </tr><tr> @@ -85,24 +78,31 @@ Current build status </a> </td> </tr><tr> - <td>linux_aarch64_numpy1.22python3.9.____cpython</td> + <td>linux_aarch64_numpy2.0python3.10.____cpython</td> <td> <a href="https://dev.azure.com/conda-forge/feedstock-builds/_build/latest?definitionId=700&branchName=main"> - <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=linux&configuration=linux%20linux_aarch64_numpy1.22python3.9.____cpython" alt="variant"> + <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=linux&configuration=linux%20linux_aarch64_numpy2.0python3.10.____cpython" alt="variant"> </a> </td> </tr><tr> - <td>linux_aarch64_numpy1.23python3.11.____cpython</td> + <td>linux_aarch64_numpy2.0python3.11.____cpython</td> <td> <a href="https://dev.azure.com/conda-forge/feedstock-builds/_build/latest?definitionId=700&branchName=main"> - <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=linux&configuration=linux%20linux_aarch64_numpy1.23python3.11.____cpython" alt="variant"> + <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=linux&configuration=linux%20linux_aarch64_numpy2.0python3.11.____cpython" alt="variant"> </a> </td> </tr><tr> - <td>linux_ppc64le_numpy1.22python3.10.____cpython</td> + <td>linux_aarch64_numpy2.0python3.12.____cpython</td> <td> <a href="https://dev.azure.com/conda-forge/feedstock-builds/_build/latest?definitionId=700&branchName=main"> - <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=linux&configuration=linux%20linux_ppc64le_numpy1.22python3.10.____cpython" alt="variant"> + <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=linux&configuration=linux%20linux_aarch64_numpy2.0python3.12.____cpython" alt="variant"> + </a> + </td> + </tr><tr> + <td>linux_aarch64_numpy2.0python3.9.____cpython</td> + <td> + <a href="https://dev.azure.com/conda-forge/feedstock-builds/_build/latest?definitionId=700&branchName=main"> + <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=linux&configuration=linux%20linux_aarch64_numpy2.0python3.9.____cpython" alt="variant"> </a> </td> </tr><tr> @@ -113,24 +113,31 @@ Current build status </a> </td> </tr><tr> - <td>linux_ppc64le_numpy1.22python3.9.____cpython</td> + <td>linux_ppc64le_numpy2.0python3.10.____cpython</td> <td> <a href="https://dev.azure.com/conda-forge/feedstock-builds/_build/latest?definitionId=700&branchName=main"> - <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=linux&configuration=linux%20linux_ppc64le_numpy1.22python3.9.____cpython" alt="variant"> + <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=linux&configuration=linux%20linux_ppc64le_numpy2.0python3.10.____cpython" alt="variant"> </a> </td> </tr><tr> - <td>linux_ppc64le_numpy1.23python3.11.____cpython</td> + <td>linux_ppc64le_numpy2.0python3.11.____cpython</td> <td> <a href="https://dev.azure.com/conda-forge/feedstock-builds/_build/latest?definitionId=700&branchName=main"> - <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=linux&configuration=linux%20linux_ppc64le_numpy1.23python3.11.____cpython" alt="variant"> + <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=linux&configuration=linux%20linux_ppc64le_numpy2.0python3.11.____cpython" alt="variant"> </a> </td> </tr><tr> - <td>osx_64_numpy1.22python3.10.____cpython</td> + <td>linux_ppc64le_numpy2.0python3.12.____cpython</td> <td> <a href="https://dev.azure.com/conda-forge/feedstock-builds/_build/latest?definitionId=700&branchName=main"> - <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=osx&configuration=osx%20osx_64_numpy1.22python3.10.____cpython" alt="variant"> + <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=linux&configuration=linux%20linux_ppc64le_numpy2.0python3.12.____cpython" alt="variant"> + </a> + </td> + </tr><tr> + <td>linux_ppc64le_numpy2.0python3.9.____cpython</td> + <td> + <a href="https://dev.azure.com/conda-forge/feedstock-builds/_build/latest?definitionId=700&branchName=main"> + <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=linux&configuration=linux%20linux_ppc64le_numpy2.0python3.9.____cpython" alt="variant"> </a> </td> </tr><tr> @@ -141,24 +148,31 @@ Current build status </a> </td> </tr><tr> - <td>osx_64_numpy1.22python3.9.____cpython</td> + <td>osx_64_numpy2.0python3.10.____cpython</td> <td> <a href="https://dev.azure.com/conda-forge/feedstock-builds/_build/latest?definitionId=700&branchName=main"> - <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=osx&configuration=osx%20osx_64_numpy1.22python3.9.____cpython" alt="variant"> + <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=osx&configuration=osx%20osx_64_numpy2.0python3.10.____cpython" alt="variant"> </a> </td> </tr><tr> - <td>osx_64_numpy1.23python3.11.____cpython</td> + <td>osx_64_numpy2.0python3.11.____cpython</td> <td> <a href="https://dev.azure.com/conda-forge/feedstock-builds/_build/latest?definitionId=700&branchName=main"> - <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=osx&configuration=osx%20osx_64_numpy1.23python3.11.____cpython" alt="variant"> + <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=osx&configuration=osx%20osx_64_numpy2.0python3.11.____cpython" alt="variant"> </a> </td> </tr><tr> - <td>osx_arm64_numpy1.22python3.10.____cpython</td> + <td>osx_64_numpy2.0python3.12.____cpython</td> <td> <a href="https://dev.azure.com/conda-forge/feedstock-builds/_build/latest?definitionId=700&branchName=main"> - <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=osx&configuration=osx%20osx_arm64_numpy1.22python3.10.____cpython" alt="variant"> + <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=osx&configuration=osx%20osx_64_numpy2.0python3.12.____cpython" alt="variant"> + </a> + </td> + </tr><tr> + <td>osx_64_numpy2.0python3.9.____cpython</td> + <td> + <a href="https://dev.azure.com/conda-forge/feedstock-builds/_build/latest?definitionId=700&branchName=main"> + <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=osx&configuration=osx%20osx_64_numpy2.0python3.9.____cpython" alt="variant"> </a> </td> </tr><tr> @@ -169,24 +183,31 @@ Current build status </a> </td> </tr><tr> - <td>osx_arm64_numpy1.22python3.9.____cpython</td> + <td>osx_arm64_numpy2.0python3.10.____cpython</td> <td> <a href="https://dev.azure.com/conda-forge/feedstock-builds/_build/latest?definitionId=700&branchName=main"> - <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=osx&configuration=osx%20osx_arm64_numpy1.22python3.9.____cpython" alt="variant"> + <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=osx&configuration=osx%20osx_arm64_numpy2.0python3.10.____cpython" alt="variant"> </a> </td> </tr><tr> - <td>osx_arm64_numpy1.23python3.11.____cpython</td> + <td>osx_arm64_numpy2.0python3.11.____cpython</td> <td> <a href="https://dev.azure.com/conda-forge/feedstock-builds/_build/latest?definitionId=700&branchName=main"> - <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=osx&configuration=osx%20osx_arm64_numpy1.23python3.11.____cpython" alt="variant"> + <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=osx&configuration=osx%20osx_arm64_numpy2.0python3.11.____cpython" alt="variant"> </a> </td> </tr><tr> - <td>win_64_numpy1.22python3.10.____cpython</td> + <td>osx_arm64_numpy2.0python3.12.____cpython</td> <td> <a href="https://dev.azure.com/conda-forge/feedstock-builds/_build/latest?definitionId=700&branchName=main"> - <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=win&configuration=win%20win_64_numpy1.22python3.10.____cpython" alt="variant"> + <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=osx&configuration=osx%20osx_arm64_numpy2.0python3.12.____cpython" alt="variant"> + </a> + </td> + </tr><tr> + <td>osx_arm64_numpy2.0python3.9.____cpython</td> + <td> + <a href="https://dev.azure.com/conda-forge/feedstock-builds/_build/latest?definitionId=700&branchName=main"> + <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=osx&configuration=osx%20osx_arm64_numpy2.0python3.9.____cpython" alt="variant"> </a> </td> </tr><tr> @@ -197,17 +218,31 @@ Current build status </a> </td> </tr><tr> - <td>win_64_numpy1.22python3.9.____cpython</td> + <td>win_64_numpy2.0python3.10.____cpython</td> + <td> + <a href="https://dev.azure.com/conda-forge/feedstock-builds/_build/latest?definitionId=700&branchName=main"> + <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=win&configuration=win%20win_64_numpy2.0python3.10.____cpython" alt="variant"> + </a> + </td> + </tr><tr> + <td>win_64_numpy2.0python3.11.____cpython</td> + <td> + <a href="https://dev.azure.com/conda-forge/feedstock-builds/_build/latest?definitionId=700&branchName=main"> + <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=win&configuration=win%20win_64_numpy2.0python3.11.____cpython" alt="variant"> + </a> + </td> + </tr><tr> + <td>win_64_numpy2.0python3.12.____cpython</td> <td> <a href="https://dev.azure.com/conda-forge/feedstock-builds/_build/latest?definitionId=700&branchName=main"> - <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=win&configuration=win%20win_64_numpy1.22python3.9.____cpython" alt="variant"> + <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=win&configuration=win%20win_64_numpy2.0python3.12.____cpython" alt="variant"> </a> </td> </tr><tr> - <td>win_64_numpy1.23python3.11.____cpython</td> + <td>win_64_numpy2.0python3.9.____cpython</td> <td> <a href="https://dev.azure.com/conda-forge/feedstock-builds/_build/latest?definitionId=700&branchName=main"> - <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=win&configuration=win%20win_64_numpy1.23python3.11.____cpython" alt="variant"> + <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=win&configuration=win%20win_64_numpy2.0python3.9.____cpython" alt="variant"> </a> </td> </tr> @@ -291,7 +326,7 @@ available continuous integration services. Thanks to the awesome service provide [CircleCI](https://circleci.com/), [AppVeyor](https://www.appveyor.com/), [Drone](https://cloud.drone.io/welcome), and [TravisCI](https://travis-ci.com/) it is possible to build and upload installable packages to the -[conda-forge](https://anaconda.org/conda-forge) [Anaconda-Cloud](https://anaconda.org/) +[conda-forge](https://anaconda.org/conda-forge) [anaconda.org](https://anaconda.org/) channel for Linux, Windows and OSX respectively. To manage the continuous integration and simplify feedstock maintenance diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 6b346f5..e5306da 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -4,5 +4,5 @@ jobs: - template: ./.azure-pipelines/azure-pipelines-linux.yml - - template: ./.azure-pipelines/azure-pipelines-win.yml - - template: ./.azure-pipelines/azure-pipelines-osx.yml \ No newline at end of file + - template: ./.azure-pipelines/azure-pipelines-osx.yml + - template: ./.azure-pipelines/azure-pipelines-win.yml \ No newline at end of file diff --git a/build-locally.py b/build-locally.py index 3f4b7a7..e0d408d 100755 --- a/build-locally.py +++ b/build-locally.py @@ -64,8 +64,9 @@ def verify_config(ns): elif ns.config.startswith("osx"): if "OSX_SDK_DIR" not in os.environ: raise RuntimeError( - "Need OSX_SDK_DIR env variable set. Run 'export OSX_SDK_DIR=SDKs' " - "to download the SDK automatically to 'SDKs/MacOSX<ver>.sdk'. " + "Need OSX_SDK_DIR env variable set. Run 'export OSX_SDK_DIR=$PWD/SDKs' " + "to download the SDK automatically to '$PWD/SDKs/MacOSX<ver>.sdk'. " + "Note: OSX_SDK_DIR must be set to an absolute path. " "Setting this variable implies agreement to the licensing terms of the SDK by Apple." ) From 638f738cc132b7442a8b072b98faba762bf3ff28 Mon Sep 17 00:00:00 2001 From: Graham Markall <gmarkall@nvidia.com> Date: Tue, 28 May 2024 23:14:55 +0100 Subject: [PATCH 29/49] Bump up to 0.60.0rc1 --- recipe/conda_build_config.yaml | 2 +- recipe/llvmlite_version_check.patch | 26 -------------------------- recipe/meta.yaml | 8 +++----- 3 files changed, 4 insertions(+), 32 deletions(-) delete mode 100644 recipe/llvmlite_version_check.patch diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index 057405f..c23061b 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -1,4 +1,4 @@ channel_sources: - - conda-forge + - conda-forge/label/llvmlite_rc,conda-forge channel_targets: - conda-forge numba_rc diff --git a/recipe/llvmlite_version_check.patch b/recipe/llvmlite_version_check.patch deleted file mode 100644 index 781c590..0000000 --- a/recipe/llvmlite_version_check.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/numba/__init__.py b/numba/__init__.py -index 5e56ffe07..7d2ae72e2 100644 ---- a/numba/__init__.py -+++ b/numba/__init__.py -@@ -142,7 +142,7 @@ __all__ = """ - """.split() + types.__all__ + errors.__all__ - - --_min_llvmlite_version = (0, 43, 0) -+_min_llvmlite_version = (0, 42, 0) - _min_llvm_version = (14, 0, 0) - - def _ensure_llvm(): -diff --git a/setup.py b/setup.py -index 56c180a5e..db28e3b8f 100644 ---- a/setup.py -+++ b/setup.py -@@ -23,7 +23,7 @@ min_python_version = "3.9" - max_python_version = "3.13" # exclusive - min_numpy_build_version = "1.11" - min_numpy_run_version = "1.22" --min_llvmlite_version = "0.43.0dev0" -+min_llvmlite_version = "0.42.0dev0" - max_llvmlite_version = "0.44" - - if sys.platform.startswith('linux'): diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 2f6bed9..2d3ae64 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,16 +1,14 @@ {% set name = "numba" %} -{% set version = "0.60.0dev3" %} -{% set sha256 = "423300921c202e501b24925ecd3808e2b4692f165ee7171008e9663d1fa7bb6c" %} +{% set version = "0.60.rc1" %} +{% set sha256 = "47e9e4958c9a2226a4a1dd86a449dad95341fdef156915b29ef7d36cb58d3544" %} package: name: numba version: {{ version }} source: - url: https://github.com/gmarkall/{{ name }}/archive/refs/tags/{{ version }}.tar.gz + url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/{{ name }}-{{ version }}.tar.gz sha256: {{ sha256 }} - patches: - - llvmlite_version_check.patch build: number: 0 From ddef8bcad5da9ce180bd423ac7ac92e8074c3d67 Mon Sep 17 00:00:00 2001 From: Graham Markall <gmarkall@nvidia.com> Date: Tue, 28 May 2024 23:19:11 +0100 Subject: [PATCH 30/49] MNT: Re-rendered with conda-build 24.3.0, conda-smithy 3.36.0, and conda-forge-pinning 2024.05.28.17.08.08 --- .azure-pipelines/azure-pipelines-osx.yml | 2 +- .../linux_64_numpy1.22python3.10.____cpython.yaml | 8 +------- .../linux_64_numpy1.22python3.9.____cpython.yaml | 8 +------- .../linux_64_numpy1.23python3.11.____cpython.yaml | 8 +------- .../linux_64_numpy1.26python3.12.____cpython.yaml | 8 +------- .../linux_aarch64_numpy1.22python3.10.____cpython.yaml | 8 +------- .../linux_aarch64_numpy1.22python3.9.____cpython.yaml | 8 +------- .../linux_aarch64_numpy1.23python3.11.____cpython.yaml | 8 +------- .../linux_aarch64_numpy1.26python3.12.____cpython.yaml | 8 +------- .../linux_ppc64le_numpy1.22python3.10.____cpython.yaml | 8 +------- .../linux_ppc64le_numpy1.22python3.9.____cpython.yaml | 8 +------- .../linux_ppc64le_numpy1.23python3.11.____cpython.yaml | 8 +------- .../linux_ppc64le_numpy1.26python3.12.____cpython.yaml | 8 +------- .../osx_64_numpy1.22python3.10.____cpython.yaml | 10 ++++------ .ci_support/osx_64_numpy1.22python3.9.____cpython.yaml | 10 ++++------ .../osx_64_numpy1.23python3.11.____cpython.yaml | 10 ++++------ .../osx_64_numpy1.26python3.12.____cpython.yaml | 10 ++++------ .../osx_arm64_numpy1.22python3.10.____cpython.yaml | 8 +++----- .../osx_arm64_numpy1.22python3.9.____cpython.yaml | 8 +++----- .../osx_arm64_numpy1.23python3.11.____cpython.yaml | 8 +++----- .../osx_arm64_numpy1.26python3.12.____cpython.yaml | 8 +++----- .../win_64_numpy1.22python3.10.____cpython.yaml | 4 +--- .ci_support/win_64_numpy1.22python3.9.____cpython.yaml | 4 +--- .../win_64_numpy1.23python3.11.____cpython.yaml | 4 +--- .../win_64_numpy1.26python3.12.____cpython.yaml | 4 +--- .gitattributes | 4 ++-- 26 files changed, 47 insertions(+), 143 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index d775f84..820e715 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -5,7 +5,7 @@ jobs: - job: osx pool: - vmImage: macOS-11 + vmImage: macOS-12 strategy: matrix: osx_64_numpy1.22python3.10.____cpython: diff --git a/.ci_support/linux_64_numpy1.22python3.10.____cpython.yaml b/.ci_support/linux_64_numpy1.22python3.10.____cpython.yaml index 4a25642..3bbf88b 100644 --- a/.ci_support/linux_64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.22python3.10.____cpython.yaml @@ -2,14 +2,10 @@ c_compiler: - gcc c_compiler_version: - '12' -c_stdlib: -- sysroot -c_stdlib_version: -- '2.12' cdt_name: - cos6 channel_sources: -- conda-forge +- conda-forge/label/llvmlite_rc,conda-forge channel_targets: - conda-forge numba_rc cxx_compiler: @@ -35,8 +31,6 @@ tbb: zip_keys: - - c_compiler_version - cxx_compiler_version -- - c_stdlib_version - - cdt_name - - python - numpy - python_impl diff --git a/.ci_support/linux_64_numpy1.22python3.9.____cpython.yaml b/.ci_support/linux_64_numpy1.22python3.9.____cpython.yaml index 08da003..ddad0bd 100644 --- a/.ci_support/linux_64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.22python3.9.____cpython.yaml @@ -2,14 +2,10 @@ c_compiler: - gcc c_compiler_version: - '12' -c_stdlib: -- sysroot -c_stdlib_version: -- '2.12' cdt_name: - cos6 channel_sources: -- conda-forge +- conda-forge/label/llvmlite_rc,conda-forge channel_targets: - conda-forge numba_rc cxx_compiler: @@ -35,8 +31,6 @@ tbb: zip_keys: - - c_compiler_version - cxx_compiler_version -- - c_stdlib_version - - cdt_name - - python - numpy - python_impl diff --git a/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml index 20ec1b8..7f127c3 100644 --- a/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml @@ -2,14 +2,10 @@ c_compiler: - gcc c_compiler_version: - '12' -c_stdlib: -- sysroot -c_stdlib_version: -- '2.12' cdt_name: - cos6 channel_sources: -- conda-forge +- conda-forge/label/llvmlite_rc,conda-forge channel_targets: - conda-forge numba_rc cxx_compiler: @@ -35,8 +31,6 @@ tbb: zip_keys: - - c_compiler_version - cxx_compiler_version -- - c_stdlib_version - - cdt_name - - python - numpy - python_impl diff --git a/.ci_support/linux_64_numpy1.26python3.12.____cpython.yaml b/.ci_support/linux_64_numpy1.26python3.12.____cpython.yaml index dee1208..5356443 100644 --- a/.ci_support/linux_64_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.26python3.12.____cpython.yaml @@ -2,14 +2,10 @@ c_compiler: - gcc c_compiler_version: - '12' -c_stdlib: -- sysroot -c_stdlib_version: -- '2.12' cdt_name: - cos6 channel_sources: -- conda-forge +- conda-forge/label/llvmlite_rc,conda-forge channel_targets: - conda-forge numba_rc cxx_compiler: @@ -35,8 +31,6 @@ tbb: zip_keys: - - c_compiler_version - cxx_compiler_version -- - c_stdlib_version - - cdt_name - - python - numpy - python_impl diff --git a/.ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml index 1578bc5..9dbae19 100644 --- a/.ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml @@ -4,16 +4,12 @@ c_compiler: - gcc c_compiler_version: - '12' -c_stdlib: -- sysroot -c_stdlib_version: -- '2.17' cdt_arch: - aarch64 cdt_name: - cos7 channel_sources: -- conda-forge +- conda-forge/label/llvmlite_rc,conda-forge channel_targets: - conda-forge numba_rc cxx_compiler: @@ -39,8 +35,6 @@ tbb: zip_keys: - - c_compiler_version - cxx_compiler_version -- - c_stdlib_version - - cdt_name - - python - numpy - python_impl diff --git a/.ci_support/linux_aarch64_numpy1.22python3.9.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.22python3.9.____cpython.yaml index 71492c9..25997d8 100644 --- a/.ci_support/linux_aarch64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.22python3.9.____cpython.yaml @@ -4,16 +4,12 @@ c_compiler: - gcc c_compiler_version: - '12' -c_stdlib: -- sysroot -c_stdlib_version: -- '2.17' cdt_arch: - aarch64 cdt_name: - cos7 channel_sources: -- conda-forge +- conda-forge/label/llvmlite_rc,conda-forge channel_targets: - conda-forge numba_rc cxx_compiler: @@ -39,8 +35,6 @@ tbb: zip_keys: - - c_compiler_version - cxx_compiler_version -- - c_stdlib_version - - cdt_name - - python - numpy - python_impl diff --git a/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml index 1297a2a..d40b927 100644 --- a/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml @@ -4,16 +4,12 @@ c_compiler: - gcc c_compiler_version: - '12' -c_stdlib: -- sysroot -c_stdlib_version: -- '2.17' cdt_arch: - aarch64 cdt_name: - cos7 channel_sources: -- conda-forge +- conda-forge/label/llvmlite_rc,conda-forge channel_targets: - conda-forge numba_rc cxx_compiler: @@ -39,8 +35,6 @@ tbb: zip_keys: - - c_compiler_version - cxx_compiler_version -- - c_stdlib_version - - cdt_name - - python - numpy - python_impl diff --git a/.ci_support/linux_aarch64_numpy1.26python3.12.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.26python3.12.____cpython.yaml index 52f2d9e..00a8df8 100644 --- a/.ci_support/linux_aarch64_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.26python3.12.____cpython.yaml @@ -4,16 +4,12 @@ c_compiler: - gcc c_compiler_version: - '12' -c_stdlib: -- sysroot -c_stdlib_version: -- '2.17' cdt_arch: - aarch64 cdt_name: - cos7 channel_sources: -- conda-forge +- conda-forge/label/llvmlite_rc,conda-forge channel_targets: - conda-forge numba_rc cxx_compiler: @@ -39,8 +35,6 @@ tbb: zip_keys: - - c_compiler_version - cxx_compiler_version -- - c_stdlib_version - - cdt_name - - python - numpy - python_impl diff --git a/.ci_support/linux_ppc64le_numpy1.22python3.10.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.22python3.10.____cpython.yaml index b5b0e6a..8be7dbd 100644 --- a/.ci_support/linux_ppc64le_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.22python3.10.____cpython.yaml @@ -2,14 +2,10 @@ c_compiler: - gcc c_compiler_version: - '12' -c_stdlib: -- sysroot -c_stdlib_version: -- '2.17' cdt_name: - cos7 channel_sources: -- conda-forge +- conda-forge/label/llvmlite_rc,conda-forge channel_targets: - conda-forge numba_rc cxx_compiler: @@ -35,8 +31,6 @@ tbb: zip_keys: - - c_compiler_version - cxx_compiler_version -- - c_stdlib_version - - cdt_name - - python - numpy - python_impl diff --git a/.ci_support/linux_ppc64le_numpy1.22python3.9.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.22python3.9.____cpython.yaml index a7cc007..c2509e8 100644 --- a/.ci_support/linux_ppc64le_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.22python3.9.____cpython.yaml @@ -2,14 +2,10 @@ c_compiler: - gcc c_compiler_version: - '12' -c_stdlib: -- sysroot -c_stdlib_version: -- '2.17' cdt_name: - cos7 channel_sources: -- conda-forge +- conda-forge/label/llvmlite_rc,conda-forge channel_targets: - conda-forge numba_rc cxx_compiler: @@ -35,8 +31,6 @@ tbb: zip_keys: - - c_compiler_version - cxx_compiler_version -- - c_stdlib_version - - cdt_name - - python - numpy - python_impl diff --git a/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml index 19cceaf..3f05820 100644 --- a/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml @@ -2,14 +2,10 @@ c_compiler: - gcc c_compiler_version: - '12' -c_stdlib: -- sysroot -c_stdlib_version: -- '2.17' cdt_name: - cos7 channel_sources: -- conda-forge +- conda-forge/label/llvmlite_rc,conda-forge channel_targets: - conda-forge numba_rc cxx_compiler: @@ -35,8 +31,6 @@ tbb: zip_keys: - - c_compiler_version - cxx_compiler_version -- - c_stdlib_version - - cdt_name - - python - numpy - python_impl diff --git a/.ci_support/linux_ppc64le_numpy1.26python3.12.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.26python3.12.____cpython.yaml index 77c7c41..497ae49 100644 --- a/.ci_support/linux_ppc64le_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.26python3.12.____cpython.yaml @@ -2,14 +2,10 @@ c_compiler: - gcc c_compiler_version: - '12' -c_stdlib: -- sysroot -c_stdlib_version: -- '2.17' cdt_name: - cos7 channel_sources: -- conda-forge +- conda-forge/label/llvmlite_rc,conda-forge channel_targets: - conda-forge numba_rc cxx_compiler: @@ -35,8 +31,6 @@ tbb: zip_keys: - - c_compiler_version - cxx_compiler_version -- - c_stdlib_version - - cdt_name - - python - numpy - python_impl diff --git a/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml b/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml index dafec1e..0020afe 100644 --- a/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml @@ -1,15 +1,13 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.9' +- '10.13' +MACOSX_SDK_VERSION: +- '10.13' c_compiler: - clang c_compiler_version: - '16' -c_stdlib: -- macosx_deployment_target -c_stdlib_version: -- '10.9' channel_sources: -- conda-forge +- conda-forge/label/llvmlite_rc,conda-forge channel_targets: - conda-forge numba_rc cxx_compiler: diff --git a/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml b/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml index c8b3f68..65451cc 100644 --- a/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml @@ -1,15 +1,13 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.9' +- '10.13' +MACOSX_SDK_VERSION: +- '10.13' c_compiler: - clang c_compiler_version: - '16' -c_stdlib: -- macosx_deployment_target -c_stdlib_version: -- '10.9' channel_sources: -- conda-forge +- conda-forge/label/llvmlite_rc,conda-forge channel_targets: - conda-forge numba_rc cxx_compiler: diff --git a/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml b/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml index ff6b6e5..aa7d89b 100644 --- a/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml @@ -1,15 +1,13 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.9' +- '10.13' +MACOSX_SDK_VERSION: +- '10.13' c_compiler: - clang c_compiler_version: - '16' -c_stdlib: -- macosx_deployment_target -c_stdlib_version: -- '10.9' channel_sources: -- conda-forge +- conda-forge/label/llvmlite_rc,conda-forge channel_targets: - conda-forge numba_rc cxx_compiler: diff --git a/.ci_support/osx_64_numpy1.26python3.12.____cpython.yaml b/.ci_support/osx_64_numpy1.26python3.12.____cpython.yaml index 074a151..2af280e 100644 --- a/.ci_support/osx_64_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.26python3.12.____cpython.yaml @@ -1,15 +1,13 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.9' +- '10.13' +MACOSX_SDK_VERSION: +- '10.13' c_compiler: - clang c_compiler_version: - '16' -c_stdlib: -- macosx_deployment_target -c_stdlib_version: -- '10.9' channel_sources: -- conda-forge +- conda-forge/label/llvmlite_rc,conda-forge channel_targets: - conda-forge numba_rc cxx_compiler: diff --git a/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml index eb94344..382e55a 100644 --- a/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml @@ -1,15 +1,13 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' +MACOSX_SDK_VERSION: +- '11.0' c_compiler: - clang c_compiler_version: - '16' -c_stdlib: -- macosx_deployment_target -c_stdlib_version: -- '11.0' channel_sources: -- conda-forge +- conda-forge/label/llvmlite_rc,conda-forge channel_targets: - conda-forge numba_rc cxx_compiler: diff --git a/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml index 0264f4f..33f7d79 100644 --- a/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml @@ -1,15 +1,13 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' +MACOSX_SDK_VERSION: +- '11.0' c_compiler: - clang c_compiler_version: - '16' -c_stdlib: -- macosx_deployment_target -c_stdlib_version: -- '11.0' channel_sources: -- conda-forge +- conda-forge/label/llvmlite_rc,conda-forge channel_targets: - conda-forge numba_rc cxx_compiler: diff --git a/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml b/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml index ea99b38..4607d21 100644 --- a/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml @@ -1,15 +1,13 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' +MACOSX_SDK_VERSION: +- '11.0' c_compiler: - clang c_compiler_version: - '16' -c_stdlib: -- macosx_deployment_target -c_stdlib_version: -- '11.0' channel_sources: -- conda-forge +- conda-forge/label/llvmlite_rc,conda-forge channel_targets: - conda-forge numba_rc cxx_compiler: diff --git a/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml b/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml index 4c40e5e..0de15d9 100644 --- a/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml @@ -1,15 +1,13 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' +MACOSX_SDK_VERSION: +- '11.0' c_compiler: - clang c_compiler_version: - '16' -c_stdlib: -- macosx_deployment_target -c_stdlib_version: -- '11.0' channel_sources: -- conda-forge +- conda-forge/label/llvmlite_rc,conda-forge channel_targets: - conda-forge numba_rc cxx_compiler: diff --git a/.ci_support/win_64_numpy1.22python3.10.____cpython.yaml b/.ci_support/win_64_numpy1.22python3.10.____cpython.yaml index e102d1e..fdbdf5d 100644 --- a/.ci_support/win_64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/win_64_numpy1.22python3.10.____cpython.yaml @@ -1,9 +1,7 @@ c_compiler: - vs2019 -c_stdlib: -- vs channel_sources: -- conda-forge +- conda-forge/label/llvmlite_rc,conda-forge channel_targets: - conda-forge numba_rc cxx_compiler: diff --git a/.ci_support/win_64_numpy1.22python3.9.____cpython.yaml b/.ci_support/win_64_numpy1.22python3.9.____cpython.yaml index 64a56a1..d06456c 100644 --- a/.ci_support/win_64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/win_64_numpy1.22python3.9.____cpython.yaml @@ -1,9 +1,7 @@ c_compiler: - vs2019 -c_stdlib: -- vs channel_sources: -- conda-forge +- conda-forge/label/llvmlite_rc,conda-forge channel_targets: - conda-forge numba_rc cxx_compiler: diff --git a/.ci_support/win_64_numpy1.23python3.11.____cpython.yaml b/.ci_support/win_64_numpy1.23python3.11.____cpython.yaml index ec339fc..672b02b 100644 --- a/.ci_support/win_64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/win_64_numpy1.23python3.11.____cpython.yaml @@ -1,9 +1,7 @@ c_compiler: - vs2019 -c_stdlib: -- vs channel_sources: -- conda-forge +- conda-forge/label/llvmlite_rc,conda-forge channel_targets: - conda-forge numba_rc cxx_compiler: diff --git a/.ci_support/win_64_numpy1.26python3.12.____cpython.yaml b/.ci_support/win_64_numpy1.26python3.12.____cpython.yaml index 4fb9dc7..c42c575 100644 --- a/.ci_support/win_64_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/win_64_numpy1.26python3.12.____cpython.yaml @@ -1,9 +1,7 @@ c_compiler: - vs2019 -c_stdlib: -- vs channel_sources: -- conda-forge +- conda-forge/label/llvmlite_rc,conda-forge channel_targets: - conda-forge numba_rc cxx_compiler: diff --git a/.gitattributes b/.gitattributes index 7f32763..18f114a 100644 --- a/.gitattributes +++ b/.gitattributes @@ -20,8 +20,8 @@ bld.bat text eol=crlf .travis.yml linguist-generated=true .scripts/* linguist-generated=true .woodpecker.yml linguist-generated=true -LICENSE.txt linguist-generated=true -README.md linguist-generated=true +/LICENSE.txt linguist-generated=true +/README.md linguist-generated=true azure-pipelines.yml linguist-generated=true build-locally.py linguist-generated=true shippable.yml linguist-generated=true From 5b495d5f78afeb55a100797b3419e552f8143b0d Mon Sep 17 00:00:00 2001 From: Graham Markall <gmarkall@nvidia.com> Date: Tue, 28 May 2024 23:19:43 +0100 Subject: [PATCH 31/49] Add stdlib(c) to recipe --- recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 2d3ae64..13decbf 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -30,6 +30,7 @@ requirements: - numpy # [build_platform != target_platform] - {{ compiler('c') }} - {{ compiler('cxx') }} + - {{ stdlib('c') }} # llvm is needed for the headers - llvm-openmp # [osx] - libgomp # [linux] From 9455bb0e579f7f543ba68d35e7af3d32399fd6a8 Mon Sep 17 00:00:00 2001 From: Graham Markall <gmarkall@nvidia.com> Date: Tue, 28 May 2024 23:20:51 +0100 Subject: [PATCH 32/49] MNT: Re-rendered with conda-build 24.3.0, conda-smithy 3.36.0, and conda-forge-pinning 2024.05.28.17.08.08 --- .ci_support/linux_64_numpy1.22python3.10.____cpython.yaml | 6 ++++++ .ci_support/linux_64_numpy1.22python3.9.____cpython.yaml | 6 ++++++ .ci_support/linux_64_numpy1.23python3.11.____cpython.yaml | 6 ++++++ .ci_support/linux_64_numpy1.26python3.12.____cpython.yaml | 6 ++++++ .../linux_aarch64_numpy1.22python3.10.____cpython.yaml | 6 ++++++ .../linux_aarch64_numpy1.22python3.9.____cpython.yaml | 6 ++++++ .../linux_aarch64_numpy1.23python3.11.____cpython.yaml | 6 ++++++ .../linux_aarch64_numpy1.26python3.12.____cpython.yaml | 6 ++++++ .../linux_ppc64le_numpy1.22python3.10.____cpython.yaml | 6 ++++++ .../linux_ppc64le_numpy1.22python3.9.____cpython.yaml | 6 ++++++ .../linux_ppc64le_numpy1.23python3.11.____cpython.yaml | 6 ++++++ .../linux_ppc64le_numpy1.26python3.12.____cpython.yaml | 6 ++++++ .ci_support/osx_64_numpy1.22python3.10.____cpython.yaml | 4 ++++ .ci_support/osx_64_numpy1.22python3.9.____cpython.yaml | 4 ++++ .ci_support/osx_64_numpy1.23python3.11.____cpython.yaml | 4 ++++ .ci_support/osx_64_numpy1.26python3.12.____cpython.yaml | 4 ++++ .ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml | 4 ++++ .ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml | 4 ++++ .ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml | 4 ++++ .ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml | 4 ++++ .ci_support/win_64_numpy1.22python3.10.____cpython.yaml | 2 ++ .ci_support/win_64_numpy1.22python3.9.____cpython.yaml | 2 ++ .ci_support/win_64_numpy1.23python3.11.____cpython.yaml | 2 ++ .ci_support/win_64_numpy1.26python3.12.____cpython.yaml | 2 ++ 24 files changed, 112 insertions(+) diff --git a/.ci_support/linux_64_numpy1.22python3.10.____cpython.yaml b/.ci_support/linux_64_numpy1.22python3.10.____cpython.yaml index 3bbf88b..67f1367 100644 --- a/.ci_support/linux_64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.22python3.10.____cpython.yaml @@ -2,6 +2,10 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.12' cdt_name: - cos6 channel_sources: @@ -31,6 +35,8 @@ tbb: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - numpy - python_impl diff --git a/.ci_support/linux_64_numpy1.22python3.9.____cpython.yaml b/.ci_support/linux_64_numpy1.22python3.9.____cpython.yaml index ddad0bd..ef9dccc 100644 --- a/.ci_support/linux_64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.22python3.9.____cpython.yaml @@ -2,6 +2,10 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.12' cdt_name: - cos6 channel_sources: @@ -31,6 +35,8 @@ tbb: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - numpy - python_impl diff --git a/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml index 7f127c3..29e1a34 100644 --- a/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml @@ -2,6 +2,10 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.12' cdt_name: - cos6 channel_sources: @@ -31,6 +35,8 @@ tbb: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - numpy - python_impl diff --git a/.ci_support/linux_64_numpy1.26python3.12.____cpython.yaml b/.ci_support/linux_64_numpy1.26python3.12.____cpython.yaml index 5356443..43ab489 100644 --- a/.ci_support/linux_64_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.26python3.12.____cpython.yaml @@ -2,6 +2,10 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.12' cdt_name: - cos6 channel_sources: @@ -31,6 +35,8 @@ tbb: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - numpy - python_impl diff --git a/.ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml index 9dbae19..601d56a 100644 --- a/.ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml @@ -4,6 +4,10 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_arch: - aarch64 cdt_name: @@ -35,6 +39,8 @@ tbb: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - numpy - python_impl diff --git a/.ci_support/linux_aarch64_numpy1.22python3.9.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.22python3.9.____cpython.yaml index 25997d8..00dac38 100644 --- a/.ci_support/linux_aarch64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.22python3.9.____cpython.yaml @@ -4,6 +4,10 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_arch: - aarch64 cdt_name: @@ -35,6 +39,8 @@ tbb: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - numpy - python_impl diff --git a/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml index d40b927..eee78e9 100644 --- a/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml @@ -4,6 +4,10 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_arch: - aarch64 cdt_name: @@ -35,6 +39,8 @@ tbb: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - numpy - python_impl diff --git a/.ci_support/linux_aarch64_numpy1.26python3.12.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.26python3.12.____cpython.yaml index 00a8df8..a3f720b 100644 --- a/.ci_support/linux_aarch64_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.26python3.12.____cpython.yaml @@ -4,6 +4,10 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_arch: - aarch64 cdt_name: @@ -35,6 +39,8 @@ tbb: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - numpy - python_impl diff --git a/.ci_support/linux_ppc64le_numpy1.22python3.10.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.22python3.10.____cpython.yaml index 8be7dbd..3698312 100644 --- a/.ci_support/linux_ppc64le_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.22python3.10.____cpython.yaml @@ -2,6 +2,10 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: @@ -31,6 +35,8 @@ tbb: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - numpy - python_impl diff --git a/.ci_support/linux_ppc64le_numpy1.22python3.9.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.22python3.9.____cpython.yaml index c2509e8..ff6b17a 100644 --- a/.ci_support/linux_ppc64le_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.22python3.9.____cpython.yaml @@ -2,6 +2,10 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: @@ -31,6 +35,8 @@ tbb: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - numpy - python_impl diff --git a/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml index 3f05820..d378fa9 100644 --- a/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml @@ -2,6 +2,10 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: @@ -31,6 +35,8 @@ tbb: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - numpy - python_impl diff --git a/.ci_support/linux_ppc64le_numpy1.26python3.12.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.26python3.12.____cpython.yaml index 497ae49..24b84c3 100644 --- a/.ci_support/linux_ppc64le_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.26python3.12.____cpython.yaml @@ -2,6 +2,10 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: @@ -31,6 +35,8 @@ tbb: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - numpy - python_impl diff --git a/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml b/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml index 0020afe..8ac74a1 100644 --- a/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml @@ -6,6 +6,10 @@ c_compiler: - clang c_compiler_version: - '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.13' channel_sources: - conda-forge/label/llvmlite_rc,conda-forge channel_targets: diff --git a/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml b/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml index 65451cc..d4e89f0 100644 --- a/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml @@ -6,6 +6,10 @@ c_compiler: - clang c_compiler_version: - '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.13' channel_sources: - conda-forge/label/llvmlite_rc,conda-forge channel_targets: diff --git a/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml b/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml index aa7d89b..a8635c3 100644 --- a/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml @@ -6,6 +6,10 @@ c_compiler: - clang c_compiler_version: - '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.13' channel_sources: - conda-forge/label/llvmlite_rc,conda-forge channel_targets: diff --git a/.ci_support/osx_64_numpy1.26python3.12.____cpython.yaml b/.ci_support/osx_64_numpy1.26python3.12.____cpython.yaml index 2af280e..7eb2029 100644 --- a/.ci_support/osx_64_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.26python3.12.____cpython.yaml @@ -6,6 +6,10 @@ c_compiler: - clang c_compiler_version: - '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.13' channel_sources: - conda-forge/label/llvmlite_rc,conda-forge channel_targets: diff --git a/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml index 382e55a..e061ec6 100644 --- a/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml @@ -6,6 +6,10 @@ c_compiler: - clang c_compiler_version: - '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '11.0' channel_sources: - conda-forge/label/llvmlite_rc,conda-forge channel_targets: diff --git a/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml index 33f7d79..6d22906 100644 --- a/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml @@ -6,6 +6,10 @@ c_compiler: - clang c_compiler_version: - '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '11.0' channel_sources: - conda-forge/label/llvmlite_rc,conda-forge channel_targets: diff --git a/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml b/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml index 4607d21..9deb063 100644 --- a/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml @@ -6,6 +6,10 @@ c_compiler: - clang c_compiler_version: - '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '11.0' channel_sources: - conda-forge/label/llvmlite_rc,conda-forge channel_targets: diff --git a/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml b/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml index 0de15d9..3724f21 100644 --- a/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml @@ -6,6 +6,10 @@ c_compiler: - clang c_compiler_version: - '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '11.0' channel_sources: - conda-forge/label/llvmlite_rc,conda-forge channel_targets: diff --git a/.ci_support/win_64_numpy1.22python3.10.____cpython.yaml b/.ci_support/win_64_numpy1.22python3.10.____cpython.yaml index fdbdf5d..4d6c005 100644 --- a/.ci_support/win_64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/win_64_numpy1.22python3.10.____cpython.yaml @@ -1,5 +1,7 @@ c_compiler: - vs2019 +c_stdlib: +- vs channel_sources: - conda-forge/label/llvmlite_rc,conda-forge channel_targets: diff --git a/.ci_support/win_64_numpy1.22python3.9.____cpython.yaml b/.ci_support/win_64_numpy1.22python3.9.____cpython.yaml index d06456c..fb68031 100644 --- a/.ci_support/win_64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/win_64_numpy1.22python3.9.____cpython.yaml @@ -1,5 +1,7 @@ c_compiler: - vs2019 +c_stdlib: +- vs channel_sources: - conda-forge/label/llvmlite_rc,conda-forge channel_targets: diff --git a/.ci_support/win_64_numpy1.23python3.11.____cpython.yaml b/.ci_support/win_64_numpy1.23python3.11.____cpython.yaml index 672b02b..6545de2 100644 --- a/.ci_support/win_64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/win_64_numpy1.23python3.11.____cpython.yaml @@ -1,5 +1,7 @@ c_compiler: - vs2019 +c_stdlib: +- vs channel_sources: - conda-forge/label/llvmlite_rc,conda-forge channel_targets: diff --git a/.ci_support/win_64_numpy1.26python3.12.____cpython.yaml b/.ci_support/win_64_numpy1.26python3.12.____cpython.yaml index c42c575..3fd4daf 100644 --- a/.ci_support/win_64_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/win_64_numpy1.26python3.12.____cpython.yaml @@ -1,5 +1,7 @@ c_compiler: - vs2019 +c_stdlib: +- vs channel_sources: - conda-forge/label/llvmlite_rc,conda-forge channel_targets: From 8db37867e6d41b58dc1afe4f9e11cfeb4d2b75b8 Mon Sep 17 00:00:00 2001 From: Graham Markall <gmarkall@nvidia.com> Date: Wed, 29 May 2024 12:03:19 +0100 Subject: [PATCH 33/49] Correct version number --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 13decbf..6754ccb 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,5 +1,5 @@ {% set name = "numba" %} -{% set version = "0.60.rc1" %} +{% set version = "0.60.0rc1" %} {% set sha256 = "47e9e4958c9a2226a4a1dd86a449dad95341fdef156915b29ef7d36cb58d3544" %} package: From 570c5bd16de7f8b0ec2643fdce782401abd44d18 Mon Sep 17 00:00:00 2001 From: Graham Markall <gmarkall@nvidia.com> Date: Wed, 29 May 2024 12:13:06 +0100 Subject: [PATCH 34/49] Require NumPy 2 to build --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 6754ccb..3f02c97 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -27,7 +27,7 @@ requirements: build: - python # [build_platform != target_platform] - cross-python_{{ target_platform }} # [build_platform != target_platform] - - numpy # [build_platform != target_platform] + - numpy >=2.0.0rc2 # [build_platform != target_platform] - {{ compiler('c') }} - {{ compiler('cxx') }} - {{ stdlib('c') }} From 6fe201982bd2536b3d3445a639d22623adf583c3 Mon Sep 17 00:00:00 2001 From: Graham Markall <gmarkall@nvidia.com> Date: Wed, 29 May 2024 12:22:41 +0100 Subject: [PATCH 35/49] Allow NumPy <2.1 for run export --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 3f02c97..109ae3e 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -61,7 +61,7 @@ requirements: # NumPy has a hard upper limit. # Also NumPy 1.22.0, 1.22.1, 1.22.2 are all broken for ufuncs # xref: https://github.com/numba/numba/issues/7756 - - numpy >=1.22.3,<1.27 + - numpy >=1.22.3,<2.1 # CUDA Python 11.6 or later - cuda-python >=11.6 From fb24c5327608aa16f46ee48e13dd005310c5ab49 Mon Sep 17 00:00:00 2001 From: Graham Markall <gmarkall@nvidia.com> Date: Wed, 29 May 2024 12:34:18 +0100 Subject: [PATCH 36/49] Add NumPy 2 migration --- .ci_support/migrations/numpy2.yaml | 72 ++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) create mode 100644 .ci_support/migrations/numpy2.yaml diff --git a/.ci_support/migrations/numpy2.yaml b/.ci_support/migrations/numpy2.yaml new file mode 100644 index 0000000..d19357f --- /dev/null +++ b/.ci_support/migrations/numpy2.yaml @@ -0,0 +1,72 @@ +__migrator: + build_number: 1 + kind: version + commit_message: | + Rebuild for numpy 2.0 + + TL;DR: The way we build against numpy has changed as of numpy 2.0. This bot + PR has updated the recipe to account for the changes (see below for details). + The numpy 2.0 package itself is currently only available from a special release + channel (`conda-forge/label/numpy_rc`) and will not be available on the main + `conda-forge` channel until the release of numpy 2.0 GA. + + The biggest change is that we no longer need to use the oldest available numpy + version at build time in order to support old numpy version at runtime - numpy + will by default use a compatible ABI for the oldest still-supported numpy versions. + + Additionally, we no longer need to use `{{ pin_compatible("numpy") }}` as a + run requirement - this has been handled for more than two years now by a + run-export on the numpy package itself. The migrator will therefore remove + any occurrences of this. + + However, by default, building against numpy 2.0 will assume that the package + is compatible with numpy 2.0, which is not necessarily the case. You should + check that the upstream package explicitly supports numpy 2.0, otherwise you + need to add a `- numpy <2` run requirement until that happens (check numpy + issue 26191 for an overview of the most important packages). + + Note that the numpy release candidate promises to be ABI-compatible with the + final 2.0 release. This means that building against 2.0.0rc1 produces packages + that can be published to our main channels. + + If you already want to use the numpy 2.0 release candidate yourself, you can do + ``` + conda config --add channels conda-forge/label/numpy_rc + ``` + or add this channel to your `.condarc` file directly. + + ### To-Dos: + * [ ] Match run-requirements for numpy (i.e. check upstream `pyproject.toml` or however the project specifies numpy compatibility) + * If upstream is not yet compatible with numpy 2.0, add `numpy <2` upper bound under `run:`. + * If upstream is already compatible with numpy 2.0, nothing else should be necessary in most cases. + * If upstream requires a minimum numpy version newer than 1.19, you can add `numpy >=x.y` under `run:`. + * [ ] Remove any remaining occurrences of `{{ pin_compatible("numpy") }}` that the bot may have missed. + + PS. If the build does not compile anymore, this is almost certainly a sign that + the upstream project is not yet ready for numpy 2.0; do not close this PR until + a version compatible with numpy 2.0 has been released upstream and on this + feedstock (in the meantime, you can keep the bot from reopening this PR in + case of git conflicts by marking it as a draft). + + migration_number: 1 + exclude: + # needs local overrides that get stomped on by the migrator, which then fails + - scipy + ordering: + # prefer channels including numpy_rc (otherwise smithy doesn't + # know which of the two values should be taken on merge) + channel_sources: + - conda-forge + - conda-forge/label/numpy_rc,conda-forge + +# needs to match length of zip {python, python_impl, numpy} +# as it is in global CBC in order to override it +numpy: + - 1.22 # no py38 support for numpy 2.0 + - 2.0 + - 2.0 + - 2.0 + - 2.0 +channel_sources: + - conda-forge/label/numpy_rc,conda-forge +migrator_ts: 1713572489.295986 From 2115be703d2cd4d6c398e9e0ed38ad57fb8c8f29 Mon Sep 17 00:00:00 2001 From: Graham Markall <gmarkall@nvidia.com> Date: Wed, 29 May 2024 12:39:24 +0100 Subject: [PATCH 37/49] MNT: Re-rendered with conda-build 24.5.0, conda-smithy 3.36.1, and conda-forge-pinning 2024.05.28.17.08.08 --- .azure-pipelines/azure-pipelines-linux.yml | 16 ++-- .azure-pipelines/azure-pipelines-osx.yml | 32 +++---- .azure-pipelines/azure-pipelines-win.yml | 16 ++-- ...ux_64_numpy2.0python3.10.____cpython.yaml} | 4 +- ...ux_64_numpy2.0python3.11.____cpython.yaml} | 4 +- ...ux_64_numpy2.0python3.12.____cpython.yaml} | 4 +- ...nux_64_numpy2.0python3.9.____cpython.yaml} | 4 +- ...rch64_numpy2.0python3.10.____cpython.yaml} | 4 +- ...rch64_numpy2.0python3.11.____cpython.yaml} | 4 +- ...rch64_numpy2.0python3.12.____cpython.yaml} | 4 +- ...arch64_numpy2.0python3.9.____cpython.yaml} | 4 +- ...c64le_numpy2.0python3.10.____cpython.yaml} | 4 +- ...c64le_numpy2.0python3.11.____cpython.yaml} | 4 +- ...c64le_numpy2.0python3.12.____cpython.yaml} | 4 +- ...pc64le_numpy2.0python3.9.____cpython.yaml} | 4 +- ...sx_64_numpy2.0python3.10.____cpython.yaml} | 4 +- ...sx_64_numpy2.0python3.11.____cpython.yaml} | 4 +- ...sx_64_numpy2.0python3.12.____cpython.yaml} | 4 +- ...osx_64_numpy2.0python3.9.____cpython.yaml} | 4 +- ...arm64_numpy2.0python3.10.____cpython.yaml} | 4 +- ...arm64_numpy2.0python3.11.____cpython.yaml} | 4 +- ...arm64_numpy2.0python3.12.____cpython.yaml} | 4 +- ..._arm64_numpy2.0python3.9.____cpython.yaml} | 4 +- ...in_64_numpy2.0python3.10.____cpython.yaml} | 4 +- ...in_64_numpy2.0python3.11.____cpython.yaml} | 4 +- ...in_64_numpy2.0python3.12.____cpython.yaml} | 4 +- ...win_64_numpy2.0python3.9.____cpython.yaml} | 4 +- .travis.yml | 20 ++-- README.md | 96 +++++++++---------- 29 files changed, 138 insertions(+), 138 deletions(-) rename .ci_support/{linux_64_numpy1.22python3.10.____cpython.yaml => linux_64_numpy2.0python3.10.____cpython.yaml} (91%) rename .ci_support/{linux_64_numpy1.23python3.11.____cpython.yaml => linux_64_numpy2.0python3.11.____cpython.yaml} (91%) rename .ci_support/{linux_64_numpy1.26python3.12.____cpython.yaml => linux_64_numpy2.0python3.12.____cpython.yaml} (91%) rename .ci_support/{linux_64_numpy1.22python3.9.____cpython.yaml => linux_64_numpy2.0python3.9.____cpython.yaml} (91%) rename .ci_support/{linux_aarch64_numpy1.22python3.10.____cpython.yaml => linux_aarch64_numpy2.0python3.10.____cpython.yaml} (92%) rename .ci_support/{linux_aarch64_numpy1.23python3.11.____cpython.yaml => linux_aarch64_numpy2.0python3.11.____cpython.yaml} (92%) rename .ci_support/{linux_aarch64_numpy1.26python3.12.____cpython.yaml => linux_aarch64_numpy2.0python3.12.____cpython.yaml} (92%) rename .ci_support/{linux_aarch64_numpy1.22python3.9.____cpython.yaml => linux_aarch64_numpy2.0python3.9.____cpython.yaml} (92%) rename .ci_support/{linux_ppc64le_numpy1.22python3.10.____cpython.yaml => linux_ppc64le_numpy2.0python3.10.____cpython.yaml} (91%) rename .ci_support/{linux_ppc64le_numpy1.23python3.11.____cpython.yaml => linux_ppc64le_numpy2.0python3.11.____cpython.yaml} (91%) rename .ci_support/{linux_ppc64le_numpy1.26python3.12.____cpython.yaml => linux_ppc64le_numpy2.0python3.12.____cpython.yaml} (91%) rename .ci_support/{linux_ppc64le_numpy1.22python3.9.____cpython.yaml => linux_ppc64le_numpy2.0python3.9.____cpython.yaml} (91%) rename .ci_support/{osx_64_numpy1.22python3.10.____cpython.yaml => osx_64_numpy2.0python3.10.____cpython.yaml} (91%) rename .ci_support/{osx_64_numpy1.23python3.11.____cpython.yaml => osx_64_numpy2.0python3.11.____cpython.yaml} (91%) rename .ci_support/{osx_64_numpy1.26python3.12.____cpython.yaml => osx_64_numpy2.0python3.12.____cpython.yaml} (91%) rename .ci_support/{osx_64_numpy1.22python3.9.____cpython.yaml => osx_64_numpy2.0python3.9.____cpython.yaml} (91%) rename .ci_support/{osx_arm64_numpy1.22python3.10.____cpython.yaml => osx_arm64_numpy2.0python3.10.____cpython.yaml} (91%) rename .ci_support/{osx_arm64_numpy1.23python3.11.____cpython.yaml => osx_arm64_numpy2.0python3.11.____cpython.yaml} (91%) rename .ci_support/{osx_arm64_numpy1.26python3.12.____cpython.yaml => osx_arm64_numpy2.0python3.12.____cpython.yaml} (91%) rename .ci_support/{osx_arm64_numpy1.22python3.9.____cpython.yaml => osx_arm64_numpy2.0python3.9.____cpython.yaml} (91%) rename .ci_support/{win_64_numpy1.22python3.10.____cpython.yaml => win_64_numpy2.0python3.10.____cpython.yaml} (85%) rename .ci_support/{win_64_numpy1.23python3.11.____cpython.yaml => win_64_numpy2.0python3.11.____cpython.yaml} (85%) rename .ci_support/{win_64_numpy1.26python3.12.____cpython.yaml => win_64_numpy2.0python3.12.____cpython.yaml} (85%) rename .ci_support/{win_64_numpy1.22python3.9.____cpython.yaml => win_64_numpy2.0python3.9.____cpython.yaml} (85%) diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index a9ee22f..c407be9 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,20 +8,20 @@ jobs: vmImage: ubuntu-latest strategy: matrix: - linux_64_numpy1.22python3.10.____cpython: - CONFIG: linux_64_numpy1.22python3.10.____cpython + linux_64_numpy2.0python3.10.____cpython: + CONFIG: linux_64_numpy2.0python3.10.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_numpy1.22python3.9.____cpython: - CONFIG: linux_64_numpy1.22python3.9.____cpython + linux_64_numpy2.0python3.11.____cpython: + CONFIG: linux_64_numpy2.0python3.11.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_numpy1.23python3.11.____cpython: - CONFIG: linux_64_numpy1.23python3.11.____cpython + linux_64_numpy2.0python3.12.____cpython: + CONFIG: linux_64_numpy2.0python3.12.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_numpy1.26python3.12.____cpython: - CONFIG: linux_64_numpy1.26python3.12.____cpython + linux_64_numpy2.0python3.9.____cpython: + CONFIG: linux_64_numpy2.0python3.9.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 timeoutInMinutes: 360 diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 820e715..8b4aef2 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -8,29 +8,29 @@ jobs: vmImage: macOS-12 strategy: matrix: - osx_64_numpy1.22python3.10.____cpython: - CONFIG: osx_64_numpy1.22python3.10.____cpython + osx_64_numpy2.0python3.10.____cpython: + CONFIG: osx_64_numpy2.0python3.10.____cpython UPLOAD_PACKAGES: 'True' - osx_64_numpy1.22python3.9.____cpython: - CONFIG: osx_64_numpy1.22python3.9.____cpython + osx_64_numpy2.0python3.11.____cpython: + CONFIG: osx_64_numpy2.0python3.11.____cpython UPLOAD_PACKAGES: 'True' - osx_64_numpy1.23python3.11.____cpython: - CONFIG: osx_64_numpy1.23python3.11.____cpython + osx_64_numpy2.0python3.12.____cpython: + CONFIG: osx_64_numpy2.0python3.12.____cpython UPLOAD_PACKAGES: 'True' - osx_64_numpy1.26python3.12.____cpython: - CONFIG: osx_64_numpy1.26python3.12.____cpython + osx_64_numpy2.0python3.9.____cpython: + CONFIG: osx_64_numpy2.0python3.9.____cpython UPLOAD_PACKAGES: 'True' - osx_arm64_numpy1.22python3.10.____cpython: - CONFIG: osx_arm64_numpy1.22python3.10.____cpython + osx_arm64_numpy2.0python3.10.____cpython: + CONFIG: osx_arm64_numpy2.0python3.10.____cpython UPLOAD_PACKAGES: 'True' - osx_arm64_numpy1.22python3.9.____cpython: - CONFIG: osx_arm64_numpy1.22python3.9.____cpython + osx_arm64_numpy2.0python3.11.____cpython: + CONFIG: osx_arm64_numpy2.0python3.11.____cpython UPLOAD_PACKAGES: 'True' - osx_arm64_numpy1.23python3.11.____cpython: - CONFIG: osx_arm64_numpy1.23python3.11.____cpython + osx_arm64_numpy2.0python3.12.____cpython: + CONFIG: osx_arm64_numpy2.0python3.12.____cpython UPLOAD_PACKAGES: 'True' - osx_arm64_numpy1.26python3.12.____cpython: - CONFIG: osx_arm64_numpy1.26python3.12.____cpython + osx_arm64_numpy2.0python3.9.____cpython: + CONFIG: osx_arm64_numpy2.0python3.9.____cpython UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 variables: {} diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 5d7e6ac..fc0af29 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -8,17 +8,17 @@ jobs: vmImage: windows-2022 strategy: matrix: - win_64_numpy1.22python3.10.____cpython: - CONFIG: win_64_numpy1.22python3.10.____cpython + win_64_numpy2.0python3.10.____cpython: + CONFIG: win_64_numpy2.0python3.10.____cpython UPLOAD_PACKAGES: 'True' - win_64_numpy1.22python3.9.____cpython: - CONFIG: win_64_numpy1.22python3.9.____cpython + win_64_numpy2.0python3.11.____cpython: + CONFIG: win_64_numpy2.0python3.11.____cpython UPLOAD_PACKAGES: 'True' - win_64_numpy1.23python3.11.____cpython: - CONFIG: win_64_numpy1.23python3.11.____cpython + win_64_numpy2.0python3.12.____cpython: + CONFIG: win_64_numpy2.0python3.12.____cpython UPLOAD_PACKAGES: 'True' - win_64_numpy1.26python3.12.____cpython: - CONFIG: win_64_numpy1.26python3.12.____cpython + win_64_numpy2.0python3.9.____cpython: + CONFIG: win_64_numpy2.0python3.9.____cpython UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 variables: diff --git a/.ci_support/linux_64_numpy1.22python3.10.____cpython.yaml b/.ci_support/linux_64_numpy2.0python3.10.____cpython.yaml similarity index 91% rename from .ci_support/linux_64_numpy1.22python3.10.____cpython.yaml rename to .ci_support/linux_64_numpy2.0python3.10.____cpython.yaml index 67f1367..6180d87 100644 --- a/.ci_support/linux_64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/linux_64_numpy2.0python3.10.____cpython.yaml @@ -9,7 +9,7 @@ c_stdlib_version: cdt_name: - cos6 channel_sources: -- conda-forge/label/llvmlite_rc,conda-forge +- conda-forge/label/numpy_rc,conda-forge channel_targets: - conda-forge numba_rc cxx_compiler: @@ -19,7 +19,7 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 numpy: -- '1.22' +- '2.0' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_64_numpy2.0python3.11.____cpython.yaml similarity index 91% rename from .ci_support/linux_64_numpy1.23python3.11.____cpython.yaml rename to .ci_support/linux_64_numpy2.0python3.11.____cpython.yaml index 29e1a34..c58b215 100644 --- a/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_64_numpy2.0python3.11.____cpython.yaml @@ -9,7 +9,7 @@ c_stdlib_version: cdt_name: - cos6 channel_sources: -- conda-forge/label/llvmlite_rc,conda-forge +- conda-forge/label/numpy_rc,conda-forge channel_targets: - conda-forge numba_rc cxx_compiler: @@ -19,7 +19,7 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 numpy: -- '1.23' +- '2.0' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/linux_64_numpy1.26python3.12.____cpython.yaml b/.ci_support/linux_64_numpy2.0python3.12.____cpython.yaml similarity index 91% rename from .ci_support/linux_64_numpy1.26python3.12.____cpython.yaml rename to .ci_support/linux_64_numpy2.0python3.12.____cpython.yaml index 43ab489..57fc316 100644 --- a/.ci_support/linux_64_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/linux_64_numpy2.0python3.12.____cpython.yaml @@ -9,7 +9,7 @@ c_stdlib_version: cdt_name: - cos6 channel_sources: -- conda-forge/label/llvmlite_rc,conda-forge +- conda-forge/label/numpy_rc,conda-forge channel_targets: - conda-forge numba_rc cxx_compiler: @@ -19,7 +19,7 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 numpy: -- '1.26' +- '2.0' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/linux_64_numpy1.22python3.9.____cpython.yaml b/.ci_support/linux_64_numpy2.0python3.9.____cpython.yaml similarity index 91% rename from .ci_support/linux_64_numpy1.22python3.9.____cpython.yaml rename to .ci_support/linux_64_numpy2.0python3.9.____cpython.yaml index ef9dccc..5e369e4 100644 --- a/.ci_support/linux_64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/linux_64_numpy2.0python3.9.____cpython.yaml @@ -9,7 +9,7 @@ c_stdlib_version: cdt_name: - cos6 channel_sources: -- conda-forge/label/llvmlite_rc,conda-forge +- conda-forge/label/numpy_rc,conda-forge channel_targets: - conda-forge numba_rc cxx_compiler: @@ -19,7 +19,7 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 numpy: -- '1.22' +- '2.0' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml b/.ci_support/linux_aarch64_numpy2.0python3.10.____cpython.yaml similarity index 92% rename from .ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml rename to .ci_support/linux_aarch64_numpy2.0python3.10.____cpython.yaml index 601d56a..76c1847 100644 --- a/.ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy2.0python3.10.____cpython.yaml @@ -13,7 +13,7 @@ cdt_arch: cdt_name: - cos7 channel_sources: -- conda-forge/label/llvmlite_rc,conda-forge +- conda-forge/label/numpy_rc,conda-forge channel_targets: - conda-forge numba_rc cxx_compiler: @@ -23,7 +23,7 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-aarch64 numpy: -- '1.22' +- '2.0' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_aarch64_numpy2.0python3.11.____cpython.yaml similarity index 92% rename from .ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml rename to .ci_support/linux_aarch64_numpy2.0python3.11.____cpython.yaml index eee78e9..f9b6bcb 100644 --- a/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy2.0python3.11.____cpython.yaml @@ -13,7 +13,7 @@ cdt_arch: cdt_name: - cos7 channel_sources: -- conda-forge/label/llvmlite_rc,conda-forge +- conda-forge/label/numpy_rc,conda-forge channel_targets: - conda-forge numba_rc cxx_compiler: @@ -23,7 +23,7 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-aarch64 numpy: -- '1.23' +- '2.0' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/linux_aarch64_numpy1.26python3.12.____cpython.yaml b/.ci_support/linux_aarch64_numpy2.0python3.12.____cpython.yaml similarity index 92% rename from .ci_support/linux_aarch64_numpy1.26python3.12.____cpython.yaml rename to .ci_support/linux_aarch64_numpy2.0python3.12.____cpython.yaml index a3f720b..5f3d2ca 100644 --- a/.ci_support/linux_aarch64_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy2.0python3.12.____cpython.yaml @@ -13,7 +13,7 @@ cdt_arch: cdt_name: - cos7 channel_sources: -- conda-forge/label/llvmlite_rc,conda-forge +- conda-forge/label/numpy_rc,conda-forge channel_targets: - conda-forge numba_rc cxx_compiler: @@ -23,7 +23,7 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-aarch64 numpy: -- '1.26' +- '2.0' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/linux_aarch64_numpy1.22python3.9.____cpython.yaml b/.ci_support/linux_aarch64_numpy2.0python3.9.____cpython.yaml similarity index 92% rename from .ci_support/linux_aarch64_numpy1.22python3.9.____cpython.yaml rename to .ci_support/linux_aarch64_numpy2.0python3.9.____cpython.yaml index 00dac38..546f6fa 100644 --- a/.ci_support/linux_aarch64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy2.0python3.9.____cpython.yaml @@ -13,7 +13,7 @@ cdt_arch: cdt_name: - cos7 channel_sources: -- conda-forge/label/llvmlite_rc,conda-forge +- conda-forge/label/numpy_rc,conda-forge channel_targets: - conda-forge numba_rc cxx_compiler: @@ -23,7 +23,7 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-aarch64 numpy: -- '1.22' +- '2.0' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/linux_ppc64le_numpy1.22python3.10.____cpython.yaml b/.ci_support/linux_ppc64le_numpy2.0python3.10.____cpython.yaml similarity index 91% rename from .ci_support/linux_ppc64le_numpy1.22python3.10.____cpython.yaml rename to .ci_support/linux_ppc64le_numpy2.0python3.10.____cpython.yaml index 3698312..78cbe8e 100644 --- a/.ci_support/linux_ppc64le_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy2.0python3.10.____cpython.yaml @@ -9,7 +9,7 @@ c_stdlib_version: cdt_name: - cos7 channel_sources: -- conda-forge/label/llvmlite_rc,conda-forge +- conda-forge/label/numpy_rc,conda-forge channel_targets: - conda-forge numba_rc cxx_compiler: @@ -19,7 +19,7 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-ppc64le numpy: -- '1.22' +- '2.0' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_ppc64le_numpy2.0python3.11.____cpython.yaml similarity index 91% rename from .ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml rename to .ci_support/linux_ppc64le_numpy2.0python3.11.____cpython.yaml index d378fa9..f1bb6cc 100644 --- a/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy2.0python3.11.____cpython.yaml @@ -9,7 +9,7 @@ c_stdlib_version: cdt_name: - cos7 channel_sources: -- conda-forge/label/llvmlite_rc,conda-forge +- conda-forge/label/numpy_rc,conda-forge channel_targets: - conda-forge numba_rc cxx_compiler: @@ -19,7 +19,7 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-ppc64le numpy: -- '1.23' +- '2.0' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/linux_ppc64le_numpy1.26python3.12.____cpython.yaml b/.ci_support/linux_ppc64le_numpy2.0python3.12.____cpython.yaml similarity index 91% rename from .ci_support/linux_ppc64le_numpy1.26python3.12.____cpython.yaml rename to .ci_support/linux_ppc64le_numpy2.0python3.12.____cpython.yaml index 24b84c3..f076b76 100644 --- a/.ci_support/linux_ppc64le_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy2.0python3.12.____cpython.yaml @@ -9,7 +9,7 @@ c_stdlib_version: cdt_name: - cos7 channel_sources: -- conda-forge/label/llvmlite_rc,conda-forge +- conda-forge/label/numpy_rc,conda-forge channel_targets: - conda-forge numba_rc cxx_compiler: @@ -19,7 +19,7 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-ppc64le numpy: -- '1.26' +- '2.0' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/linux_ppc64le_numpy1.22python3.9.____cpython.yaml b/.ci_support/linux_ppc64le_numpy2.0python3.9.____cpython.yaml similarity index 91% rename from .ci_support/linux_ppc64le_numpy1.22python3.9.____cpython.yaml rename to .ci_support/linux_ppc64le_numpy2.0python3.9.____cpython.yaml index ff6b17a..60cd63a 100644 --- a/.ci_support/linux_ppc64le_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy2.0python3.9.____cpython.yaml @@ -9,7 +9,7 @@ c_stdlib_version: cdt_name: - cos7 channel_sources: -- conda-forge/label/llvmlite_rc,conda-forge +- conda-forge/label/numpy_rc,conda-forge channel_targets: - conda-forge numba_rc cxx_compiler: @@ -19,7 +19,7 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-ppc64le numpy: -- '1.22' +- '2.0' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml b/.ci_support/osx_64_numpy2.0python3.10.____cpython.yaml similarity index 91% rename from .ci_support/osx_64_numpy1.22python3.10.____cpython.yaml rename to .ci_support/osx_64_numpy2.0python3.10.____cpython.yaml index 8ac74a1..797f00f 100644 --- a/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/osx_64_numpy2.0python3.10.____cpython.yaml @@ -11,7 +11,7 @@ c_stdlib: c_stdlib_version: - '10.13' channel_sources: -- conda-forge/label/llvmlite_rc,conda-forge +- conda-forge/label/numpy_rc,conda-forge channel_targets: - conda-forge numba_rc cxx_compiler: @@ -23,7 +23,7 @@ llvm_openmp: macos_machine: - x86_64-apple-darwin13.4.0 numpy: -- '1.22' +- '2.0' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml b/.ci_support/osx_64_numpy2.0python3.11.____cpython.yaml similarity index 91% rename from .ci_support/osx_64_numpy1.23python3.11.____cpython.yaml rename to .ci_support/osx_64_numpy2.0python3.11.____cpython.yaml index a8635c3..fefed2d 100644 --- a/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/osx_64_numpy2.0python3.11.____cpython.yaml @@ -11,7 +11,7 @@ c_stdlib: c_stdlib_version: - '10.13' channel_sources: -- conda-forge/label/llvmlite_rc,conda-forge +- conda-forge/label/numpy_rc,conda-forge channel_targets: - conda-forge numba_rc cxx_compiler: @@ -23,7 +23,7 @@ llvm_openmp: macos_machine: - x86_64-apple-darwin13.4.0 numpy: -- '1.23' +- '2.0' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/osx_64_numpy1.26python3.12.____cpython.yaml b/.ci_support/osx_64_numpy2.0python3.12.____cpython.yaml similarity index 91% rename from .ci_support/osx_64_numpy1.26python3.12.____cpython.yaml rename to .ci_support/osx_64_numpy2.0python3.12.____cpython.yaml index 7eb2029..b1ddbf9 100644 --- a/.ci_support/osx_64_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/osx_64_numpy2.0python3.12.____cpython.yaml @@ -11,7 +11,7 @@ c_stdlib: c_stdlib_version: - '10.13' channel_sources: -- conda-forge/label/llvmlite_rc,conda-forge +- conda-forge/label/numpy_rc,conda-forge channel_targets: - conda-forge numba_rc cxx_compiler: @@ -23,7 +23,7 @@ llvm_openmp: macos_machine: - x86_64-apple-darwin13.4.0 numpy: -- '1.26' +- '2.0' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml b/.ci_support/osx_64_numpy2.0python3.9.____cpython.yaml similarity index 91% rename from .ci_support/osx_64_numpy1.22python3.9.____cpython.yaml rename to .ci_support/osx_64_numpy2.0python3.9.____cpython.yaml index d4e89f0..ad8c304 100644 --- a/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/osx_64_numpy2.0python3.9.____cpython.yaml @@ -11,7 +11,7 @@ c_stdlib: c_stdlib_version: - '10.13' channel_sources: -- conda-forge/label/llvmlite_rc,conda-forge +- conda-forge/label/numpy_rc,conda-forge channel_targets: - conda-forge numba_rc cxx_compiler: @@ -23,7 +23,7 @@ llvm_openmp: macos_machine: - x86_64-apple-darwin13.4.0 numpy: -- '1.22' +- '2.0' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml b/.ci_support/osx_arm64_numpy2.0python3.10.____cpython.yaml similarity index 91% rename from .ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml rename to .ci_support/osx_arm64_numpy2.0python3.10.____cpython.yaml index e061ec6..0107ad5 100644 --- a/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy2.0python3.10.____cpython.yaml @@ -11,7 +11,7 @@ c_stdlib: c_stdlib_version: - '11.0' channel_sources: -- conda-forge/label/llvmlite_rc,conda-forge +- conda-forge/label/numpy_rc,conda-forge channel_targets: - conda-forge numba_rc cxx_compiler: @@ -23,7 +23,7 @@ llvm_openmp: macos_machine: - arm64-apple-darwin20.0.0 numpy: -- '1.22' +- '2.0' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml b/.ci_support/osx_arm64_numpy2.0python3.11.____cpython.yaml similarity index 91% rename from .ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml rename to .ci_support/osx_arm64_numpy2.0python3.11.____cpython.yaml index 9deb063..3710ed5 100644 --- a/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy2.0python3.11.____cpython.yaml @@ -11,7 +11,7 @@ c_stdlib: c_stdlib_version: - '11.0' channel_sources: -- conda-forge/label/llvmlite_rc,conda-forge +- conda-forge/label/numpy_rc,conda-forge channel_targets: - conda-forge numba_rc cxx_compiler: @@ -23,7 +23,7 @@ llvm_openmp: macos_machine: - arm64-apple-darwin20.0.0 numpy: -- '1.23' +- '2.0' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml b/.ci_support/osx_arm64_numpy2.0python3.12.____cpython.yaml similarity index 91% rename from .ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml rename to .ci_support/osx_arm64_numpy2.0python3.12.____cpython.yaml index 3724f21..55d3a1d 100644 --- a/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy2.0python3.12.____cpython.yaml @@ -11,7 +11,7 @@ c_stdlib: c_stdlib_version: - '11.0' channel_sources: -- conda-forge/label/llvmlite_rc,conda-forge +- conda-forge/label/numpy_rc,conda-forge channel_targets: - conda-forge numba_rc cxx_compiler: @@ -23,7 +23,7 @@ llvm_openmp: macos_machine: - arm64-apple-darwin20.0.0 numpy: -- '1.26' +- '2.0' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml b/.ci_support/osx_arm64_numpy2.0python3.9.____cpython.yaml similarity index 91% rename from .ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml rename to .ci_support/osx_arm64_numpy2.0python3.9.____cpython.yaml index 6d22906..8432974 100644 --- a/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy2.0python3.9.____cpython.yaml @@ -11,7 +11,7 @@ c_stdlib: c_stdlib_version: - '11.0' channel_sources: -- conda-forge/label/llvmlite_rc,conda-forge +- conda-forge/label/numpy_rc,conda-forge channel_targets: - conda-forge numba_rc cxx_compiler: @@ -23,7 +23,7 @@ llvm_openmp: macos_machine: - arm64-apple-darwin20.0.0 numpy: -- '1.22' +- '2.0' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/win_64_numpy1.22python3.10.____cpython.yaml b/.ci_support/win_64_numpy2.0python3.10.____cpython.yaml similarity index 85% rename from .ci_support/win_64_numpy1.22python3.10.____cpython.yaml rename to .ci_support/win_64_numpy2.0python3.10.____cpython.yaml index 4d6c005..79c366b 100644 --- a/.ci_support/win_64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/win_64_numpy2.0python3.10.____cpython.yaml @@ -3,13 +3,13 @@ c_compiler: c_stdlib: - vs channel_sources: -- conda-forge/label/llvmlite_rc,conda-forge +- conda-forge/label/numpy_rc,conda-forge channel_targets: - conda-forge numba_rc cxx_compiler: - vs2019 numpy: -- '1.22' +- '2.0' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/win_64_numpy1.23python3.11.____cpython.yaml b/.ci_support/win_64_numpy2.0python3.11.____cpython.yaml similarity index 85% rename from .ci_support/win_64_numpy1.23python3.11.____cpython.yaml rename to .ci_support/win_64_numpy2.0python3.11.____cpython.yaml index 6545de2..46317d1 100644 --- a/.ci_support/win_64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/win_64_numpy2.0python3.11.____cpython.yaml @@ -3,13 +3,13 @@ c_compiler: c_stdlib: - vs channel_sources: -- conda-forge/label/llvmlite_rc,conda-forge +- conda-forge/label/numpy_rc,conda-forge channel_targets: - conda-forge numba_rc cxx_compiler: - vs2019 numpy: -- '1.23' +- '2.0' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/win_64_numpy1.26python3.12.____cpython.yaml b/.ci_support/win_64_numpy2.0python3.12.____cpython.yaml similarity index 85% rename from .ci_support/win_64_numpy1.26python3.12.____cpython.yaml rename to .ci_support/win_64_numpy2.0python3.12.____cpython.yaml index 3fd4daf..0aefe8c 100644 --- a/.ci_support/win_64_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/win_64_numpy2.0python3.12.____cpython.yaml @@ -3,13 +3,13 @@ c_compiler: c_stdlib: - vs channel_sources: -- conda-forge/label/llvmlite_rc,conda-forge +- conda-forge/label/numpy_rc,conda-forge channel_targets: - conda-forge numba_rc cxx_compiler: - vs2019 numpy: -- '1.26' +- '2.0' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/win_64_numpy1.22python3.9.____cpython.yaml b/.ci_support/win_64_numpy2.0python3.9.____cpython.yaml similarity index 85% rename from .ci_support/win_64_numpy1.22python3.9.____cpython.yaml rename to .ci_support/win_64_numpy2.0python3.9.____cpython.yaml index fb68031..d889640 100644 --- a/.ci_support/win_64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/win_64_numpy2.0python3.9.____cpython.yaml @@ -3,13 +3,13 @@ c_compiler: c_stdlib: - vs channel_sources: -- conda-forge/label/llvmlite_rc,conda-forge +- conda-forge/label/numpy_rc,conda-forge channel_targets: - conda-forge numba_rc cxx_compiler: - vs2019 numpy: -- '1.22' +- '2.0' pin_run_as_build: python: min_pin: x.x diff --git a/.travis.yml b/.travis.yml index fbfbff5..3a2166c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,48 +1,48 @@ # This file was generated automatically from conda-smithy. To update this configuration, # update the conda-forge.yml and/or the recipe/meta.yaml. -language: generic +language: shell -matrix: +jobs: include: - - env: CONFIG=linux_aarch64_numpy1.22python3.10.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-aarch64 DOCKER_IMAGE=quay.io/condaforge/linux-anvil-aarch64 + - env: CONFIG=linux_aarch64_numpy2.0python3.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.22python3.9.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-aarch64 DOCKER_IMAGE=quay.io/condaforge/linux-anvil-aarch64 + - env: CONFIG=linux_aarch64_numpy2.0python3.11.____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.23python3.11.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-aarch64 DOCKER_IMAGE=quay.io/condaforge/linux-anvil-aarch64 + - env: CONFIG=linux_aarch64_numpy2.0python3.12.____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.26python3.12.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-aarch64 DOCKER_IMAGE=quay.io/condaforge/linux-anvil-aarch64 + - env: CONFIG=linux_aarch64_numpy2.0python3.9.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-aarch64 DOCKER_IMAGE=quay.io/condaforge/linux-anvil-aarch64 os: linux arch: arm64 dist: focal - - env: CONFIG=linux_ppc64le_numpy1.22python3.10.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le + - env: CONFIG=linux_ppc64le_numpy2.0python3.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.22python3.9.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le + - env: CONFIG=linux_ppc64le_numpy2.0python3.11.____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.23python3.11.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le + - env: CONFIG=linux_ppc64le_numpy2.0python3.12.____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.26python3.12.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le + - env: CONFIG=linux_ppc64le_numpy2.0python3.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 eae9251..94b2203 100644 --- a/README.md +++ b/README.md @@ -43,171 +43,171 @@ Current build status <table> <thead><tr><th>Variant</th><th>Status</th></tr></thead> <tbody><tr> - <td>linux_64_numpy1.22python3.10.____cpython</td> + <td>linux_64_numpy2.0python3.10.____cpython</td> <td> <a href="https://dev.azure.com/conda-forge/feedstock-builds/_build/latest?definitionId=700&branchName=main"> - <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=linux&configuration=linux%20linux_64_numpy1.22python3.10.____cpython" alt="variant"> + <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=linux&configuration=linux%20linux_64_numpy2.0python3.10.____cpython" alt="variant"> </a> </td> </tr><tr> - <td>linux_64_numpy1.22python3.9.____cpython</td> + <td>linux_64_numpy2.0python3.11.____cpython</td> <td> <a href="https://dev.azure.com/conda-forge/feedstock-builds/_build/latest?definitionId=700&branchName=main"> - <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=linux&configuration=linux%20linux_64_numpy1.22python3.9.____cpython" alt="variant"> + <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=linux&configuration=linux%20linux_64_numpy2.0python3.11.____cpython" alt="variant"> </a> </td> </tr><tr> - <td>linux_64_numpy1.23python3.11.____cpython</td> + <td>linux_64_numpy2.0python3.12.____cpython</td> <td> <a href="https://dev.azure.com/conda-forge/feedstock-builds/_build/latest?definitionId=700&branchName=main"> - <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=linux&configuration=linux%20linux_64_numpy1.23python3.11.____cpython" alt="variant"> + <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=linux&configuration=linux%20linux_64_numpy2.0python3.12.____cpython" alt="variant"> </a> </td> </tr><tr> - <td>linux_64_numpy1.26python3.12.____cpython</td> + <td>linux_64_numpy2.0python3.9.____cpython</td> <td> <a href="https://dev.azure.com/conda-forge/feedstock-builds/_build/latest?definitionId=700&branchName=main"> - <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=linux&configuration=linux%20linux_64_numpy1.26python3.12.____cpython" alt="variant"> + <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=linux&configuration=linux%20linux_64_numpy2.0python3.9.____cpython" alt="variant"> </a> </td> </tr><tr> - <td>linux_aarch64_numpy1.22python3.10.____cpython</td> + <td>linux_aarch64_numpy2.0python3.10.____cpython</td> <td> <a href="https://dev.azure.com/conda-forge/feedstock-builds/_build/latest?definitionId=700&branchName=main"> - <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=linux&configuration=linux%20linux_aarch64_numpy1.22python3.10.____cpython" alt="variant"> + <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=linux&configuration=linux%20linux_aarch64_numpy2.0python3.10.____cpython" alt="variant"> </a> </td> </tr><tr> - <td>linux_aarch64_numpy1.22python3.9.____cpython</td> + <td>linux_aarch64_numpy2.0python3.11.____cpython</td> <td> <a href="https://dev.azure.com/conda-forge/feedstock-builds/_build/latest?definitionId=700&branchName=main"> - <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=linux&configuration=linux%20linux_aarch64_numpy1.22python3.9.____cpython" alt="variant"> + <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=linux&configuration=linux%20linux_aarch64_numpy2.0python3.11.____cpython" alt="variant"> </a> </td> </tr><tr> - <td>linux_aarch64_numpy1.23python3.11.____cpython</td> + <td>linux_aarch64_numpy2.0python3.12.____cpython</td> <td> <a href="https://dev.azure.com/conda-forge/feedstock-builds/_build/latest?definitionId=700&branchName=main"> - <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=linux&configuration=linux%20linux_aarch64_numpy1.23python3.11.____cpython" alt="variant"> + <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=linux&configuration=linux%20linux_aarch64_numpy2.0python3.12.____cpython" alt="variant"> </a> </td> </tr><tr> - <td>linux_aarch64_numpy1.26python3.12.____cpython</td> + <td>linux_aarch64_numpy2.0python3.9.____cpython</td> <td> <a href="https://dev.azure.com/conda-forge/feedstock-builds/_build/latest?definitionId=700&branchName=main"> - <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=linux&configuration=linux%20linux_aarch64_numpy1.26python3.12.____cpython" alt="variant"> + <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=linux&configuration=linux%20linux_aarch64_numpy2.0python3.9.____cpython" alt="variant"> </a> </td> </tr><tr> - <td>linux_ppc64le_numpy1.22python3.10.____cpython</td> + <td>linux_ppc64le_numpy2.0python3.10.____cpython</td> <td> <a href="https://dev.azure.com/conda-forge/feedstock-builds/_build/latest?definitionId=700&branchName=main"> - <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=linux&configuration=linux%20linux_ppc64le_numpy1.22python3.10.____cpython" alt="variant"> + <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=linux&configuration=linux%20linux_ppc64le_numpy2.0python3.10.____cpython" alt="variant"> </a> </td> </tr><tr> - <td>linux_ppc64le_numpy1.22python3.9.____cpython</td> + <td>linux_ppc64le_numpy2.0python3.11.____cpython</td> <td> <a href="https://dev.azure.com/conda-forge/feedstock-builds/_build/latest?definitionId=700&branchName=main"> - <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=linux&configuration=linux%20linux_ppc64le_numpy1.22python3.9.____cpython" alt="variant"> + <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=linux&configuration=linux%20linux_ppc64le_numpy2.0python3.11.____cpython" alt="variant"> </a> </td> </tr><tr> - <td>linux_ppc64le_numpy1.23python3.11.____cpython</td> + <td>linux_ppc64le_numpy2.0python3.12.____cpython</td> <td> <a href="https://dev.azure.com/conda-forge/feedstock-builds/_build/latest?definitionId=700&branchName=main"> - <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=linux&configuration=linux%20linux_ppc64le_numpy1.23python3.11.____cpython" alt="variant"> + <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=linux&configuration=linux%20linux_ppc64le_numpy2.0python3.12.____cpython" alt="variant"> </a> </td> </tr><tr> - <td>linux_ppc64le_numpy1.26python3.12.____cpython</td> + <td>linux_ppc64le_numpy2.0python3.9.____cpython</td> <td> <a href="https://dev.azure.com/conda-forge/feedstock-builds/_build/latest?definitionId=700&branchName=main"> - <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=linux&configuration=linux%20linux_ppc64le_numpy1.26python3.12.____cpython" alt="variant"> + <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=linux&configuration=linux%20linux_ppc64le_numpy2.0python3.9.____cpython" alt="variant"> </a> </td> </tr><tr> - <td>osx_64_numpy1.22python3.10.____cpython</td> + <td>osx_64_numpy2.0python3.10.____cpython</td> <td> <a href="https://dev.azure.com/conda-forge/feedstock-builds/_build/latest?definitionId=700&branchName=main"> - <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=osx&configuration=osx%20osx_64_numpy1.22python3.10.____cpython" alt="variant"> + <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=osx&configuration=osx%20osx_64_numpy2.0python3.10.____cpython" alt="variant"> </a> </td> </tr><tr> - <td>osx_64_numpy1.22python3.9.____cpython</td> + <td>osx_64_numpy2.0python3.11.____cpython</td> <td> <a href="https://dev.azure.com/conda-forge/feedstock-builds/_build/latest?definitionId=700&branchName=main"> - <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=osx&configuration=osx%20osx_64_numpy1.22python3.9.____cpython" alt="variant"> + <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=osx&configuration=osx%20osx_64_numpy2.0python3.11.____cpython" alt="variant"> </a> </td> </tr><tr> - <td>osx_64_numpy1.23python3.11.____cpython</td> + <td>osx_64_numpy2.0python3.12.____cpython</td> <td> <a href="https://dev.azure.com/conda-forge/feedstock-builds/_build/latest?definitionId=700&branchName=main"> - <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=osx&configuration=osx%20osx_64_numpy1.23python3.11.____cpython" alt="variant"> + <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=osx&configuration=osx%20osx_64_numpy2.0python3.12.____cpython" alt="variant"> </a> </td> </tr><tr> - <td>osx_64_numpy1.26python3.12.____cpython</td> + <td>osx_64_numpy2.0python3.9.____cpython</td> <td> <a href="https://dev.azure.com/conda-forge/feedstock-builds/_build/latest?definitionId=700&branchName=main"> - <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=osx&configuration=osx%20osx_64_numpy1.26python3.12.____cpython" alt="variant"> + <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=osx&configuration=osx%20osx_64_numpy2.0python3.9.____cpython" alt="variant"> </a> </td> </tr><tr> - <td>osx_arm64_numpy1.22python3.10.____cpython</td> + <td>osx_arm64_numpy2.0python3.10.____cpython</td> <td> <a href="https://dev.azure.com/conda-forge/feedstock-builds/_build/latest?definitionId=700&branchName=main"> - <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=osx&configuration=osx%20osx_arm64_numpy1.22python3.10.____cpython" alt="variant"> + <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=osx&configuration=osx%20osx_arm64_numpy2.0python3.10.____cpython" alt="variant"> </a> </td> </tr><tr> - <td>osx_arm64_numpy1.22python3.9.____cpython</td> + <td>osx_arm64_numpy2.0python3.11.____cpython</td> <td> <a href="https://dev.azure.com/conda-forge/feedstock-builds/_build/latest?definitionId=700&branchName=main"> - <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=osx&configuration=osx%20osx_arm64_numpy1.22python3.9.____cpython" alt="variant"> + <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=osx&configuration=osx%20osx_arm64_numpy2.0python3.11.____cpython" alt="variant"> </a> </td> </tr><tr> - <td>osx_arm64_numpy1.23python3.11.____cpython</td> + <td>osx_arm64_numpy2.0python3.12.____cpython</td> <td> <a href="https://dev.azure.com/conda-forge/feedstock-builds/_build/latest?definitionId=700&branchName=main"> - <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=osx&configuration=osx%20osx_arm64_numpy1.23python3.11.____cpython" alt="variant"> + <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=osx&configuration=osx%20osx_arm64_numpy2.0python3.12.____cpython" alt="variant"> </a> </td> </tr><tr> - <td>osx_arm64_numpy1.26python3.12.____cpython</td> + <td>osx_arm64_numpy2.0python3.9.____cpython</td> <td> <a href="https://dev.azure.com/conda-forge/feedstock-builds/_build/latest?definitionId=700&branchName=main"> - <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=osx&configuration=osx%20osx_arm64_numpy1.26python3.12.____cpython" alt="variant"> + <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=osx&configuration=osx%20osx_arm64_numpy2.0python3.9.____cpython" alt="variant"> </a> </td> </tr><tr> - <td>win_64_numpy1.22python3.10.____cpython</td> + <td>win_64_numpy2.0python3.10.____cpython</td> <td> <a href="https://dev.azure.com/conda-forge/feedstock-builds/_build/latest?definitionId=700&branchName=main"> - <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=win&configuration=win%20win_64_numpy1.22python3.10.____cpython" alt="variant"> + <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=win&configuration=win%20win_64_numpy2.0python3.10.____cpython" alt="variant"> </a> </td> </tr><tr> - <td>win_64_numpy1.22python3.9.____cpython</td> + <td>win_64_numpy2.0python3.11.____cpython</td> <td> <a href="https://dev.azure.com/conda-forge/feedstock-builds/_build/latest?definitionId=700&branchName=main"> - <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=win&configuration=win%20win_64_numpy1.22python3.9.____cpython" alt="variant"> + <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=win&configuration=win%20win_64_numpy2.0python3.11.____cpython" alt="variant"> </a> </td> </tr><tr> - <td>win_64_numpy1.23python3.11.____cpython</td> + <td>win_64_numpy2.0python3.12.____cpython</td> <td> <a href="https://dev.azure.com/conda-forge/feedstock-builds/_build/latest?definitionId=700&branchName=main"> - <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=win&configuration=win%20win_64_numpy1.23python3.11.____cpython" alt="variant"> + <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=win&configuration=win%20win_64_numpy2.0python3.12.____cpython" alt="variant"> </a> </td> </tr><tr> - <td>win_64_numpy1.26python3.12.____cpython</td> + <td>win_64_numpy2.0python3.9.____cpython</td> <td> <a href="https://dev.azure.com/conda-forge/feedstock-builds/_build/latest?definitionId=700&branchName=main"> - <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=win&configuration=win%20win_64_numpy1.26python3.12.____cpython" alt="variant"> + <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/numba-feedstock?branchName=main&jobName=win&configuration=win%20win_64_numpy2.0python3.9.____cpython" alt="variant"> </a> </td> </tr> From 328171748f780180b0e10502280fd210a4fa472b Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Thu, 30 May 2024 00:47:00 +0000 Subject: [PATCH 38/49] MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.36.1, and conda-forge-pinning 2024.05.29.16.17.59 --- .ci_support/osx_64_numpy2.0python3.10.____cpython.yaml | 2 ++ .ci_support/osx_64_numpy2.0python3.11.____cpython.yaml | 2 ++ .ci_support/osx_64_numpy2.0python3.12.____cpython.yaml | 2 ++ .ci_support/osx_64_numpy2.0python3.9.____cpython.yaml | 2 ++ .ci_support/osx_arm64_numpy2.0python3.10.____cpython.yaml | 2 ++ .ci_support/osx_arm64_numpy2.0python3.11.____cpython.yaml | 2 ++ .ci_support/osx_arm64_numpy2.0python3.12.____cpython.yaml | 2 ++ .ci_support/osx_arm64_numpy2.0python3.9.____cpython.yaml | 2 ++ .gitattributes | 4 ++-- 9 files changed, 18 insertions(+), 2 deletions(-) diff --git a/.ci_support/osx_64_numpy2.0python3.10.____cpython.yaml b/.ci_support/osx_64_numpy2.0python3.10.____cpython.yaml index f74e167..b1c79c6 100644 --- a/.ci_support/osx_64_numpy2.0python3.10.____cpython.yaml +++ b/.ci_support/osx_64_numpy2.0python3.10.____cpython.yaml @@ -1,5 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: - '10.13' +MACOSX_SDK_VERSION: +- '10.13' c_compiler: - clang c_compiler_version: diff --git a/.ci_support/osx_64_numpy2.0python3.11.____cpython.yaml b/.ci_support/osx_64_numpy2.0python3.11.____cpython.yaml index 423d392..26359d1 100644 --- a/.ci_support/osx_64_numpy2.0python3.11.____cpython.yaml +++ b/.ci_support/osx_64_numpy2.0python3.11.____cpython.yaml @@ -1,5 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: - '10.13' +MACOSX_SDK_VERSION: +- '10.13' c_compiler: - clang c_compiler_version: diff --git a/.ci_support/osx_64_numpy2.0python3.12.____cpython.yaml b/.ci_support/osx_64_numpy2.0python3.12.____cpython.yaml index 65964cf..f67e40d 100644 --- a/.ci_support/osx_64_numpy2.0python3.12.____cpython.yaml +++ b/.ci_support/osx_64_numpy2.0python3.12.____cpython.yaml @@ -1,5 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: - '10.13' +MACOSX_SDK_VERSION: +- '10.13' c_compiler: - clang c_compiler_version: diff --git a/.ci_support/osx_64_numpy2.0python3.9.____cpython.yaml b/.ci_support/osx_64_numpy2.0python3.9.____cpython.yaml index b49c4c5..8fd0c54 100644 --- a/.ci_support/osx_64_numpy2.0python3.9.____cpython.yaml +++ b/.ci_support/osx_64_numpy2.0python3.9.____cpython.yaml @@ -1,5 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: - '10.13' +MACOSX_SDK_VERSION: +- '10.13' c_compiler: - clang c_compiler_version: diff --git a/.ci_support/osx_arm64_numpy2.0python3.10.____cpython.yaml b/.ci_support/osx_arm64_numpy2.0python3.10.____cpython.yaml index 1f3e189..3bff34e 100644 --- a/.ci_support/osx_arm64_numpy2.0python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy2.0python3.10.____cpython.yaml @@ -1,5 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' +MACOSX_SDK_VERSION: +- '11.0' c_compiler: - clang c_compiler_version: diff --git a/.ci_support/osx_arm64_numpy2.0python3.11.____cpython.yaml b/.ci_support/osx_arm64_numpy2.0python3.11.____cpython.yaml index 659a098..456d8f6 100644 --- a/.ci_support/osx_arm64_numpy2.0python3.11.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy2.0python3.11.____cpython.yaml @@ -1,5 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' +MACOSX_SDK_VERSION: +- '11.0' c_compiler: - clang c_compiler_version: diff --git a/.ci_support/osx_arm64_numpy2.0python3.12.____cpython.yaml b/.ci_support/osx_arm64_numpy2.0python3.12.____cpython.yaml index e8e2111..ebfd034 100644 --- a/.ci_support/osx_arm64_numpy2.0python3.12.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy2.0python3.12.____cpython.yaml @@ -1,5 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' +MACOSX_SDK_VERSION: +- '11.0' c_compiler: - clang c_compiler_version: diff --git a/.ci_support/osx_arm64_numpy2.0python3.9.____cpython.yaml b/.ci_support/osx_arm64_numpy2.0python3.9.____cpython.yaml index ecd3b8a..4d38866 100644 --- a/.ci_support/osx_arm64_numpy2.0python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy2.0python3.9.____cpython.yaml @@ -1,5 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' +MACOSX_SDK_VERSION: +- '11.0' c_compiler: - clang c_compiler_version: diff --git a/.gitattributes b/.gitattributes index 7f32763..18f114a 100644 --- a/.gitattributes +++ b/.gitattributes @@ -20,8 +20,8 @@ bld.bat text eol=crlf .travis.yml linguist-generated=true .scripts/* linguist-generated=true .woodpecker.yml linguist-generated=true -LICENSE.txt linguist-generated=true -README.md linguist-generated=true +/LICENSE.txt linguist-generated=true +/README.md linguist-generated=true azure-pipelines.yml linguist-generated=true build-locally.py linguist-generated=true shippable.yml linguist-generated=true From a2b91d88a7b2114362c731f2d4c2ec88d1a45f18 Mon Sep 17 00:00:00 2001 From: jakirkham <jakirkham@gmail.com> Date: Wed, 29 May 2024 17:49:34 -0700 Subject: [PATCH 39/49] Drop `{{ pin_compatible('numpy') }}` This is no longer needed thanks to `numpy`'s `run_exports`. --- recipe/meta.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 109ae3e..ddfa2fb 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -46,7 +46,6 @@ requirements: run: - python - {{ pin_compatible('llvmlite', max_pin='x.x') }} - - {{ pin_compatible('numpy') }} run_constrained: - {{ pin_compatible('tbb', max_pin=None) }} From ec170fa5e6764952a1b6528ab9adfd447c84345d Mon Sep 17 00:00:00 2001 From: jakirkham <jakirkham@gmail.com> Date: Wed, 29 May 2024 17:50:49 -0700 Subject: [PATCH 40/49] Let variants set `numpy` constraint --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index ddfa2fb..0e35134 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -27,7 +27,7 @@ requirements: build: - python # [build_platform != target_platform] - cross-python_{{ target_platform }} # [build_platform != target_platform] - - numpy >=2.0.0rc2 # [build_platform != target_platform] + - numpy # [build_platform != target_platform] - {{ compiler('c') }} - {{ compiler('cxx') }} - {{ stdlib('c') }} From 5bbac452228f46d9ef4d3db47cba56a7a969beff Mon Sep 17 00:00:00 2001 From: jakirkham <jakirkham@gmail.com> Date: Wed, 29 May 2024 17:53:01 -0700 Subject: [PATCH 41/49] Add `stdlib` before `compiler`s --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index acba399..06860fc 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -29,8 +29,8 @@ requirements: - python # [build_platform != target_platform] - cross-python_{{ target_platform }} # [build_platform != target_platform] - numpy # [build_platform != target_platform] + - {{ stdlib('c') }} - {{ compiler('c') }} - - {{ stdlib("c") }} - {{ compiler('cxx') }} # llvm is needed for the headers - llvm-openmp # [osx] From 5421600b4e2b892c02eaa29f8011dc6cfb3327a6 Mon Sep 17 00:00:00 2001 From: jakirkham <jakirkham@gmail.com> Date: Wed, 29 May 2024 17:53:26 -0700 Subject: [PATCH 42/49] Add `stdlib` before `compiler`s --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 0e35134..80af724 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -28,9 +28,9 @@ requirements: - python # [build_platform != target_platform] - cross-python_{{ target_platform }} # [build_platform != target_platform] - numpy # [build_platform != target_platform] + - {{ stdlib('c') }} - {{ compiler('c') }} - {{ compiler('cxx') }} - - {{ stdlib('c') }} # llvm is needed for the headers - llvm-openmp # [osx] - libgomp # [linux] From 03ddabeecfdc12f6626156a03dcd1e7ea6789948 Mon Sep 17 00:00:00 2001 From: jakirkham <jakirkham@gmail.com> Date: Wed, 29 May 2024 18:01:44 -0700 Subject: [PATCH 43/49] Bump `llvmlite` requirement to `0.43` --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 80af724..9fe9895 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -39,7 +39,7 @@ requirements: - python - pip - setuptools - - llvmlite 0.42.* + - llvmlite 0.43.* - numpy - tbb-devel 2021.6.0 From a6816ef638259ddd9f12a789857dd6a34ce9a5a3 Mon Sep 17 00:00:00 2001 From: jakirkham <jakirkham@gmail.com> Date: Wed, 29 May 2024 18:12:31 -0700 Subject: [PATCH 44/49] Include `numpy_rc` label in channels --- .ci_support/migrations/numpy2.yaml | 4 ++++ recipe/conda_build_config.yaml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.ci_support/migrations/numpy2.yaml b/.ci_support/migrations/numpy2.yaml index d19357f..f3c05ec 100644 --- a/.ci_support/migrations/numpy2.yaml +++ b/.ci_support/migrations/numpy2.yaml @@ -1,6 +1,7 @@ __migrator: build_number: 1 kind: version + use_local: true commit_message: | Rebuild for numpy 2.0 @@ -58,6 +59,8 @@ __migrator: channel_sources: - conda-forge - conda-forge/label/numpy_rc,conda-forge + - conda-forge/label/llvmlite_rc,conda-forge + - conda-forge/label/llvmlite_rc,conda-forge/label/numpy_rc,conda-forge # needs to match length of zip {python, python_impl, numpy} # as it is in global CBC in order to override it @@ -69,4 +72,5 @@ numpy: - 2.0 channel_sources: - conda-forge/label/numpy_rc,conda-forge + - conda-forge/label/llvmlite_rc,conda-forge/label/numpy_rc,conda-forge migrator_ts: 1713572489.295986 diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index c23061b..6b5c2e8 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -1,4 +1,4 @@ channel_sources: - - conda-forge/label/llvmlite_rc,conda-forge + - conda-forge/label/llvmlite_rc,conda-forge/label/numpy_rc,conda-forge channel_targets: - conda-forge numba_rc From 2341424247089b552e319e6b7f7673b3d0525bde Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Thu, 30 May 2024 01:15:20 +0000 Subject: [PATCH 45/49] MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.36.1, and conda-forge-pinning 2024.05.29.16.17.59 --- .ci_support/linux_64_numpy2.0python3.10.____cpython.yaml | 2 +- .ci_support/linux_64_numpy2.0python3.11.____cpython.yaml | 2 +- .ci_support/linux_64_numpy2.0python3.12.____cpython.yaml | 2 +- .ci_support/linux_64_numpy2.0python3.9.____cpython.yaml | 2 +- .ci_support/linux_aarch64_numpy2.0python3.10.____cpython.yaml | 2 +- .ci_support/linux_aarch64_numpy2.0python3.11.____cpython.yaml | 2 +- .ci_support/linux_aarch64_numpy2.0python3.12.____cpython.yaml | 2 +- .ci_support/linux_aarch64_numpy2.0python3.9.____cpython.yaml | 2 +- .ci_support/linux_ppc64le_numpy2.0python3.10.____cpython.yaml | 2 +- .ci_support/linux_ppc64le_numpy2.0python3.11.____cpython.yaml | 2 +- .ci_support/linux_ppc64le_numpy2.0python3.12.____cpython.yaml | 2 +- .ci_support/linux_ppc64le_numpy2.0python3.9.____cpython.yaml | 2 +- .ci_support/osx_64_numpy2.0python3.10.____cpython.yaml | 2 +- .ci_support/osx_64_numpy2.0python3.11.____cpython.yaml | 2 +- .ci_support/osx_64_numpy2.0python3.12.____cpython.yaml | 2 +- .ci_support/osx_64_numpy2.0python3.9.____cpython.yaml | 2 +- .ci_support/osx_arm64_numpy2.0python3.10.____cpython.yaml | 2 +- .ci_support/osx_arm64_numpy2.0python3.11.____cpython.yaml | 2 +- .ci_support/osx_arm64_numpy2.0python3.12.____cpython.yaml | 2 +- .ci_support/osx_arm64_numpy2.0python3.9.____cpython.yaml | 2 +- .ci_support/win_64_numpy2.0python3.10.____cpython.yaml | 2 +- .ci_support/win_64_numpy2.0python3.11.____cpython.yaml | 2 +- .ci_support/win_64_numpy2.0python3.12.____cpython.yaml | 2 +- .ci_support/win_64_numpy2.0python3.9.____cpython.yaml | 2 +- 24 files changed, 24 insertions(+), 24 deletions(-) diff --git a/.ci_support/linux_64_numpy2.0python3.10.____cpython.yaml b/.ci_support/linux_64_numpy2.0python3.10.____cpython.yaml index 6180d87..5b96d5a 100644 --- a/.ci_support/linux_64_numpy2.0python3.10.____cpython.yaml +++ b/.ci_support/linux_64_numpy2.0python3.10.____cpython.yaml @@ -9,7 +9,7 @@ c_stdlib_version: cdt_name: - cos6 channel_sources: -- conda-forge/label/numpy_rc,conda-forge +- conda-forge/label/llvmlite_rc,conda-forge/label/numpy_rc,conda-forge channel_targets: - conda-forge numba_rc cxx_compiler: diff --git a/.ci_support/linux_64_numpy2.0python3.11.____cpython.yaml b/.ci_support/linux_64_numpy2.0python3.11.____cpython.yaml index c58b215..d1ca1ae 100644 --- a/.ci_support/linux_64_numpy2.0python3.11.____cpython.yaml +++ b/.ci_support/linux_64_numpy2.0python3.11.____cpython.yaml @@ -9,7 +9,7 @@ c_stdlib_version: cdt_name: - cos6 channel_sources: -- conda-forge/label/numpy_rc,conda-forge +- conda-forge/label/llvmlite_rc,conda-forge/label/numpy_rc,conda-forge channel_targets: - conda-forge numba_rc cxx_compiler: diff --git a/.ci_support/linux_64_numpy2.0python3.12.____cpython.yaml b/.ci_support/linux_64_numpy2.0python3.12.____cpython.yaml index 57fc316..778685f 100644 --- a/.ci_support/linux_64_numpy2.0python3.12.____cpython.yaml +++ b/.ci_support/linux_64_numpy2.0python3.12.____cpython.yaml @@ -9,7 +9,7 @@ c_stdlib_version: cdt_name: - cos6 channel_sources: -- conda-forge/label/numpy_rc,conda-forge +- conda-forge/label/llvmlite_rc,conda-forge/label/numpy_rc,conda-forge channel_targets: - conda-forge numba_rc cxx_compiler: diff --git a/.ci_support/linux_64_numpy2.0python3.9.____cpython.yaml b/.ci_support/linux_64_numpy2.0python3.9.____cpython.yaml index 5e369e4..717f963 100644 --- a/.ci_support/linux_64_numpy2.0python3.9.____cpython.yaml +++ b/.ci_support/linux_64_numpy2.0python3.9.____cpython.yaml @@ -9,7 +9,7 @@ c_stdlib_version: cdt_name: - cos6 channel_sources: -- conda-forge/label/numpy_rc,conda-forge +- conda-forge/label/llvmlite_rc,conda-forge/label/numpy_rc,conda-forge channel_targets: - conda-forge numba_rc cxx_compiler: diff --git a/.ci_support/linux_aarch64_numpy2.0python3.10.____cpython.yaml b/.ci_support/linux_aarch64_numpy2.0python3.10.____cpython.yaml index 76c1847..d35057c 100644 --- a/.ci_support/linux_aarch64_numpy2.0python3.10.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy2.0python3.10.____cpython.yaml @@ -13,7 +13,7 @@ cdt_arch: cdt_name: - cos7 channel_sources: -- conda-forge/label/numpy_rc,conda-forge +- conda-forge/label/llvmlite_rc,conda-forge/label/numpy_rc,conda-forge channel_targets: - conda-forge numba_rc cxx_compiler: diff --git a/.ci_support/linux_aarch64_numpy2.0python3.11.____cpython.yaml b/.ci_support/linux_aarch64_numpy2.0python3.11.____cpython.yaml index f9b6bcb..76adab2 100644 --- a/.ci_support/linux_aarch64_numpy2.0python3.11.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy2.0python3.11.____cpython.yaml @@ -13,7 +13,7 @@ cdt_arch: cdt_name: - cos7 channel_sources: -- conda-forge/label/numpy_rc,conda-forge +- conda-forge/label/llvmlite_rc,conda-forge/label/numpy_rc,conda-forge channel_targets: - conda-forge numba_rc cxx_compiler: diff --git a/.ci_support/linux_aarch64_numpy2.0python3.12.____cpython.yaml b/.ci_support/linux_aarch64_numpy2.0python3.12.____cpython.yaml index 5f3d2ca..cca0c18 100644 --- a/.ci_support/linux_aarch64_numpy2.0python3.12.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy2.0python3.12.____cpython.yaml @@ -13,7 +13,7 @@ cdt_arch: cdt_name: - cos7 channel_sources: -- conda-forge/label/numpy_rc,conda-forge +- conda-forge/label/llvmlite_rc,conda-forge/label/numpy_rc,conda-forge channel_targets: - conda-forge numba_rc cxx_compiler: diff --git a/.ci_support/linux_aarch64_numpy2.0python3.9.____cpython.yaml b/.ci_support/linux_aarch64_numpy2.0python3.9.____cpython.yaml index 546f6fa..9fd78bd 100644 --- a/.ci_support/linux_aarch64_numpy2.0python3.9.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy2.0python3.9.____cpython.yaml @@ -13,7 +13,7 @@ cdt_arch: cdt_name: - cos7 channel_sources: -- conda-forge/label/numpy_rc,conda-forge +- conda-forge/label/llvmlite_rc,conda-forge/label/numpy_rc,conda-forge channel_targets: - conda-forge numba_rc cxx_compiler: diff --git a/.ci_support/linux_ppc64le_numpy2.0python3.10.____cpython.yaml b/.ci_support/linux_ppc64le_numpy2.0python3.10.____cpython.yaml index 78cbe8e..992bde1 100644 --- a/.ci_support/linux_ppc64le_numpy2.0python3.10.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy2.0python3.10.____cpython.yaml @@ -9,7 +9,7 @@ c_stdlib_version: cdt_name: - cos7 channel_sources: -- conda-forge/label/numpy_rc,conda-forge +- conda-forge/label/llvmlite_rc,conda-forge/label/numpy_rc,conda-forge channel_targets: - conda-forge numba_rc cxx_compiler: diff --git a/.ci_support/linux_ppc64le_numpy2.0python3.11.____cpython.yaml b/.ci_support/linux_ppc64le_numpy2.0python3.11.____cpython.yaml index f1bb6cc..c0cf55e 100644 --- a/.ci_support/linux_ppc64le_numpy2.0python3.11.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy2.0python3.11.____cpython.yaml @@ -9,7 +9,7 @@ c_stdlib_version: cdt_name: - cos7 channel_sources: -- conda-forge/label/numpy_rc,conda-forge +- conda-forge/label/llvmlite_rc,conda-forge/label/numpy_rc,conda-forge channel_targets: - conda-forge numba_rc cxx_compiler: diff --git a/.ci_support/linux_ppc64le_numpy2.0python3.12.____cpython.yaml b/.ci_support/linux_ppc64le_numpy2.0python3.12.____cpython.yaml index f076b76..fdc6714 100644 --- a/.ci_support/linux_ppc64le_numpy2.0python3.12.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy2.0python3.12.____cpython.yaml @@ -9,7 +9,7 @@ c_stdlib_version: cdt_name: - cos7 channel_sources: -- conda-forge/label/numpy_rc,conda-forge +- conda-forge/label/llvmlite_rc,conda-forge/label/numpy_rc,conda-forge channel_targets: - conda-forge numba_rc cxx_compiler: diff --git a/.ci_support/linux_ppc64le_numpy2.0python3.9.____cpython.yaml b/.ci_support/linux_ppc64le_numpy2.0python3.9.____cpython.yaml index 60cd63a..287c96e 100644 --- a/.ci_support/linux_ppc64le_numpy2.0python3.9.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy2.0python3.9.____cpython.yaml @@ -9,7 +9,7 @@ c_stdlib_version: cdt_name: - cos7 channel_sources: -- conda-forge/label/numpy_rc,conda-forge +- conda-forge/label/llvmlite_rc,conda-forge/label/numpy_rc,conda-forge channel_targets: - conda-forge numba_rc cxx_compiler: diff --git a/.ci_support/osx_64_numpy2.0python3.10.____cpython.yaml b/.ci_support/osx_64_numpy2.0python3.10.____cpython.yaml index 797f00f..35cac7d 100644 --- a/.ci_support/osx_64_numpy2.0python3.10.____cpython.yaml +++ b/.ci_support/osx_64_numpy2.0python3.10.____cpython.yaml @@ -11,7 +11,7 @@ c_stdlib: c_stdlib_version: - '10.13' channel_sources: -- conda-forge/label/numpy_rc,conda-forge +- conda-forge/label/llvmlite_rc,conda-forge/label/numpy_rc,conda-forge channel_targets: - conda-forge numba_rc cxx_compiler: diff --git a/.ci_support/osx_64_numpy2.0python3.11.____cpython.yaml b/.ci_support/osx_64_numpy2.0python3.11.____cpython.yaml index fefed2d..cb17431 100644 --- a/.ci_support/osx_64_numpy2.0python3.11.____cpython.yaml +++ b/.ci_support/osx_64_numpy2.0python3.11.____cpython.yaml @@ -11,7 +11,7 @@ c_stdlib: c_stdlib_version: - '10.13' channel_sources: -- conda-forge/label/numpy_rc,conda-forge +- conda-forge/label/llvmlite_rc,conda-forge/label/numpy_rc,conda-forge channel_targets: - conda-forge numba_rc cxx_compiler: diff --git a/.ci_support/osx_64_numpy2.0python3.12.____cpython.yaml b/.ci_support/osx_64_numpy2.0python3.12.____cpython.yaml index b1ddbf9..48b2ce6 100644 --- a/.ci_support/osx_64_numpy2.0python3.12.____cpython.yaml +++ b/.ci_support/osx_64_numpy2.0python3.12.____cpython.yaml @@ -11,7 +11,7 @@ c_stdlib: c_stdlib_version: - '10.13' channel_sources: -- conda-forge/label/numpy_rc,conda-forge +- conda-forge/label/llvmlite_rc,conda-forge/label/numpy_rc,conda-forge channel_targets: - conda-forge numba_rc cxx_compiler: diff --git a/.ci_support/osx_64_numpy2.0python3.9.____cpython.yaml b/.ci_support/osx_64_numpy2.0python3.9.____cpython.yaml index ad8c304..08291f4 100644 --- a/.ci_support/osx_64_numpy2.0python3.9.____cpython.yaml +++ b/.ci_support/osx_64_numpy2.0python3.9.____cpython.yaml @@ -11,7 +11,7 @@ c_stdlib: c_stdlib_version: - '10.13' channel_sources: -- conda-forge/label/numpy_rc,conda-forge +- conda-forge/label/llvmlite_rc,conda-forge/label/numpy_rc,conda-forge channel_targets: - conda-forge numba_rc cxx_compiler: diff --git a/.ci_support/osx_arm64_numpy2.0python3.10.____cpython.yaml b/.ci_support/osx_arm64_numpy2.0python3.10.____cpython.yaml index 0107ad5..84fe31f 100644 --- a/.ci_support/osx_arm64_numpy2.0python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy2.0python3.10.____cpython.yaml @@ -11,7 +11,7 @@ c_stdlib: c_stdlib_version: - '11.0' channel_sources: -- conda-forge/label/numpy_rc,conda-forge +- conda-forge/label/llvmlite_rc,conda-forge/label/numpy_rc,conda-forge channel_targets: - conda-forge numba_rc cxx_compiler: diff --git a/.ci_support/osx_arm64_numpy2.0python3.11.____cpython.yaml b/.ci_support/osx_arm64_numpy2.0python3.11.____cpython.yaml index 3710ed5..dea724b 100644 --- a/.ci_support/osx_arm64_numpy2.0python3.11.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy2.0python3.11.____cpython.yaml @@ -11,7 +11,7 @@ c_stdlib: c_stdlib_version: - '11.0' channel_sources: -- conda-forge/label/numpy_rc,conda-forge +- conda-forge/label/llvmlite_rc,conda-forge/label/numpy_rc,conda-forge channel_targets: - conda-forge numba_rc cxx_compiler: diff --git a/.ci_support/osx_arm64_numpy2.0python3.12.____cpython.yaml b/.ci_support/osx_arm64_numpy2.0python3.12.____cpython.yaml index 55d3a1d..b7de6ad 100644 --- a/.ci_support/osx_arm64_numpy2.0python3.12.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy2.0python3.12.____cpython.yaml @@ -11,7 +11,7 @@ c_stdlib: c_stdlib_version: - '11.0' channel_sources: -- conda-forge/label/numpy_rc,conda-forge +- conda-forge/label/llvmlite_rc,conda-forge/label/numpy_rc,conda-forge channel_targets: - conda-forge numba_rc cxx_compiler: diff --git a/.ci_support/osx_arm64_numpy2.0python3.9.____cpython.yaml b/.ci_support/osx_arm64_numpy2.0python3.9.____cpython.yaml index 8432974..796dc89 100644 --- a/.ci_support/osx_arm64_numpy2.0python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy2.0python3.9.____cpython.yaml @@ -11,7 +11,7 @@ c_stdlib: c_stdlib_version: - '11.0' channel_sources: -- conda-forge/label/numpy_rc,conda-forge +- conda-forge/label/llvmlite_rc,conda-forge/label/numpy_rc,conda-forge channel_targets: - conda-forge numba_rc cxx_compiler: diff --git a/.ci_support/win_64_numpy2.0python3.10.____cpython.yaml b/.ci_support/win_64_numpy2.0python3.10.____cpython.yaml index 79c366b..a607e64 100644 --- a/.ci_support/win_64_numpy2.0python3.10.____cpython.yaml +++ b/.ci_support/win_64_numpy2.0python3.10.____cpython.yaml @@ -3,7 +3,7 @@ c_compiler: c_stdlib: - vs channel_sources: -- conda-forge/label/numpy_rc,conda-forge +- conda-forge/label/llvmlite_rc,conda-forge/label/numpy_rc,conda-forge channel_targets: - conda-forge numba_rc cxx_compiler: diff --git a/.ci_support/win_64_numpy2.0python3.11.____cpython.yaml b/.ci_support/win_64_numpy2.0python3.11.____cpython.yaml index 46317d1..13470d0 100644 --- a/.ci_support/win_64_numpy2.0python3.11.____cpython.yaml +++ b/.ci_support/win_64_numpy2.0python3.11.____cpython.yaml @@ -3,7 +3,7 @@ c_compiler: c_stdlib: - vs channel_sources: -- conda-forge/label/numpy_rc,conda-forge +- conda-forge/label/llvmlite_rc,conda-forge/label/numpy_rc,conda-forge channel_targets: - conda-forge numba_rc cxx_compiler: diff --git a/.ci_support/win_64_numpy2.0python3.12.____cpython.yaml b/.ci_support/win_64_numpy2.0python3.12.____cpython.yaml index 0aefe8c..d6d538c 100644 --- a/.ci_support/win_64_numpy2.0python3.12.____cpython.yaml +++ b/.ci_support/win_64_numpy2.0python3.12.____cpython.yaml @@ -3,7 +3,7 @@ c_compiler: c_stdlib: - vs channel_sources: -- conda-forge/label/numpy_rc,conda-forge +- conda-forge/label/llvmlite_rc,conda-forge/label/numpy_rc,conda-forge channel_targets: - conda-forge numba_rc cxx_compiler: diff --git a/.ci_support/win_64_numpy2.0python3.9.____cpython.yaml b/.ci_support/win_64_numpy2.0python3.9.____cpython.yaml index d889640..c417e4b 100644 --- a/.ci_support/win_64_numpy2.0python3.9.____cpython.yaml +++ b/.ci_support/win_64_numpy2.0python3.9.____cpython.yaml @@ -3,7 +3,7 @@ c_compiler: c_stdlib: - vs channel_sources: -- conda-forge/label/numpy_rc,conda-forge +- conda-forge/label/llvmlite_rc,conda-forge/label/numpy_rc,conda-forge channel_targets: - conda-forge numba_rc cxx_compiler: From 3ef370536ce02fa614be8c8dabebe9c834870dfa Mon Sep 17 00:00:00 2001 From: jakirkham <jakirkham@gmail.com> Date: Wed, 29 May 2024 18:23:07 -0700 Subject: [PATCH 46/49] Use native arch builds for now --- conda-forge.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/conda-forge.yml b/conda-forge.yml index ce36348..9316619 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -2,8 +2,6 @@ bot: abi_migration_branches: - rc build_platform: - linux_aarch64: linux_64 - linux_ppc64le: linux_64 osx_arm64: osx_64 conda_build: pkg_format: '2' From 2fffc7933fdac000127982de36b54406cfdd2097 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Thu, 30 May 2024 01:26:15 +0000 Subject: [PATCH 47/49] MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.36.1, and conda-forge-pinning 2024.05.29.16.17.59 --- .azure-pipelines/azure-pipelines-linux.yml | 32 ---------- ...arch64_numpy2.0python3.10.____cpython.yaml | 2 +- ...arch64_numpy2.0python3.11.____cpython.yaml | 2 +- ...arch64_numpy2.0python3.12.____cpython.yaml | 2 +- ...aarch64_numpy2.0python3.9.____cpython.yaml | 2 +- ...pc64le_numpy2.0python3.10.____cpython.yaml | 2 +- ...pc64le_numpy2.0python3.11.____cpython.yaml | 2 +- ...pc64le_numpy2.0python3.12.____cpython.yaml | 2 +- ...ppc64le_numpy2.0python3.9.____cpython.yaml | 2 +- .travis.yml | 60 +++++++++++++++++++ README.md | 9 ++- 11 files changed, 76 insertions(+), 41 deletions(-) create mode 100644 .travis.yml diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index c073f5b..c407be9 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -24,38 +24,6 @@ jobs: CONFIG: linux_64_numpy2.0python3.9.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_numpy2.0python3.10.____cpython: - CONFIG: linux_aarch64_numpy2.0python3.10.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_numpy2.0python3.11.____cpython: - CONFIG: linux_aarch64_numpy2.0python3.11.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_numpy2.0python3.12.____cpython: - CONFIG: linux_aarch64_numpy2.0python3.12.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_numpy2.0python3.9.____cpython: - CONFIG: linux_aarch64_numpy2.0python3.9.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_numpy2.0python3.10.____cpython: - CONFIG: linux_ppc64le_numpy2.0python3.10.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_numpy2.0python3.11.____cpython: - CONFIG: linux_ppc64le_numpy2.0python3.11.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_numpy2.0python3.12.____cpython: - CONFIG: linux_ppc64le_numpy2.0python3.12.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_numpy2.0python3.9.____cpython: - CONFIG: linux_ppc64le_numpy2.0python3.9.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 timeoutInMinutes: 360 variables: {} diff --git a/.ci_support/linux_aarch64_numpy2.0python3.10.____cpython.yaml b/.ci_support/linux_aarch64_numpy2.0python3.10.____cpython.yaml index 474184f..c252c98 100644 --- a/.ci_support/linux_aarch64_numpy2.0python3.10.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy2.0python3.10.____cpython.yaml @@ -21,7 +21,7 @@ cxx_compiler: cxx_compiler_version: - '12' docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 +- quay.io/condaforge/linux-anvil-aarch64 numpy: - '2.0' pin_run_as_build: diff --git a/.ci_support/linux_aarch64_numpy2.0python3.11.____cpython.yaml b/.ci_support/linux_aarch64_numpy2.0python3.11.____cpython.yaml index 00f4489..f1a0696 100644 --- a/.ci_support/linux_aarch64_numpy2.0python3.11.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy2.0python3.11.____cpython.yaml @@ -21,7 +21,7 @@ cxx_compiler: cxx_compiler_version: - '12' docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 +- quay.io/condaforge/linux-anvil-aarch64 numpy: - '2.0' pin_run_as_build: diff --git a/.ci_support/linux_aarch64_numpy2.0python3.12.____cpython.yaml b/.ci_support/linux_aarch64_numpy2.0python3.12.____cpython.yaml index e31adab..fa61bca 100644 --- a/.ci_support/linux_aarch64_numpy2.0python3.12.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy2.0python3.12.____cpython.yaml @@ -21,7 +21,7 @@ cxx_compiler: cxx_compiler_version: - '12' docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 +- quay.io/condaforge/linux-anvil-aarch64 numpy: - '2.0' pin_run_as_build: diff --git a/.ci_support/linux_aarch64_numpy2.0python3.9.____cpython.yaml b/.ci_support/linux_aarch64_numpy2.0python3.9.____cpython.yaml index fc5d686..df6fdce 100644 --- a/.ci_support/linux_aarch64_numpy2.0python3.9.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy2.0python3.9.____cpython.yaml @@ -21,7 +21,7 @@ cxx_compiler: cxx_compiler_version: - '12' docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 +- quay.io/condaforge/linux-anvil-aarch64 numpy: - '2.0' pin_run_as_build: diff --git a/.ci_support/linux_ppc64le_numpy2.0python3.10.____cpython.yaml b/.ci_support/linux_ppc64le_numpy2.0python3.10.____cpython.yaml index 801d561..1cf930f 100644 --- a/.ci_support/linux_ppc64le_numpy2.0python3.10.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy2.0python3.10.____cpython.yaml @@ -17,7 +17,7 @@ cxx_compiler: cxx_compiler_version: - '12' docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 +- quay.io/condaforge/linux-anvil-ppc64le numpy: - '2.0' pin_run_as_build: diff --git a/.ci_support/linux_ppc64le_numpy2.0python3.11.____cpython.yaml b/.ci_support/linux_ppc64le_numpy2.0python3.11.____cpython.yaml index 3f9092d..219b71f 100644 --- a/.ci_support/linux_ppc64le_numpy2.0python3.11.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy2.0python3.11.____cpython.yaml @@ -17,7 +17,7 @@ cxx_compiler: cxx_compiler_version: - '12' docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 +- quay.io/condaforge/linux-anvil-ppc64le numpy: - '2.0' pin_run_as_build: diff --git a/.ci_support/linux_ppc64le_numpy2.0python3.12.____cpython.yaml b/.ci_support/linux_ppc64le_numpy2.0python3.12.____cpython.yaml index 31e69fb..2beaf45 100644 --- a/.ci_support/linux_ppc64le_numpy2.0python3.12.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy2.0python3.12.____cpython.yaml @@ -17,7 +17,7 @@ cxx_compiler: cxx_compiler_version: - '12' docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 +- quay.io/condaforge/linux-anvil-ppc64le numpy: - '2.0' pin_run_as_build: diff --git a/.ci_support/linux_ppc64le_numpy2.0python3.9.____cpython.yaml b/.ci_support/linux_ppc64le_numpy2.0python3.9.____cpython.yaml index ec65280..5c7ecb1 100644 --- a/.ci_support/linux_ppc64le_numpy2.0python3.9.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy2.0python3.9.____cpython.yaml @@ -17,7 +17,7 @@ cxx_compiler: cxx_compiler_version: - '12' docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 +- quay.io/condaforge/linux-anvil-ppc64le numpy: - '2.0' pin_run_as_build: diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..3a2166c --- /dev/null +++ b/.travis.yml @@ -0,0 +1,60 @@ +# This file was generated automatically from conda-smithy. To update this configuration, +# update the conda-forge.yml and/or the recipe/meta.yaml. + +language: shell + + + +jobs: + include: + - env: CONFIG=linux_aarch64_numpy2.0python3.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_numpy2.0python3.11.____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_numpy2.0python3.12.____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_numpy2.0python3.9.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-aarch64 DOCKER_IMAGE=quay.io/condaforge/linux-anvil-aarch64 + os: linux + arch: arm64 + dist: focal + + - env: CONFIG=linux_ppc64le_numpy2.0python3.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_numpy2.0python3.11.____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_numpy2.0python3.12.____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_numpy2.0python3.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 + - export GIT_BRANCH="$TRAVIS_BRANCH" + - export flow_run_id="travis_$TRAVIS_JOB_ID" + - export sha="$TRAVIS_COMMIT" + - export remote_url="https://github.com/$TRAVIS_REPO_SLUG" + - export FEEDSTOCK_NAME=$(basename ${TRAVIS_REPO_SLUG}) + - if [[ "${TRAVIS_PULL_REQUEST:-}" == "false" ]]; then export IS_PR_BUILD="False"; else export IS_PR_BUILD="True"; fi + + + - if [[ ${PLATFORM} =~ .*linux.* ]]; then CONDA_FORGE_DOCKER_RUN_ARGS="--network=host --security-opt=seccomp=unconfined" ./.scripts/run_docker_build.sh; fi \ No newline at end of file diff --git a/README.md b/README.md index 93d6069..b3b57c0 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,14 @@ Current build status ==================== -<table> +<table><tr> + <td>Travis</td> + <td> + <a href="https://app.travis-ci.com/conda-forge/numba-feedstock"> + <img alt="linux" src="https://img.shields.io/travis/com/conda-forge/numba-feedstock/main.svg?label=Linux"> + </a> + </td> + </tr> <tr> <td>Azure</td> From e8d93b163ba7283e7476ae356f1ad825ada56f7b Mon Sep 17 00:00:00 2001 From: jakirkham <jakirkham@gmail.com> Date: Wed, 29 May 2024 18:31:01 -0700 Subject: [PATCH 48/49] Refresh `python312` migrator --- .ci_support/migrations/python312.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci_support/migrations/python312.yaml b/.ci_support/migrations/python312.yaml index 784a0a2..d71f6f1 100644 --- a/.ci_support/migrations/python312.yaml +++ b/.ci_support/migrations/python312.yaml @@ -18,7 +18,7 @@ __migrator: - 3.9.* *_73_pypy paused: false longterm: True - pr_limit: 30 + pr_limit: 5 max_solver_attempts: 6 # this will make the bot retry "not solvable" stuff 6 times exclude: # this shouldn't attempt to modify the python feedstocks From c459f518bc4a2d5f5def006d9eacb47f99709d68 Mon Sep 17 00:00:00 2001 From: jakirkham <jakirkham@gmail.com> Date: Wed, 29 May 2024 18:32:07 -0700 Subject: [PATCH 49/49] Refresh `numpy2` migrator --- .ci_support/migrations/numpy2.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.ci_support/migrations/numpy2.yaml b/.ci_support/migrations/numpy2.yaml index d19357f..d70edeb 100644 --- a/.ci_support/migrations/numpy2.yaml +++ b/.ci_support/migrations/numpy2.yaml @@ -22,7 +22,7 @@ __migrator: However, by default, building against numpy 2.0 will assume that the package is compatible with numpy 2.0, which is not necessarily the case. You should check that the upstream package explicitly supports numpy 2.0, otherwise you - need to add a `- numpy <2` run requirement until that happens (check numpy + need to add a `- numpy <2.0dev0` run requirement until that happens (check numpy issue 26191 for an overview of the most important packages). Note that the numpy release candidate promises to be ABI-compatible with the @@ -37,7 +37,7 @@ __migrator: ### To-Dos: * [ ] Match run-requirements for numpy (i.e. check upstream `pyproject.toml` or however the project specifies numpy compatibility) - * If upstream is not yet compatible with numpy 2.0, add `numpy <2` upper bound under `run:`. + * If upstream is not yet compatible with numpy 2.0, add `numpy <2.0dev0` upper bound under `run:`. * If upstream is already compatible with numpy 2.0, nothing else should be necessary in most cases. * If upstream requires a minimum numpy version newer than 1.19, you can add `numpy >=x.y` under `run:`. * [ ] Remove any remaining occurrences of `{{ pin_compatible("numpy") }}` that the bot may have missed. @@ -52,6 +52,8 @@ __migrator: exclude: # needs local overrides that get stomped on by the migrator, which then fails - scipy + # already done, but thinks its unsolvable + - pandas ordering: # prefer channels including numpy_rc (otherwise smithy doesn't # know which of the two values should be taken on merge)