MAINT adapt for scikit-learn 1.6 #1135
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
glemaitre
commented
Nov 9, 2024
|
The remaining pandas error is: E TypeError: Cannot use .astype to convert from timezone-naive dtype to timezone-aware dtype. Use obj.tz_localize instead or series.dt.tz_localize insteadI assume we try to |
|
@glemaitre here is the fix for the time zone failures (pandas changes the representation of time zones in 3.0): diff --git a/skrub/_to_datetime.py b/skrub/_to_datetime.py
index 4a08013f..a14d3c8a 100644
--- a/skrub/_to_datetime.py
+++ b/skrub/_to_datetime.py
@@ -28,6 +28,8 @@ def _get_time_zone_pandas(col):
return None
if hasattr(tz, "zone"):
return tz.zone
+ if hasattr(tz, "key"):
+ return tz.key
return tz.tzname(None) |
glemaitre
commented
Nov 18, 2024
| @@ -323,3 +330,17 @@ def _check_params(self): | |||
| raise ValueError( | |||
| f"'resolution' options are {allowed}, got {self.resolution!r}." | |||
| ) | |||
|
|
|||
| if sklearn_below_1_6: | |||
There was a problem hiding this comment.
@jeromedockes The issue was that the scikit-learn tests (that are skipped) issue an error at collection because preserve_dtype was not defined.
Somehow it was not raising in the past for some reason (but it could have raised if we run the test). So we don't need to inherit from TransformerMixin, just make a similar definition of the tags.
jeromedockes
approved these changes
Nov 18, 2024
There was a problem hiding this comment.
thanks a lot @glemaitre ! super useful that you help us keep up with scikit-learn :)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Adapt the code with changes of related to some changes in the developer API that became public in scikit-learn.