From f75df81cca2ac884da67715c3d0e7b1920a52b30 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Thu, 9 Nov 2023 10:34:55 -0600 Subject: [PATCH 1/2] Update to Arrow 14.0.1. --- conda/environments/all_cuda-118_arch-x86_64.yaml | 4 ++-- conda/environments/all_cuda-120_arch-x86_64.yaml | 4 ++-- conda/recipes/cudf/meta.yaml | 2 +- conda/recipes/libcudf/conda_build_config.yaml | 2 +- cpp/cmake/thirdparty/get_arrow.cmake | 2 +- dependencies.yaml | 8 ++++---- python/cudf/pyproject.toml | 4 ++-- python/cudf_kafka/pyproject.toml | 2 +- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml index 2c98fe472d6..4d5c56e4a7d 100644 --- a/conda/environments/all_cuda-118_arch-x86_64.yaml +++ b/conda/environments/all_cuda-118_arch-x86_64.yaml @@ -40,7 +40,7 @@ dependencies: - hypothesis - identify>=2.5.20 - ipython -- libarrow-all==14.0.0.* +- libarrow-all==14.0.1.* - libcufile-dev=1.4.0.31 - libcufile=1.4.0.31 - libcurand-dev=10.3.0.86 @@ -69,7 +69,7 @@ dependencies: - pre-commit - protobuf>=4.21,<5 - ptxcompiler -- pyarrow==14.0.0.* +- pyarrow==14.0.1.* - pydata-sphinx-theme!=0.14.2 - pytest - pytest-benchmark diff --git a/conda/environments/all_cuda-120_arch-x86_64.yaml b/conda/environments/all_cuda-120_arch-x86_64.yaml index fc1f42fec26..8606932dae4 100644 --- a/conda/environments/all_cuda-120_arch-x86_64.yaml +++ b/conda/environments/all_cuda-120_arch-x86_64.yaml @@ -42,7 +42,7 @@ dependencies: - hypothesis - identify>=2.5.20 - ipython -- libarrow-all==14.0.0.* +- libarrow-all==14.0.1.* - libcufile-dev - libcurand-dev - libkvikio==23.12.* @@ -67,7 +67,7 @@ dependencies: - pip - pre-commit - protobuf>=4.21,<5 -- pyarrow==14.0.0.* +- pyarrow==14.0.1.* - pydata-sphinx-theme!=0.14.2 - pytest - pytest-benchmark diff --git a/conda/recipes/cudf/meta.yaml b/conda/recipes/cudf/meta.yaml index c22f3da7fb6..9b5c5f3d14b 100644 --- a/conda/recipes/cudf/meta.yaml +++ b/conda/recipes/cudf/meta.yaml @@ -61,7 +61,7 @@ requirements: - scikit-build >=0.13.1 - setuptools - dlpack >=0.5,<0.6.0a0 - - pyarrow ==14.0.0.* + - pyarrow ==14.0.1.* - libcudf ={{ version }} - rmm ={{ minor_version }} {% if cuda_major == "11" %} diff --git a/conda/recipes/libcudf/conda_build_config.yaml b/conda/recipes/libcudf/conda_build_config.yaml index 38efbd4fe4f..05b2135184b 100644 --- a/conda/recipes/libcudf/conda_build_config.yaml +++ b/conda/recipes/libcudf/conda_build_config.yaml @@ -23,7 +23,7 @@ gtest_version: - ">=1.13.0" libarrow_version: - - "==14.0.0" + - "==14.0.1" dlpack_version: - ">=0.5,<0.6.0a0" diff --git a/cpp/cmake/thirdparty/get_arrow.cmake b/cpp/cmake/thirdparty/get_arrow.cmake index d85d5d5f7d3..05aa5730b4d 100644 --- a/cpp/cmake/thirdparty/get_arrow.cmake +++ b/cpp/cmake/thirdparty/get_arrow.cmake @@ -427,7 +427,7 @@ if(NOT DEFINED CUDF_VERSION_Arrow) set(CUDF_VERSION_Arrow # This version must be kept in sync with the libarrow version pinned for builds in # dependencies.yaml. - 14.0.0 + 14.0.1 CACHE STRING "The version of Arrow to find (or build)" ) endif() diff --git a/dependencies.yaml b/dependencies.yaml index 74b640dbed2..0ca93a2be93 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -241,7 +241,7 @@ dependencies: - &gmock gmock>=1.13.0 # Hard pin the patch version used during the build. This must be kept # in sync with the version pinned in get_arrow.cmake. - - libarrow-all==14.0.0.* + - libarrow-all==14.0.1.* - librdkafka>=1.9.0,<1.10.0a0 # Align nvcomp version with rapids-cmake - nvcomp==2.6.1 @@ -263,7 +263,7 @@ dependencies: packages: # Hard pin the patch version used during the build. This must be kept # in sync with the version pinned in get_arrow.cmake. - - pyarrow==14.0.0.* + - pyarrow==14.0.1.* build_python: common: - output_types: [conda, requirements, pyproject] @@ -281,13 +281,13 @@ dependencies: - output_types: conda packages: # Allow runtime version to float up to minor version - - libarrow-all==14.* + - libarrow-all>=14.0.1,<15.0.0a0 pyarrow_run: common: - output_types: [conda, requirements, pyproject] packages: # Allow runtime version to float up to minor version - - pyarrow==14.* + - pyarrow>=14.0.1,<15.0.0a0 cudatoolkit: specific: - output_types: conda diff --git a/python/cudf/pyproject.toml b/python/cudf/pyproject.toml index f882fa2d583..1c687269e55 100644 --- a/python/cudf/pyproject.toml +++ b/python/cudf/pyproject.toml @@ -8,7 +8,7 @@ requires = [ "ninja", "numpy>=1.21,<1.25", "protoc-wheel", - "pyarrow==14.0.0.*", + "pyarrow==14.0.1.*", "rmm==23.12.*", "scikit-build>=0.13.1", "setuptools", @@ -38,7 +38,7 @@ dependencies = [ "pandas>=1.3,<1.6.0dev0", "protobuf>=4.21,<5", "ptxcompiler", - "pyarrow==14.*", + "pyarrow>=14.0.1,<15.0.0a0", "rich", "rmm==23.12.*", "typing_extensions>=4.0.0", diff --git a/python/cudf_kafka/pyproject.toml b/python/cudf_kafka/pyproject.toml index 293586cbba0..f5cbd480e9c 100644 --- a/python/cudf_kafka/pyproject.toml +++ b/python/cudf_kafka/pyproject.toml @@ -5,7 +5,7 @@ requires = [ "cython>=3.0.0", "numpy>=1.21,<1.25", - "pyarrow==14.0.0.*", + "pyarrow==14.0.1.*", "setuptools", "wheel", ] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`. From 9ac791c7887cf1551f9434256f1e2abc5b48a1fe Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Thu, 9 Nov 2023 10:59:48 -0600 Subject: [PATCH 2/2] Apply suggestions from code review --- dependencies.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dependencies.yaml b/dependencies.yaml index 0ca93a2be93..35d08239a4c 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -281,12 +281,14 @@ dependencies: - output_types: conda packages: # Allow runtime version to float up to minor version + # Disallow libarrow 14.0.0 due to a CVE - libarrow-all>=14.0.1,<15.0.0a0 pyarrow_run: common: - output_types: [conda, requirements, pyproject] packages: # Allow runtime version to float up to minor version + # Disallow pyarrow 14.0.0 due to a CVE - pyarrow>=14.0.1,<15.0.0a0 cudatoolkit: specific: