diff --git a/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10.yaml b/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10.yaml index 629acc25b..33a7bae29 100644 --- a/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10.yaml +++ b/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10.yaml @@ -33,13 +33,13 @@ glog: libabseil: - '20240116' libgoogle_cloud_devel: -- '2.21' +- '2.22' libgoogle_cloud_storage_devel: -- '2.21' +- '2.22' libgrpc: -- '1.61' +- '1.62' libprotobuf: -- 4.25.2 +- 4.25.3 lz4_c: - 1.9.3 numpy: @@ -63,7 +63,7 @@ python: - 3.8.* *_cpython - 3.9.* *_cpython re2: -- 2023.06.02 +- 2023.09.01 snappy: - '1' target_platform: @@ -75,9 +75,9 @@ ucx: zip_keys: - - c_compiler_version - cxx_compiler_version + - cdt_name - cuda_compiler - cuda_compiler_version - - cdt_name - docker_image - - libgrpc - libprotobuf diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml index 0d41488e8..3af70f9ff 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml +++ b/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml @@ -33,13 +33,13 @@ glog: libabseil: - '20240116' libgoogle_cloud_devel: -- '2.21' +- '2.22' libgoogle_cloud_storage_devel: -- '2.21' +- '2.22' libgrpc: -- '1.61' +- '1.62' libprotobuf: -- 4.25.2 +- 4.25.3 lz4_c: - 1.9.3 numpy: @@ -63,7 +63,7 @@ python: - 3.8.* *_cpython - 3.9.* *_cpython re2: -- 2023.06.02 +- 2023.09.01 snappy: - '1' target_platform: @@ -75,9 +75,9 @@ ucx: zip_keys: - - c_compiler_version - cxx_compiler_version + - cdt_name - cuda_compiler - cuda_compiler_version - - cdt_name - docker_image - - libgrpc - libprotobuf diff --git a/.ci_support/linux_aarch64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10.yaml b/.ci_support/linux_aarch64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10.yaml index 098472a63..4217c483e 100644 --- a/.ci_support/linux_aarch64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10.yaml @@ -37,13 +37,13 @@ glog: libabseil: - '20240116' libgoogle_cloud_devel: -- '2.21' +- '2.22' libgoogle_cloud_storage_devel: -- '2.21' +- '2.22' libgrpc: -- '1.61' +- '1.62' libprotobuf: -- 4.25.2 +- 4.25.3 lz4_c: - 1.9.3 numpy: @@ -67,7 +67,7 @@ python: - 3.8.* *_cpython - 3.9.* *_cpython re2: -- 2023.06.02 +- 2023.09.01 snappy: - '1' target_platform: @@ -79,9 +79,9 @@ ucx: zip_keys: - - c_compiler_version - cxx_compiler_version + - cdt_name - cuda_compiler - cuda_compiler_version - - cdt_name - docker_image - - libgrpc - libprotobuf diff --git a/.ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml b/.ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml index d36516591..9a6ead806 100644 --- a/.ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml @@ -37,13 +37,13 @@ glog: libabseil: - '20240116' libgoogle_cloud_devel: -- '2.21' +- '2.22' libgoogle_cloud_storage_devel: -- '2.21' +- '2.22' libgrpc: -- '1.61' +- '1.62' libprotobuf: -- 4.25.2 +- 4.25.3 lz4_c: - 1.9.3 numpy: @@ -67,7 +67,7 @@ python: - 3.8.* *_cpython - 3.9.* *_cpython re2: -- 2023.06.02 +- 2023.09.01 snappy: - '1' target_platform: @@ -79,9 +79,9 @@ ucx: zip_keys: - - c_compiler_version - cxx_compiler_version + - cdt_name - cuda_compiler - cuda_compiler_version - - cdt_name - docker_image - - libgrpc - libprotobuf diff --git a/.ci_support/linux_ppc64le_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10.yaml b/.ci_support/linux_ppc64le_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10.yaml index f9ef4482e..39f7881e5 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10.yaml @@ -33,13 +33,13 @@ glog: libabseil: - '20240116' libgoogle_cloud_devel: -- '2.21' +- '2.22' libgoogle_cloud_storage_devel: -- '2.21' +- '2.22' libgrpc: -- '1.61' +- '1.62' libprotobuf: -- 4.25.2 +- 4.25.3 lz4_c: - 1.9.3 numpy: @@ -63,7 +63,7 @@ python: - 3.8.* *_cpython - 3.9.* *_cpython re2: -- 2023.06.02 +- 2023.09.01 snappy: - '1' target_platform: @@ -75,9 +75,9 @@ ucx: zip_keys: - - c_compiler_version - cxx_compiler_version + - cdt_name - cuda_compiler - cuda_compiler_version - - cdt_name - docker_image - - libgrpc - libprotobuf diff --git a/.ci_support/linux_ppc64le_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml b/.ci_support/linux_ppc64le_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml index 1438434df..5f8fed2fa 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml @@ -33,13 +33,13 @@ glog: libabseil: - '20240116' libgoogle_cloud_devel: -- '2.21' +- '2.22' libgoogle_cloud_storage_devel: -- '2.21' +- '2.22' libgrpc: -- '1.61' +- '1.62' libprotobuf: -- 4.25.2 +- 4.25.3 lz4_c: - 1.9.3 numpy: @@ -63,7 +63,7 @@ python: - 3.8.* *_cpython - 3.9.* *_cpython re2: -- 2023.06.02 +- 2023.09.01 snappy: - '1' target_platform: @@ -75,9 +75,9 @@ ucx: zip_keys: - - c_compiler_version - cxx_compiler_version + - cdt_name - cuda_compiler - cuda_compiler_version - - cdt_name - docker_image - - libgrpc - libprotobuf diff --git a/.ci_support/migrations/libgoogle_cloud221.yaml b/.ci_support/migrations/libgoogle_cloud222.yaml similarity index 64% rename from .ci_support/migrations/libgoogle_cloud221.yaml rename to .ci_support/migrations/libgoogle_cloud222.yaml index 693eae501..cfdd6fca9 100644 --- a/.ci_support/migrations/libgoogle_cloud221.yaml +++ b/.ci_support/migrations/libgoogle_cloud222.yaml @@ -1,46 +1,51 @@ __migrator: build_number: 1 - commit_message: Rebuild for libgoogle_cloud 2.21 + commit_message: Rebuild for libgoogle_cloud 2.22 kind: version migration_number: 1 google_cloud_cpp: # legacy setup - - '2.21' + - '2.22' libgoogle_cloud: # legacy setup - - '2.21' + - '2.22' libgoogle_cloud_devel: - - '2.21' + - '2.22' libgoogle_cloud_all_devel: - - '2.21' + - '2.22' libgoogle_cloud_aiplatform_devel: - - '2.21' + - '2.22' libgoogle_cloud_automl_devel: - - '2.21' + - '2.22' libgoogle_cloud_bigquery_devel: - - '2.21' + - '2.22' libgoogle_cloud_bigtable_devel: - - '2.21' + - '2.22' libgoogle_cloud_compute_devel: - - '2.21' + - '2.22' libgoogle_cloud_dialogflow_cx_devel: - - '2.21' + - '2.22' libgoogle_cloud_dialogflow_es_devel: - - '2.21' + - '2.22' libgoogle_cloud_discoveryengine_devel: - - '2.21' + - '2.22' libgoogle_cloud_dlp_devel: - - '2.21' + - '2.22' libgoogle_cloud_iam_devel: - - '2.21' + - '2.22' libgoogle_cloud_oauth2_devel: - - '2.21' + - '2.22' libgoogle_cloud_policytroubleshooter_devel: - - '2.21' + - '2.22' libgoogle_cloud_pubsub_devel: - - '2.21' + - '2.22' libgoogle_cloud_spanner_devel: - - '2.21' + - '2.22' libgoogle_cloud_speech_devel: - - '2.21' + - '2.22' libgoogle_cloud_storage_devel: - - '2.21' -migrator_ts: 1708358802.0941658 + - '2.22' +# 2.22 got coupled with libprotobuf/grpc bump +libgrpc: + - '1.62' +libprotobuf: + - 4.25.3 +migrator_ts: 1709602930.8528247 diff --git a/.ci_support/migrations/libgrpc162_libprotobuf4253.yaml b/.ci_support/migrations/libgrpc162_libprotobuf4253.yaml new file mode 100644 index 000000000..16b401a5b --- /dev/null +++ b/.ci_support/migrations/libgrpc162_libprotobuf4253.yaml @@ -0,0 +1,23 @@ +__migrator: + build_number: 1 + commit_message: Rebuild for libprotobuf 4.25.3 + kind: version + migration_number: 1 + exclude: + - abseil-cpp + - grpc-cpp + - libprotobuf + - protobuf +libgrpc: +- "1.62" +libprotobuf: +- 4.25.3 +# keep abseil bump from libabseil20240116_libgrpc161_libprotobuf4252; +# this ensures that this migration applies also without the previous one +libabseil: +- "20240116" +# already covered by libabseil20230802_libgrpc157_libprotobuf4234, +# which we cannot delete yet, but keep for clarity +MACOSX_DEPLOYMENT_TARGET: # [osx and x86_64] +- "10.13" # [osx and x86_64] +migrator_ts: 1709522594.9193177 diff --git a/.ci_support/migrations/libprotobuf4251.yaml b/.ci_support/migrations/libprotobuf4251.yaml deleted file mode 100644 index 39478f0db..000000000 --- a/.ci_support/migrations/libprotobuf4251.yaml +++ /dev/null @@ -1,10 +0,0 @@ -__migrator: - build_number: 1 - commit_message: Rebuild for libprotobuf 4.25.1 - kind: version - migration_number: 1 -libgrpc: -- "1.60" -libprotobuf: -- 4.25.1 -migrator_ts: 1705841975.2201185 diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index 2af8f93d9..065bbc680 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -27,13 +27,13 @@ glog: libabseil: - '20240116' libgoogle_cloud_devel: -- '2.21' +- '2.22' libgoogle_cloud_storage_devel: -- '2.21' +- '2.22' libgrpc: -- '1.61' +- '1.62' libprotobuf: -- 4.25.2 +- 4.25.3 lz4_c: - 1.9.3 macos_machine: @@ -59,7 +59,7 @@ python: - 3.8.* *_cpython - 3.9.* *_cpython re2: -- 2023.06.02 +- 2023.09.01 snappy: - '1' target_platform: diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index b6dd3b5c4..b799cc7a5 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -27,13 +27,13 @@ glog: libabseil: - '20240116' libgoogle_cloud_devel: -- '2.21' +- '2.22' libgoogle_cloud_storage_devel: -- '2.21' +- '2.22' libgrpc: -- '1.61' +- '1.62' libprotobuf: -- 4.25.2 +- 4.25.3 lz4_c: - 1.9.3 macos_machine: @@ -59,7 +59,7 @@ python: - 3.8.* *_cpython - 3.9.* *_cpython re2: -- 2023.06.02 +- 2023.09.01 snappy: - '1' target_platform: diff --git a/.ci_support/win_64_cuda_compiler_version11.2.yaml b/.ci_support/win_64_cuda_compiler_version11.2.yaml index 40915849b..a91a4413e 100644 --- a/.ci_support/win_64_cuda_compiler_version11.2.yaml +++ b/.ci_support/win_64_cuda_compiler_version11.2.yaml @@ -29,13 +29,13 @@ libcrc32c: libcurl: - '8' libgoogle_cloud_devel: -- '2.21' +- '2.22' libgoogle_cloud_storage_devel: -- '2.21' +- '2.22' libgrpc: -- '1.61' +- '1.62' libprotobuf: -- 4.25.2 +- 4.25.3 lz4_c: - 1.9.3 numpy: @@ -59,7 +59,7 @@ python: - 3.8.* *_cpython - 3.9.* *_cpython re2: -- 2023.06.02 +- 2023.09.01 snappy: - '1' target_platform: diff --git a/.ci_support/win_64_cuda_compiler_versionNone.yaml b/.ci_support/win_64_cuda_compiler_versionNone.yaml index f4599be40..0cf6f3950 100644 --- a/.ci_support/win_64_cuda_compiler_versionNone.yaml +++ b/.ci_support/win_64_cuda_compiler_versionNone.yaml @@ -29,13 +29,13 @@ libcrc32c: libcurl: - '8' libgoogle_cloud_devel: -- '2.21' +- '2.22' libgoogle_cloud_storage_devel: -- '2.21' +- '2.22' libgrpc: -- '1.61' +- '1.62' libprotobuf: -- 4.25.2 +- 4.25.3 lz4_c: - 1.9.3 numpy: @@ -59,7 +59,7 @@ python: - 3.8.* *_cpython - 3.9.* *_cpython re2: -- 2023.06.02 +- 2023.09.01 snappy: - '1' target_platform: diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index beda247e4..9121002af 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 9259eb935..16daa698d 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 48734de9f..f801cf464 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.exe build "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/build-locally.py b/build-locally.py index 3f4b7a794..e0d408d07 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.sdk'. " + "Need OSX_SDK_DIR env variable set. Run 'export OSX_SDK_DIR=$PWD/SDKs' " + "to download the SDK automatically to '$PWD/SDKs/MacOSX.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." ) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index a709b0de9..81a527d97 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -21,14 +21,17 @@ source: - patches/0001-fixture-teardown-should-not-fail-test.patch # backport https://github.com/apache/arrow/pull/40150 to unpin setuptools-scm - patches/0002-Revert-GH-37803-CI-Dev-Python-Release-and-merge-scri.patch - - patches/0001-Support-glog-0.7.patch + # backport https://github.com/apache/arrow/pull/40230 for glog 0.7 compat + - patches/0003-GH-40181-C-Support-glog-0.7-build-40230.patch + # backport https://github.com/apache/arrow/pull/40387 for cython 3.0.9 compat + - patches/0004-GH-40386-Python-Fix-except-clauses-40387.patch # testing-submodule not part of release tarball - git_url: https://github.com/apache/arrow-testing.git git_rev: ad82a736c170e97b7c8c035ebd8a801c17eec170 folder: testing build: - number: 7 + number: 8 # 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)] @@ -826,6 +829,8 @@ outputs: # test failures on ppc (both failing with: Float value was truncated converting to int32) {% set tests_to_skip = tests_to_skip + " or test_safe_cast_from_float_with_nans_to_int" %} # [ppc64le] {% set tests_to_skip = tests_to_skip + " or test_float_with_null_as_integer" %} # [ppc64le] + # https://github.com/apache/arrow/issues/40337 Failing test_dateutil_tzinfo_to_string on win + {% set tests_to_skip = tests_to_skip + " or test_dateutil_tzinfo_to_string" %} # [win] # ^^^^^^^ TESTS THAT SHOULDN'T HAVE TO BE SKIPPED ^^^^^^^ - pytest pyarrow/ -rfEs -k "not ({{ tests_to_skip }})" {% endif %} diff --git a/recipe/patches/0001-fixture-teardown-should-not-fail-test.patch b/recipe/patches/0001-fixture-teardown-should-not-fail-test.patch index c9ec4c471..343b6a935 100644 --- a/recipe/patches/0001-fixture-teardown-should-not-fail-test.patch +++ b/recipe/patches/0001-fixture-teardown-should-not-fail-test.patch @@ -1,7 +1,7 @@ From d1ea231aeb2daa8c742effae14e1ee9f011833c9 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Wed, 13 Sep 2023 21:34:29 +1100 -Subject: [PATCH 1/2] fixture teardown should not fail test +Subject: [PATCH 1/4] fixture teardown should not fail test --- python/pyarrow/tests/test_fs.py | 10 ++++++++-- diff --git a/recipe/patches/0002-Revert-GH-37803-CI-Dev-Python-Release-and-merge-scri.patch b/recipe/patches/0002-Revert-GH-37803-CI-Dev-Python-Release-and-merge-scri.patch index 4c3e15887..ed64591ab 100644 --- a/recipe/patches/0002-Revert-GH-37803-CI-Dev-Python-Release-and-merge-scri.patch +++ b/recipe/patches/0002-Revert-GH-37803-CI-Dev-Python-Release-and-merge-scri.patch @@ -1,7 +1,7 @@ From 1c34f1ef9759cbad61546947f41e8f055cae20bb Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Tue, 20 Feb 2024 13:01:37 +1100 -Subject: [PATCH 2/2] Revert "GH-37803: [CI][Dev][Python] Release and merge +Subject: [PATCH 2/4] Revert "GH-37803: [CI][Dev][Python] Release and merge script errors (#37819)" This reverts commit 79e49dbfb71efc70555417ba19cb612eb50924e8. diff --git a/recipe/patches/0001-Support-glog-0.7.patch b/recipe/patches/0003-GH-40181-C-Support-glog-0.7-build-40230.patch similarity index 60% rename from recipe/patches/0001-Support-glog-0.7.patch rename to recipe/patches/0003-GH-40181-C-Support-glog-0.7-build-40230.patch index 3640b9fbb..5d52ecb3f 100644 --- a/recipe/patches/0001-Support-glog-0.7.patch +++ b/recipe/patches/0003-GH-40181-C-Support-glog-0.7-build-40230.patch @@ -1,31 +1,48 @@ -From 4f227e89b006b26d8028216ee854fa9fb118b83b Mon Sep 17 00:00:00 2001 -From: "Uwe L. Korn" -Date: Wed, 21 Feb 2024 12:02:01 +0100 -Subject: [PATCH] Support glog 0.7 +From b656e37e49a77897b0bb4d4ced8c4b5f9d94a27a Mon Sep 17 00:00:00 2001 +From: "Uwe L. Korn" +Date: Tue, 27 Feb 2024 21:41:29 +0100 +Subject: [PATCH 3/4] GH-40181: [C++] Support glog 0.7 build (#40230) +Fixes #40181 + +### Are these changes tested? + +These changes have been tested as part of the conda feedstocks for Arrow. +* GitHub Issue: #40181 + +Authored-by: Uwe L. Korn +Signed-off-by: Sutou Kouhei --- - cpp/cmake_modules/FindGLOG.cmake | 5 +++++ + cpp/cmake_modules/FindGLOG.cmake | 8 +++++++- cpp/src/arrow/util/logging.cc | 6 +++--- - 2 files changed, 8 insertions(+), 3 deletions(-) + 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/cpp/cmake_modules/FindGLOG.cmake b/cpp/cmake_modules/FindGLOG.cmake -index 61b7d06..8e6130b 100644 +index 61b7d0694..62b235ee9 100644 --- a/cpp/cmake_modules/FindGLOG.cmake +++ b/cpp/cmake_modules/FindGLOG.cmake -@@ -21,6 +21,11 @@ if(GLOG_FOUND) - return() - endif() +@@ -17,6 +17,11 @@ + # + # find_package(GLOG) +find_package(glog CONFIG) +if(glog_FOUND) + return() +endif() + - find_package(PkgConfig QUIET) - pkg_check_modules(GLOG_PC libglog) - if(GLOG_PC_FOUND) + if(GLOG_FOUND) + return() + endif() +@@ -56,5 +61,6 @@ if(GLOG_FOUND) + add_library(glog::glog UNKNOWN IMPORTED) + set_target_properties(glog::glog + PROPERTIES IMPORTED_LOCATION "${GLOG_LIB}" +- INTERFACE_INCLUDE_DIRECTORIES "${GLOG_INCLUDE_DIR}") ++ INTERFACE_INCLUDE_DIRECTORIES "${GLOG_INCLUDE_DIR}" ++ INTERFACE_COMPILE_DEFINITIONS "GLOG_USE_GLOG_EXPORT") + endif() diff --git a/cpp/src/arrow/util/logging.cc b/cpp/src/arrow/util/logging.cc -index 9c68982..beedf16 100644 +index 9c68982a3..beedf1673 100644 --- a/cpp/src/arrow/util/logging.cc +++ b/cpp/src/arrow/util/logging.cc @@ -114,7 +114,7 @@ static std::unique_ptr log_dir_; diff --git a/recipe/patches/0004-GH-40386-Python-Fix-except-clauses-40387.patch b/recipe/patches/0004-GH-40386-Python-Fix-except-clauses-40387.patch new file mode 100644 index 000000000..3bc34e18f --- /dev/null +++ b/recipe/patches/0004-GH-40386-Python-Fix-except-clauses-40387.patch @@ -0,0 +1,60 @@ +From 46d84ec72b962274d5f223fbaf86f43a5249df4d Mon Sep 17 00:00:00 2001 +From: Vyas Ramasubramani +Date: Wed, 6 Mar 2024 13:51:34 -0800 +Subject: [PATCH 4/4] GH-40386: [Python] Fix except clauses (#40387) + +### Rationale for this change + +See #40386, these changes are necessary for compatibility with Cython 3.0.9 + +### What changes are included in this PR? + +This PR removes unnecessary `noexcept` clauses. + +### Are these changes tested? + +Covered by existing builds. + +### Are there any user-facing changes? + +No. + +* GitHub Issue: #40386 + +Authored-by: Vyas Ramasubramani +Signed-off-by: Felipe Oliveira Carvalho +--- + python/pyarrow/types.pxi | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/python/pyarrow/types.pxi b/python/pyarrow/types.pxi +index 912ee39f7..f5ae9a6b5 100644 +--- a/python/pyarrow/types.pxi ++++ b/python/pyarrow/types.pxi +@@ -5245,7 +5245,7 @@ cdef void pycapsule_schema_deleter(object schema_capsule) noexcept: + + free(schema) + +-cdef object alloc_c_schema(ArrowSchema** c_schema) noexcept: ++cdef object alloc_c_schema(ArrowSchema** c_schema): + c_schema[0] = malloc(sizeof(ArrowSchema)) + # Ensure the capsule destructor doesn't call a random release pointer + c_schema[0].release = NULL +@@ -5264,7 +5264,7 @@ cdef void pycapsule_array_deleter(object array_capsule) noexcept: + + free(array) + +-cdef object alloc_c_array(ArrowArray** c_array) noexcept: ++cdef object alloc_c_array(ArrowArray** c_array): + c_array[0] = malloc(sizeof(ArrowArray)) + # Ensure the capsule destructor doesn't call a random release pointer + c_array[0].release = NULL +@@ -5283,7 +5283,7 @@ cdef void pycapsule_stream_deleter(object stream_capsule) noexcept: + + free(stream) + +-cdef object alloc_c_stream(ArrowArrayStream** c_stream) noexcept: ++cdef object alloc_c_stream(ArrowArrayStream** c_stream): + c_stream[0] = malloc(sizeof(ArrowArrayStream)) + # Ensure the capsule destructor doesn't call a random release pointer + c_stream[0].release = NULL