diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml index 2c79cbb6b6c..0a6d0465e1e 100644 --- a/conda/environments/all_cuda-118_arch-x86_64.yaml +++ b/conda/environments/all_cuda-118_arch-x86_64.yaml @@ -26,7 +26,7 @@ dependencies: - cxx-compiler - cython>=3.0.0 - dask-core==2023.9.2 -- dask-cuda==23.12.* +# - dask-cuda==23.12.* - dask==2023.9.2 - distributed==2023.9.2 - dlpack>=0.5,<0.6.0a0 @@ -40,7 +40,7 @@ dependencies: - hypothesis - identify>=2.5.20 - ipython -- libarrow==12.0.0.* +- libarrow==13.0.0.* - libcufile-dev=1.4.0.31 - libcufile=1.4.0.31 - libcurand-dev=10.3.0.86 @@ -69,9 +69,9 @@ dependencies: - pre-commit - protobuf>=4.21,<5 - ptxcompiler -- pyarrow==12.0.0.* +- pyarrow==13.0.0.* - pydata-sphinx-theme -- pyorc +# - pyorc - pytest - pytest-benchmark - pytest-cases diff --git a/conda/environments/all_cuda-120_arch-x86_64.yaml b/conda/environments/all_cuda-120_arch-x86_64.yaml index c96b7428882..ef3360197b5 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==12.0.0.* +- libarrow==13.0.0.* - libcufile-dev - libcurand-dev - libkvikio==23.12.* @@ -67,7 +67,7 @@ dependencies: - pip - pre-commit - protobuf>=4.21,<5 -- pyarrow==12.0.0.* +- pyarrow==13.0.0.* - pydata-sphinx-theme - pyorc - pytest diff --git a/conda/recipes/cudf/meta.yaml b/conda/recipes/cudf/meta.yaml index 16b064a262e..4d7469e30ab 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 =12.0.0 + - pyarrow =13 - 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 4d33bb89220..d34ff47ee22 100644 --- a/conda/recipes/libcudf/conda_build_config.yaml +++ b/conda/recipes/libcudf/conda_build_config.yaml @@ -26,7 +26,7 @@ aws_sdk_cpp_version: - "<1.11" libarrow: - - "==12.0.0" + - "==13" dlpack_version: - ">=0.5,<0.6.0a0" diff --git a/cpp/cmake/thirdparty/get_arrow.cmake b/cpp/cmake/thirdparty/get_arrow.cmake index c2d5cfbaf78..62f6764363e 100644 --- a/cpp/cmake/thirdparty/get_arrow.cmake +++ b/cpp/cmake/thirdparty/get_arrow.cmake @@ -411,7 +411,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. - 12.0.0 + 13.0.0 CACHE STRING "The version of Arrow to find (or build)" ) endif() diff --git a/dependencies.yaml b/dependencies.yaml index e8114fa5615..33a8ba9d3f4 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -226,7 +226,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 libarrow==12.0.0.* + - &libarrow libarrow==13.0.0.* - librdkafka>=1.9.0,<1.10.0a0 # Align nvcomp version with rapids-cmake - nvcomp==2.6.1 @@ -244,7 +244,7 @@ dependencies: - cython>=3.0.0 # Hard pin the patch version used during the build. This must be kept # in sync with the version pinned in get_arrow.cmake. - - &pyarrow pyarrow==12.0.0.* + - &pyarrow pyarrow==13.0.0.* # TODO: Pin to numpy<1.25 until cudf requires pandas 2 - &numpy numpy>=1.21,<1.25 build_python: diff --git a/python/cudf/cudf/tests/test_decimal.py b/python/cudf/cudf/tests/test_decimal.py index e4b2af90448..da77f6f9c14 100644 --- a/python/cudf/cudf/tests/test_decimal.py +++ b/python/cudf/cudf/tests/test_decimal.py @@ -93,15 +93,15 @@ def test_from_arrow_max_precision_decimal32(): ) def test_typecast_from_float_to_decimal(data, from_dtype, to_dtype): got = data.astype(from_dtype) - + import pdb;pdb.set_trace() pa_arr = got.to_arrow().cast( pa.decimal128(to_dtype.precision, to_dtype.scale) ) expected = cudf.Series(Decimal64Column.from_arrow(pa_arr)) - got = got.astype(to_dtype) + new_got = got.astype(to_dtype) - assert_eq(got, expected) + assert_eq(new_got, expected) @pytest.mark.parametrize( diff --git a/python/cudf/pyproject.toml b/python/cudf/pyproject.toml index ccb5d5d4416..dfc885a8a29 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==12.0.0.*", + "pyarrow==13.0.0.*", "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==12.0.0.*", + "pyarrow==13.*", "rmm==23.12.*", "typing_extensions>=4.0.0", ] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`. diff --git a/python/cudf_kafka/pyproject.toml b/python/cudf_kafka/pyproject.toml index ff475e5a72e..5058412ef60 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==12.0.0.*", + "pyarrow==13.0.0.*", "setuptools", "wheel", ] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`.