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

Merge conda-forge/main into rapidsai/main (pt. 15) #68

Merged
merged 6 commits into from
Jul 31, 2024

Conversation

jakirkham
Copy link
Member

Copy link
Member Author

@jakirkham jakirkham left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Noticed we had some lingering patches here, but we don't actually apply them

patches:
# xgboost patches
- patches/0001-Enable-latest-libcxx-on-MacOS.patch # [osx]

Plus they have all been upstreamed (as noted below). So dropping them

@@ -1,32 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Upstreamed in PR: dmlc/xgboost#9436

@@ -1,82 +0,0 @@
From 2e1d276e925992fd4faf310b20be83680f329bf1 Mon Sep 17 00:00:00 2001
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Upstreamed in PR: dmlc/xgboost#9602

@@ -1,46 +0,0 @@
diff --git a/python-package/xgboost/data.py b/python-package/xgboost/data.py
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Upstreamed in PR: dmlc/xgboost#10175

@hcho3 hcho3 merged commit 15afee9 into rapidsai:main Jul 31, 2024
7 checks passed
@jakirkham jakirkham deleted the merge_upstream_15 branch July 31, 2024 21:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants