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

Jump to bottom

Test pandas 1.0 release candidate #844

Merged
merged 11 commits into from Jan 31, 2020
Merged

Test pandas 1.0 release candidate #844

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
52a96c5
Update requirements.txt
rwedge Jan 17, 2020
6d76499
fix some issues with pandas 1.0.0rc0
frances-h Jan 22, 2020
d823454
unpin pandas version, add versioning test for cli
frances-h Jan 30, 2020
8d02bc4
Merge branch 'master' into Pandas100rc
frances-h Jan 30, 2020
41a56b4
update dask requirement
frances-h Jan 30, 2020
c803a6d
update version check
frances-h Jan 30, 2020
acf34dc
fix build doc error and keep index names
frances-h Jan 30, 2020
344ab4d
add packaging and lint
frances-h Jan 30, 2020
708a166
Update calculate_feature_matrix.py
frances-h Jan 30, 2020
fca30e0
lint
frances-h Jan 31, 2020
fefbe91
remove packaging, changelog
frances-h Jan 31, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 7 additions & 2 deletions featuretools/__main__.py
View file
Open in desktop
@@ -1,6 +1,7 @@
import click
import pandas as pd
import pkg_resources
from packaging import version
frances-h marked this conversation as resolved.
Show resolved Hide resolved

import featuretools
from featuretools.utils.cli_utils import print_info
Expand All @@ -18,8 +19,12 @@ def info():

@click.command(name='list-primitives')
def list_primitives():
with pd.option_context('display.max_rows', None, 'display.max_columns', None, 'display.max_colwidth', -1, 'display.width', 1000):
print(featuretools.list_primitives())
if version.parse(pd.__version__) < version.parse('1.0.0rc0'):
with pd.option_context('display.max_rows', None, 'display.max_columns', None, 'display.max_colwidth', -1, 'display.width', 1000):
frances-h marked this conversation as resolved.
Show resolved Hide resolved
print(featuretools.list_primitives())
else:
with pd.option_context('display.max_rows', None, 'display.max_columns', None, 'display.max_colwidth', None, 'display.width', 1000):
print(featuretools.list_primitives())


cli.add_command(list_primitives)
Expand Down
2 changes: 1 addition & 1 deletion featuretools/computational_backends/calculate_feature_matrix.py
View file
Open in desktop
Expand Up @@ -280,7 +280,7 @@ def calculate_feature_matrix(features, entityset=None, cutoff_time=None, instanc
progress_callback=progress_callback)

# ensure rows are sorted by input order
feature_matrix = feature_matrix.reindex(cutoff_time[["instance_id", "time"]])
feature_matrix = feature_matrix.reindex(pd.MultiIndex.from_frame(cutoff_time[["instance_id", "time"]]))
if not cutoff_time_in_index:
feature_matrix.reset_index(level='time', drop=True, inplace=True)

Expand Down
2 changes: 1 addition & 1 deletion featuretools/entityset/deserialize.py
View file
Open in desktop
Expand Up @@ -35,7 +35,7 @@ def description_to_variable(description, entity=None):
if entity is not None:
kwargs = {} if is_type_string else description['type']
variable = variable(description['id'], entity, **kwargs)
interesting_values = pd.read_json(description['properties']['interesting_values'])
interesting_values = pd.read_json(description['properties']['interesting_values'], typ='series')
variable.interesting_values = interesting_values
return variable

Expand Down
4 changes: 2 additions & 2 deletions featuretools/tests/computational_backend/test_calculate_feature_matrix.py
View file
Open in desktop
Expand Up @@ -168,7 +168,7 @@ def test_cfm_no_cutoff_time_index(es):
cutoff_time_in_index=False,
approximate=Timedelta(12, 's'),
cutoff_time=cutoff_time)
assert feature_matrix.index.name == 'id'
assert feature_matrix.index.name == 'instance_id'
assert feature_matrix.index.values.tolist() == [0, 2]
assert feature_matrix[dfeat.get_name()].tolist() == [10, 10]
assert feature_matrix[agg_feat.get_name()].tolist() == [5, 1]
Expand All @@ -182,7 +182,7 @@ def test_cfm_no_cutoff_time_index(es):
cutoff_time_in_index=False,
approximate=Timedelta(10, 's'),
cutoff_time=cutoff_time)
assert feature_matrix_2.index.name == 'id'
assert feature_matrix_2.index.name == 'instance_id'
assert feature_matrix_2.index.tolist() == [0, 2]
assert feature_matrix_2[dfeat.get_name()].tolist() == [7, 10]
assert feature_matrix_2[agg_feat.get_name()].tolist() == [5, 1]
Expand Down