-
-
Notifications
You must be signed in to change notification settings - Fork 18k
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
BUG: fix construction from read-only non-ns datetime64 numpy array #34844
Merged
jorisvandenbossche
merged 2 commits into
pandas-dev:master
from
jorisvandenbossche:non-ns-non-writable
Jun 18, 2020
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -13,6 +13,19 @@ | |
from pandas.core.base import NoNewAttributesMixin, PandasObject | ||
|
||
|
||
@pytest.fixture( | ||
params=[ | ||
Series, | ||
lambda x, **kwargs: DataFrame({"a": x}, **kwargs)["a"], | ||
lambda x, **kwargs: DataFrame(x, **kwargs)[0], | ||
Index, | ||
], | ||
ids=["Series", "DataFrame-dict", "DataFrame-array", "Index"], | ||
) | ||
def constructor(request): | ||
return request.param | ||
|
||
|
||
class TestPandasDelegate: | ||
class Delegator: | ||
_properties = ["foo"] | ||
|
@@ -145,3 +158,14 @@ def test_constructor_datetime_outofbound(self, a, klass): | |
msg = "Out of bounds" | ||
with pytest.raises(pd.errors.OutOfBoundsDatetime, match=msg): | ||
klass(a, dtype="datetime64[ns]") | ||
|
||
def test_constructor_datetime_nonns(self, constructor): | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. add the issue number There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. See a few lines below |
||
arr = np.array(["2020-01-01T00:00:00.000000"], dtype="datetime64[us]") | ||
expected = constructor(pd.to_datetime(["2020-01-01"])) | ||
result = constructor(arr) | ||
tm.assert_equal(result, expected) | ||
|
||
# https://github.com/pandas-dev/pandas/issues/34843 | ||
arr.flags.writeable = False | ||
result = constructor(arr) | ||
tm.assert_equal(result, expected) |
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@jorisvandenbossche if you hadn’t merged this so quickly i would have objected here
creating this fixture for a single use is not that great
we typically also call this klass and don’t much care about dataframe-dict here