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.

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

MRG, API: Deprecate n_pca_components in init #8356

Merged
merged 5 commits into from Oct 14, 2020
Merged

Conversation

larsoner
Copy link
Member

Closes #8355

@larsoner
Copy link
Member Author

Updated docs: https://22673-1301584-gh.circle-artifacts.com/0/dev/generated/mne.preprocessing.ICA.html (CircleCI failure is just a broken link that I fixed with a [ci skip] commit)

cbrnr
cbrnr approved these changes Oct 12, 2020
@larsoner
Copy link
Member Author

@hoechenberger can you review and merge if you're happy?

@larsoner
Copy link
Member Author

@hoechenberger it looks like somehow you killed the branch. Were you trying to resolve conflicts? If so I'll just locally rebase and fix

@larsoner
Copy link
Member Author

... and cherry pick 6f23aa4

@hoechenberger
Copy link
Member

@hoechenberger it looks like somehow you killed the branch. Were you trying to resolve conflicts? If so I'll just locally rebase and fix

Ouch. Nope, I just pulled. I can revert, sorry.

@hoechenberger
Copy link
Member

Guess I pulled the wrong branch.

@larsoner
Copy link
Member Author

I can push force it back to how it was. Did you have some commits you wanted on top like 3073f10 or 6f23aa4?

@hoechenberger
Copy link
Member

I can push force it back to how it was. Did you have some commits you wanted on top like 3073f10 or 6f23aa4?

Ok that would be the easiest, thank you :) Yes only these two commits, that's all I had to contribute!

@larsoner
Copy link
Member Author

Done, okay to merge once CircleCI comes back green @hoechenberger ?

@hoechenberger
Copy link
Member

Perfect! LGTM once CI goes green.

@hoechenberger
Copy link
Member

Done, okay to merge once CircleCI comes back green @hoechenberger ?

Yep!

@larsoner larsoner merged commit c2d9a3f into mne-tools:master Oct 14, 2020
2 of 4 checks passed
@larsoner larsoner deleted the ica branch October 14, 2020 13:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Remove n_pca_components from ICA.__init__
3 participants