From c364a6fb106be2ad6e4ce45fcf658f40b9e44957 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Thu, 3 Nov 2022 15:34:31 +0000 Subject: [PATCH 1/2] Rebuild for aws_sdk_cpp19375 --- .ci_support/migrations/aws_sdk_cpp19375.yaml | 7 +++++++ recipe/meta.yaml | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 .ci_support/migrations/aws_sdk_cpp19375.yaml diff --git a/.ci_support/migrations/aws_sdk_cpp19375.yaml b/.ci_support/migrations/aws_sdk_cpp19375.yaml new file mode 100644 index 000000000..2b961bad3 --- /dev/null +++ b/.ci_support/migrations/aws_sdk_cpp19375.yaml @@ -0,0 +1,7 @@ +__migrator: + build_number: 1 + kind: version + migration_number: 1 +aws_sdk_cpp: +- 1.9.375 +migrator_ts: 1667321224.1701944 diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 666cee7a9..f3978eeec 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -23,7 +23,7 @@ source: - patches/0004-ARROW-16730-C-Bump-vendored-jemalloc-version-13294.patch build: - number: 8 + number: 9 # for cuda support, building with one version is enough to be compatible with # all later versions, since arrow is only using libcuda, and not libcudart. skip: true # [(win or linux) and cuda_compiler_version not in ("None", "10.2")] From 1cb89ec1433ca3ceef85a3758c462e773870a44c Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Thu, 3 Nov 2022 15:36:23 +0000 Subject: [PATCH 2/2] MNT: Re-rendered with conda-build 3.22.0, conda-smithy 3.21.3, and conda-forge-pinning 2022.11.03.12.54.01 --- .azure-pipelines/azure-pipelines-win.yml | 2 +- .../migrations/google_cloud_cpp230.yaml | 11 ---- .circleci/config.yml | 2 +- .scripts/build_steps.sh | 4 +- .scripts/run_osx_build.sh | 5 +- README.md | 64 +++++++++---------- 6 files changed, 38 insertions(+), 50 deletions(-) delete mode 100644 .ci_support/migrations/google_cloud_cpp230.yaml diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 94fad959e..adb1d9bee 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -57,7 +57,7 @@ jobs: - script: | call activate base - mamba.exe install 'python=3.9' conda-build conda pip boa 'conda-forge-ci-setup=3' -c conda-forge --strict-channel-priority --yes + mamba.exe install "python=3.9" conda-build conda pip boa conda-forge-ci-setup=3 "py-lief<0.12" -c conda-forge --strict-channel-priority --yes displayName: Install conda-build - script: set PYTHONUNBUFFERED=1 diff --git a/.ci_support/migrations/google_cloud_cpp230.yaml b/.ci_support/migrations/google_cloud_cpp230.yaml deleted file mode 100644 index 558051c96..000000000 --- a/.ci_support/migrations/google_cloud_cpp230.yaml +++ /dev/null @@ -1,11 +0,0 @@ -__migrator: - build_number: 1 - kind: version - migration_number: 1 - -# needs to pin down to patch level due to inline namespaces changing, see -# https://github.com/conda-forge/conda-forge-pinning-feedstock/pull/3430 -google_cloud_cpp: -- '2.3.0' - -migrator_ts: 1667209142.8457868 diff --git a/.circleci/config.yml b/.circleci/config.yml index 3e61aa24d..8b4ef2f99 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,6 +1,6 @@ # This file was generated automatically from conda-smithy. To update this configuration, # update the conda-forge.yml and/or the recipe/meta.yaml. -# -*- mode: yaml -*- +# -*- mode: jinja-yaml -*- version: 2 diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index a6b09f6b7..84431a630 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -33,9 +33,9 @@ CONDARC mamba install --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 + conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" mamba update --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 + conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 736a39a09..b3abaeb54 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -23,11 +23,10 @@ bash $MINIFORGE_FILE -b -p ${MINIFORGE_HOME} source ${MINIFORGE_HOME}/etc/profile.d/conda.sh conda activate base -echo -e "\n\nInstalling ['conda-forge-ci-setup=3'] and conda-build." mamba install --update-specs --quiet --yes --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 + conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" mamba update --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 + conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" diff --git a/README.md b/README.md index d4ee1dabe..3d77cd3dd 100644 --- a/README.md +++ b/README.md @@ -30,224 +30,224 @@ Current build status linux_64_c_compiler_version10cuda_compiler_versionNonecxx_compiler_version10numpy1.20python3.8.____cpython - variant + variant linux_64_c_compiler_version10cuda_compiler_versionNonecxx_compiler_version10numpy1.20python3.9.____cpython - variant + variant linux_64_c_compiler_version10cuda_compiler_versionNonecxx_compiler_version10numpy1.21python3.10.____cpython - variant + variant linux_64_c_compiler_version10cuda_compiler_versionNonecxx_compiler_version10numpy1.23python3.11.____cpython - variant + variant linux_64_c_compiler_version7cuda_compiler_version10.2cxx_compiler_version7numpy1.20python3.8.____cpython - variant + variant linux_64_c_compiler_version7cuda_compiler_version10.2cxx_compiler_version7numpy1.20python3.9.____cpython - variant + variant linux_64_c_compiler_version7cuda_compiler_version10.2cxx_compiler_version7numpy1.21python3.10.____cpython - variant + variant linux_64_c_compiler_version7cuda_compiler_version10.2cxx_compiler_version7numpy1.23python3.11.____cpython - variant + variant linux_aarch64_numpy1.20python3.8.____cpython - variant + variant linux_aarch64_numpy1.20python3.9.____cpython - variant + variant linux_aarch64_numpy1.21python3.10.____cpython - variant + variant linux_aarch64_numpy1.23python3.11.____cpython - variant + variant linux_ppc64le_numpy1.20python3.8.____cpython - variant + variant linux_ppc64le_numpy1.20python3.9.____cpython - variant + variant linux_ppc64le_numpy1.21python3.10.____cpython - variant + variant linux_ppc64le_numpy1.23python3.11.____cpython - variant + variant osx_64_numpy1.20python3.8.____cpython - variant + variant osx_64_numpy1.20python3.9.____cpython - variant + variant osx_64_numpy1.21python3.10.____cpython - variant + variant osx_64_numpy1.23python3.11.____cpython - variant + variant osx_arm64_numpy1.20python3.8.____cpython - variant + variant osx_arm64_numpy1.20python3.9.____cpython - variant + variant osx_arm64_numpy1.21python3.10.____cpython - variant + variant osx_arm64_numpy1.23python3.11.____cpython - variant + variant win_64_cuda_compiler_version10.2numpy1.20python3.8.____cpython - variant + variant win_64_cuda_compiler_version10.2numpy1.20python3.9.____cpython - variant + variant win_64_cuda_compiler_version10.2numpy1.21python3.10.____cpython - variant + variant win_64_cuda_compiler_version10.2numpy1.23python3.11.____cpython - variant + variant win_64_cuda_compiler_versionNonenumpy1.20python3.8.____cpython - variant + variant win_64_cuda_compiler_versionNonenumpy1.20python3.9.____cpython - variant + variant win_64_cuda_compiler_versionNonenumpy1.21python3.10.____cpython - variant + variant win_64_cuda_compiler_versionNonenumpy1.23python3.11.____cpython - variant + variant