Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Forward-merge branch-24.08 into branch-24.10 #16399

Merged
merged 2 commits into from
Jul 26, 2024
Merged

Conversation

rapids-bot[bot]
Copy link

@rapids-bot rapids-bot bot commented Jul 25, 2024

Forward-merge triggered by push to branch-24.08 that creates a PR to keep branch-24.10 up-to-date. If this PR is unable to be immediately merged due to conflicts, it will remain open for the team to manually merge. See forward-merger docs for more info.

## Description
cudf does not currently export any headers that depend on
bs_thread_pool, and having it as a dependency is currently causing
problems for consumers. Avoid exporting it since it's not needed.

## Checklist
- [ ] I am familiar with the [Contributing
Guidelines](https://github.com/rapidsai/cudf/blob/HEAD/CONTRIBUTING.md).
- [ ] New or existing tests cover these changes.
- [ ] The documentation is up to date with these changes.
@rapids-bot rapids-bot bot requested a review from a team as a code owner July 25, 2024 20:26
Copy link
Author

rapids-bot bot commented Jul 25, 2024

FAILURE - Unable to forward-merge due to an error, manual merge is necessary. Do not use the Resolve conflicts option in this PR, follow these instructions https://docs.rapids.ai/maintainers/forward-merger/

IMPORTANT: When merging this PR, do not use the auto-merger (i.e. the /merge comment). Instead, an admin must manually merge by changing the merging strategy to Create a Merge Commit. Otherwise, history will be lost and the branches become incompatible.

@github-actions github-actions bot added libcudf Affects libcudf (C++/CUDA) code. CMake CMake build issue labels Jul 25, 2024
…check (#16401)

## Description
`ArrowStringArrayNumpySemantics` was newly added in 2.1:
https://github.com/pandas-dev/pandas/blob/2.1.x/pandas/core/arrays/string_arrow.py#L488,
so putting the proxy wrapper behind a version check for pandas 2.0.x
compat

```ipython
In [1]: %load_ext cudf.pandas

In [2]: import pandas as pd

In [3]: pd.__version__
Out[3]: '2.0.0'
```

## Checklist
- [ ] I am familiar with the [Contributing
Guidelines](https://github.com/rapidsai/cudf/blob/HEAD/CONTRIBUTING.md).
- [ ] New or existing tests cover these changes.
- [ ] The documentation is up to date with these changes.
@AyodeAwe AyodeAwe requested a review from a team as a code owner July 26, 2024 18:08
@github-actions github-actions bot added Python Affects Python cuDF API. cudf.pandas Issues specific to cudf.pandas labels Jul 26, 2024
@vyasr vyasr mentioned this pull request Jul 26, 2024
3 tasks
@AyodeAwe AyodeAwe merged commit f88a242 into branch-24.10 Jul 26, 2024
27 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CMake CMake build issue cudf.pandas Issues specific to cudf.pandas libcudf Affects libcudf (C++/CUDA) code. Python Affects Python cuDF API.
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

3 participants