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

Updating csd-1000r to contain a sufficient number of sample, use the … #123

Merged
merged 2 commits into from
May 20, 2022

Conversation

rosecers
Copy link
Collaborator

@rosecers rosecers commented Dec 6, 2021

…new syntax, and contain up-to-date docs

@rosecers rosecers requested a review from agoscinski December 6, 2021 17:34
@rosecers rosecers force-pushed the fix_csd1000r branch 12 times, most recently from ab279b0 to 70cc69e Compare December 7, 2021 13:15
@rosecers rosecers requested a review from Luthaf May 13, 2022 14:32
@Luthaf
Copy link
Collaborator

Luthaf commented May 13, 2022

This branch conflicts with the main branch, can you rebase it?

@rosecers rosecers force-pushed the fix_csd1000r branch 3 times, most recently from 0a86d48 to 6568e79 Compare May 16, 2022 11:36
@Luthaf
Copy link
Collaborator

Luthaf commented May 16, 2022

The documentation build error is the same one I saw in #129 and fixed in c10df02. Let's maybe merge #129 first, and then rebase this branch?

@rosecers
Copy link
Collaborator Author

rosecers commented May 16, 2022 via email

@rosecers rosecers force-pushed the fix_csd1000r branch 2 times, most recently from f395b1a to 8441ac0 Compare May 16, 2022 12:14
@rosecers rosecers force-pushed the fix_csd1000r branch 2 times, most recently from a42d2a3 to ae695e9 Compare May 16, 2022 13:29
skcosmo/datasets/descr/csd-1000r.rst Outdated Show resolved Hide resolved
skcosmo/datasets/descr/csd-1000r.rst Outdated Show resolved Hide resolved
…new syntax, and contain up-to-date docs

Replacing csd in sample selection with california because the larger dataset means a few redundant samples, which is not good for stable testing

Using literal include

Update skcosmo/datasets/descr/csd-1000r.rst

Co-authored-by: Guillaume Fraux <luthaf@luthaf.fr>
@rosecers rosecers requested a review from Luthaf May 18, 2022 16:14
@rosecers rosecers merged commit f433e28 into main May 20, 2022
@rosecers rosecers deleted the fix_csd1000r branch May 20, 2022 14:08
victorprincipe pushed a commit that referenced this pull request May 23, 2022
#123)

* Removed boston dataset from tests and examples`

* Updating csd-1000r to contain a sufficient number of sample, use the new syntax, and contain up-to-date docs

Replacing csd in sample selection with california because the larger dataset means a few redundant samples, which is not good for stable testing

Using literal include

Update skcosmo/datasets/descr/csd-1000r.rst

Co-authored-by: Guillaume Fraux <luthaf@luthaf.fr>

Co-authored-by: Guillaume Fraux <luthaf@luthaf.fr>
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.

2 participants