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

Add wrapper for scikit-learn Pipelines #323

Merged
merged 16 commits into from Dec 3, 2018

Conversation

Projects
None yet
3 participants
@bukosabino
Copy link
Member

bukosabino commented Nov 19, 2018

#163

@CLAassistant

This comment has been minimized.

Copy link

CLAassistant commented Nov 19, 2018

CLA assistant check
All committers have signed the CLA.

@kmax12 kmax12 changed the title Adding sklearn pipeline DFS Add wrapper for scikit-learn Pipelines Nov 19, 2018

@kmax12

This comment has been minimized.

Copy link
Member

kmax12 commented Nov 19, 2018

@bukosabino thank you!

looks like linting is causing tests to fail. can you run make lint locally until no errors come up? You make need to run make installdeps to install development dependencies first.

Currently, tests are failing with the following lint errors:

featuretools/tests/wrappers/test_sklearn_wrapper.py:18:37: E127 continuation line over-indented for visual indent
featuretools/tests/wrappers/test_sklearn_wrapper.py:19:37: E127 continuation line over-indented for visual indent
featuretools/tests/wrappers/test_sklearn_wrapper.py:22:39: E231 missing whitespace after ','
featuretools/tests/wrappers/test_sklearn_wrapper.py:25:5: E303 too many blank lines (2)
featuretools/tests/wrappers/test_sklearn_wrapper.py:29:33: E127 continuation line over-indented for visual indent
featuretools/tests/wrappers/test_sklearn_wrapper.py:34:57: E126 continuation line over-indented for hanging indent
featuretools/tests/wrappers/test_sklearn_wrapper.py:40:5: E303 too many blank lines (2)
featuretools/tests/wrappers/test_sklearn_wrapper.py:44:33: E127 continuation line over-indented for visual indent
featuretools/tests/wrappers/test_sklearn_wrapper.py:49:57: E126 continuation line over-indented for hanging indent
featuretools/tests/wrappers/test_sklearn_wrapper.py:55:5: E265 block comment should start with '# '
featuretools/tests/wrappers/test_sklearn_wrapper.py:55:5: E303 too many blank lines (2)
featuretools/tests/wrappers/test_sklearn_wrapper.py:63:5: E303 too many blank lines (2)
featuretools/tests/wrappers/test_sklearn_wrapper.py:66:32: E251 unexpected spaces around keyword / parameter equals
featuretools/tests/wrappers/test_sklearn_wrapper.py:66:34: E251 unexpected spaces around keyword / parameter equals
featuretools/tests/wrappers/test_sklearn_wrapper.py:67:32: E251 unexpected spaces around keyword / parameter equals
featuretools/tests/wrappers/test_sklearn_wrapper.py:67:34: E251 unexpected spaces around keyword / parameter equals
featuretools/tests/wrappers/test_sklearn_wrapper.py:75:5: E303 too many blank lines (2)
featuretools/wrappers/sklearn.py:183:28: E222 multiple spaces after operator
featuretools/wrappers/sklearn.py:220:24: E222 multiple spaces after operator
Makefile:9: recipe for target 'lint' failed
Show resolved Hide resolved featuretools/tests/wrappers/test_sklearn_wrapper.py Outdated
Show resolved Hide resolved featuretools/wrappers/sklearn.py Outdated
Show resolved Hide resolved featuretools/wrappers/sklearn.py Outdated
Show resolved Hide resolved featuretools/wrappers/sklearn.py Outdated
Show resolved Hide resolved featuretools/wrappers/sklearn.py
@codecov

This comment has been minimized.

Copy link

codecov bot commented Nov 21, 2018

Codecov Report

Merging #323 into master will increase coverage by 0.03%.
The diff coverage is 97.95%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #323      +/-   ##
==========================================
+ Coverage   95.25%   95.28%   +0.03%     
==========================================
  Files          71       74       +3     
  Lines        7689     7787      +98     
==========================================
+ Hits         7324     7420      +96     
- Misses        365      367       +2
Impacted Files Coverage Δ
featuretools/wrappers/api.py 100% <100%> (ø)
...eaturetools/tests/wrappers/test_sklearn_wrapper.py 100% <100%> (ø)
featuretools/wrappers/sklearn.py 95.65% <95.65%> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update b76056b...1837fdf. Read the comment docs.

@kmax12

This comment has been minimized.

Copy link
Member

kmax12 commented Nov 23, 2018

@bukosabino I think we need to support providing X as a list of cutoff times and not just instance ids. since the handling of time is one of featuretools key features. the logic would be: if it is a dataframe, pass to cutoff times argument. If it is a list or series pass to instance_ids argument.

bukosabino and others added some commits Nov 25, 2018

@kmax12

kmax12 approved these changes Dec 3, 2018

@kmax12

This comment has been minimized.

Copy link
Member

kmax12 commented Dec 3, 2018

Looks good. Merging!

@kmax12 kmax12 merged commit b3009ce into Featuretools:master Dec 3, 2018

3 checks passed

codecov/patch 97.95% of diff hit (target 95.25%)
Details
codecov/project 95.28% (+0.03%) compared to b76056b
Details
license/cla Contributor License Agreement is signed.
Details

@kmax12 kmax12 referenced this pull request Dec 3, 2018

Merged

Fix sklearn wrapper #335

@rwedge rwedge referenced this pull request Dec 17, 2018

Merged

v0.5.0 #351

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment