From dd20501ac03835be8e5c086885f28743bc7c2145 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Cumplido?= Date: Fri, 26 Jan 2024 16:22:10 +0100 Subject: [PATCH 1/6] Update 14.0.2 download URL --- recipe/meta.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 6d91deb5c..b2df4ab33 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -16,7 +16,8 @@ source: # arrow has the unfortunate habit of changing tags of X.0.0 in the # lead-up until release -> don't use github sources on main # - url: https://github.com/apache/arrow/archive/refs/tags/apache-arrow-{{ version }}.tar.gz - - url: https://dist.apache.org/repos/dist/release/arrow/arrow-{{ version }}/apache-arrow-{{ version }}.tar.gz + - url: https://www.apache.org/dyn/closer.lua/arrow/arrow-{{ version }}/apache-arrow-{{ version }}.tar.gz?action=download + fn: apache-arrow-{{ version }}.tar.gz sha256: 1304dedb41896008b89fe0738c71a95d9b81752efc77fa70f264cb1da15d9bc2 patches: # workaround for https://github.com/apache/arrow/issues/37692 @@ -27,7 +28,7 @@ source: folder: testing build: - number: 2 + number: 3 # 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 # [cuda_compiler_version not in ("None", cuda_compiler_version_min)] From c2ee0103fd810c692f85cc39e64871d518cde84a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Cumplido?= Date: Mon, 29 Jan 2024 12:28:39 +0100 Subject: [PATCH 2/6] Add libgrpc to host requirements --- recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index b2df4ab33..f1b845be6 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -70,6 +70,7 @@ requirements: # - jemalloc - libabseil - libboost-headers + - libgrpc - libutf8proc - lz4-c - nlohmann_json From 022489c75f6eb6d2de438ecaf92705a57b3555e4 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Mon, 29 Jan 2024 13:59:02 +0100 Subject: [PATCH 3/6] bump migration number to pick up newest cuda120.yaml from global pinning --- .ci_support/migrations/cuda120.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci_support/migrations/cuda120.yaml b/.ci_support/migrations/cuda120.yaml index 17bd59c17..16d0edcdc 100644 --- a/.ci_support/migrations/cuda120.yaml +++ b/.ci_support/migrations/cuda120.yaml @@ -3,7 +3,7 @@ __migrator: kind: version migration_number: - 1 + 3 build_number: 1 paused: false From 985aeec6f23abf6d488de33af72acc338346f5cb Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Mon, 29 Jan 2024 17:01:54 +0100 Subject: [PATCH 4/6] avoid pytest 8 for now --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index f1b845be6..ddf4c7a23 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -760,7 +760,7 @@ outputs: requires: # test_cpp_extension_in_python requires a compiler - {{ compiler("cxx") }} # [linux] - - pytest + - pytest <8 - pytest-lazy-fixture - backports.zoneinfo # [py<39] - boto3 From 520a9633b8331575c74d051d7ffb5ba4aae8f717 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Mon, 29 Jan 2024 17:35:13 +0100 Subject: [PATCH 5/6] MNT: Re-rendered with conda-build 3.28.4, conda-smithy 3.30.4, and conda-forge-pinning 2024.01.29.16.06.26 --- .azure-pipelines/azure-pipelines-linux.yml | 16 ++++++------- .azure-pipelines/azure-pipelines-win.yml | 8 +++---- ...er_version11.2cxx_compiler_version10.yaml} | 0 ...er_versionNonecxx_compiler_version12.yaml} | 0 ...er_version11.2cxx_compiler_version10.yaml} | 0 ...er_versionNonecxx_compiler_version12.yaml} | 0 ... => win_64_cuda_compiler_version11.2.yaml} | 0 ... => win_64_cuda_compiler_versionNone.yaml} | 0 .gitignore | 13 +++++++++- .scripts/build_steps.sh | 6 ----- .scripts/run_docker_build.sh | 6 +++++ README.md | 24 +++++++++---------- 12 files changed, 42 insertions(+), 31 deletions(-) rename .ci_support/{linux_aarch64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10.yaml => linux_aarch64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10.yaml} (100%) rename .ci_support/{linux_aarch64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12.yaml => linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml} (100%) rename .ci_support/{linux_ppc64le_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10.yaml => linux_ppc64le_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10.yaml} (100%) rename .ci_support/{linux_ppc64le_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12.yaml => linux_ppc64le_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml} (100%) rename .ci_support/{win_64_cuda_compilernvcccuda_compiler_version11.2.yaml => win_64_cuda_compiler_version11.2.yaml} (100%) rename .ci_support/{win_64_cuda_compilerNonecuda_compiler_versionNone.yaml => win_64_cuda_compiler_versionNone.yaml} (100%) diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index b07c74df8..a738c9507 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -16,20 +16,20 @@ jobs: CONFIG: linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10: - CONFIG: linux_aarch64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10 + linux_aarch64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10: + CONFIG: linux_aarch64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.2 - linux_aarch64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12: - CONFIG: linux_aarch64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12 + linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12: + CONFIG: linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10: - CONFIG: linux_ppc64le_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10 + linux_ppc64le_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10: + CONFIG: linux_ppc64le_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.2 - linux_ppc64le_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12: - CONFIG: linux_ppc64le_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12 + linux_ppc64le_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12: + CONFIG: linux_ppc64le_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 timeoutInMinutes: 360 diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index f57e6cad1..c12db6fb2 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -8,11 +8,11 @@ jobs: vmImage: windows-2022 strategy: matrix: - win_64_cuda_compilerNonecuda_compiler_versionNone: - CONFIG: win_64_cuda_compilerNonecuda_compiler_versionNone + win_64_cuda_compiler_version11.2: + CONFIG: win_64_cuda_compiler_version11.2 UPLOAD_PACKAGES: 'True' - win_64_cuda_compilernvcccuda_compiler_version11.2: - CONFIG: win_64_cuda_compilernvcccuda_compiler_version11.2 + win_64_cuda_compiler_versionNone: + CONFIG: win_64_cuda_compiler_versionNone UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 variables: diff --git a/.ci_support/linux_aarch64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10.yaml b/.ci_support/linux_aarch64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10.yaml similarity index 100% rename from .ci_support/linux_aarch64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10.yaml rename to .ci_support/linux_aarch64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10.yaml diff --git a/.ci_support/linux_aarch64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12.yaml b/.ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml similarity index 100% rename from .ci_support/linux_aarch64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12.yaml rename to .ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml diff --git a/.ci_support/linux_ppc64le_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10.yaml b/.ci_support/linux_ppc64le_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10.yaml similarity index 100% rename from .ci_support/linux_ppc64le_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10.yaml rename to .ci_support/linux_ppc64le_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10.yaml diff --git a/.ci_support/linux_ppc64le_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12.yaml b/.ci_support/linux_ppc64le_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml similarity index 100% rename from .ci_support/linux_ppc64le_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12.yaml rename to .ci_support/linux_ppc64le_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml diff --git a/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.2.yaml b/.ci_support/win_64_cuda_compiler_version11.2.yaml similarity index 100% rename from .ci_support/win_64_cuda_compilernvcccuda_compiler_version11.2.yaml rename to .ci_support/win_64_cuda_compiler_version11.2.yaml diff --git a/.ci_support/win_64_cuda_compilerNonecuda_compiler_versionNone.yaml b/.ci_support/win_64_cuda_compiler_versionNone.yaml similarity index 100% rename from .ci_support/win_64_cuda_compilerNonecuda_compiler_versionNone.yaml rename to .ci_support/win_64_cuda_compiler_versionNone.yaml diff --git a/.gitignore b/.gitignore index c00291072..179afe55e 100644 --- a/.gitignore +++ b/.gitignore @@ -3,11 +3,22 @@ # 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/** +# 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 eba1dfdb4..beda247e4 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -57,12 +57,6 @@ if [[ -f "${FEEDSTOCK_ROOT}/LICENSE.txt" ]]; then cp "${FEEDSTOCK_ROOT}/LICENSE.txt" "${RECIPE_ROOT}/recipe-scripts-license.txt" fi -if [[ "${sha:-}" == "" ]]; then - pushd ${FEEDSTOCK_ROOT} - sha=$(git rev-parse HEAD) - popd -fi - if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then if [[ "x${BUILD_OUTPUT_ID:-}" != "x" ]]; then EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --output-id ${BUILD_OUTPUT_ID}" diff --git a/.scripts/run_docker_build.sh b/.scripts/run_docker_build.sh index b70ef014e..00f377a80 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 diff --git a/README.md b/README.md index 8d444a09e..b3f527250 100644 --- a/README.md +++ b/README.md @@ -153,31 +153,31 @@ Current build status - linux_aarch64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10 + linux_aarch64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10 - variant + variant - linux_aarch64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12 + linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12 - variant + variant - linux_ppc64le_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10 + linux_ppc64le_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10 - variant + variant - linux_ppc64le_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12 + linux_ppc64le_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12 - variant + variant @@ -195,17 +195,17 @@ Current build status - win_64_cuda_compilerNonecuda_compiler_versionNone + win_64_cuda_compiler_version11.2 - variant + variant - win_64_cuda_compilernvcccuda_compiler_version11.2 + win_64_cuda_compiler_versionNone - variant + variant From efd67842e74d241b480d15bf807dea304a1f054a Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Mon, 29 Jan 2024 22:26:02 +0100 Subject: [PATCH 6/6] restrict testing to pandas<2.2 --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index ddf4c7a23..e42bec99d 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -771,7 +771,7 @@ outputs: - fsspec - hypothesis - minio-server - - pandas + - pandas <2.2 - s3fs >=2023 - scipy # these are generally (far) behind on migrating abseil/grpc/protobuf,