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.

Sign up for GitHub

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

Tweak date/datetime inference, remove dependency on non-core Numpy/Pandas API #802

Merged
merged 10 commits into from
Nov 10, 2019
Merged

Tweak date/datetime inference, remove dependency on non-core Numpy/Pandas API #802

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
1a6b176
columns typed as DTYPE_DATE now return datetime.date objects
sc1f Nov 7, 2019
65bf961
add more date vs. datetime tests for dataframes, remove pd.util funct…
sc1f Nov 7, 2019
d12a562
add more tests, remove pd.util
sc1f Nov 7, 2019
6bf96ca
remove masked_invalid
sc1f Nov 7, 2019
b00472c
remove pd.fillna
sc1f Nov 7, 2019
7c92713
infer dates in C++, output as datetime.datetime
sc1f Nov 7, 2019
2e1dbdf
add tests for time series, make sure all column names in series are s…
sc1f Nov 8, 2019
cd9f31a
infer date/datetime from DateTimeIndex, remove check on hms
sc1f Nov 8, 2019
c5050c2
add more time index tests
sc1f Nov 8, 2019
709ab53
fix six.py2 string comp
sc1f Nov 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
remove pd.fillna
  • Loading branch information
@sc1f
sc1f committed Nov 7, 2019
commit b00472ce643f20a00e6accd6495059b7b8989351
3 changes: 0 additions & 3 deletions python/perspective/perspective/table/_accessor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,6 @@ def _type_to_format(data_or_schema):
# flatten column/index multiindex
df, _ = deconstruct_pandas(data_or_schema)

# try to squash object dtype as much as possible
df.fillna(value=numpy.nan, inplace=True)

return True, 1, {c: df[c].values for c in df.columns}


Expand Down
8 changes: 4 additions & 4 deletions python/perspective/perspective/tests/table/test_table_pandas.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ def test_table_dataframe_does_not_mutate(self):
assert tbl.size() == 4
assert tbl.schema() == {
"index": int,
"a": float,
"a": int,
"b": float
}

Expand Down Expand Up @@ -282,7 +282,7 @@ def test_table_pandas_transitive(self):
"a": [1, 2, 3, 4],
"b": [1.5, 2.5, 3.5, 4.5],
"c": [np.nan, np.nan, "abc", np.nan],
"d": [np.nan, True, np.nan, False],
"d": [None, True, None, False],
"e": [float("nan"), datetime(2019, 7, 11, 12, 30), float("nan"), datetime(2019, 7, 11, 12, 30)]
})

Expand All @@ -306,7 +306,7 @@ def test_table_pandas_object_to_int(self):
table = Table(df)
assert table.schema() == {
"index": int,
"a": float
"a": int
}
assert table.view().to_dict()["a"] == [1, 2, None, 2, None, 3, 4]

Expand All @@ -317,7 +317,7 @@ def test_table_pandas_object_to_float(self):
table = Table(df)
assert table.schema() == {
"index": int,
"a": float # None -> np.nan which is a float
"a": int
}
assert table.view().to_dict()["a"] == [None, 1.0, None, 2.0, None, 3.0, 4.0]

Expand Down