update manifest #175
Closed
update manifest #175
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Strange - not seen this error before on the linux tests. It also doesn't come from your manifest changes as you only modify the example ones... rerunning |
|
see issue #176 |
bors bot
added a commit
that referenced
this pull request
Aug 31, 2022
177: Resolve scikit-learn conflict r=tsj5 a=tsj5 # PULL REQUEST ## Purpose and Content This PR fixes the problems encountered by `@szy21` in #175. The purpose of that PR was to update the Manifest for the examples (Project/Manifest for CES itself is unchanged). This PR uses `@szy21` 's updates and in addition pins the versions of scipy and scikit-learn installed through Conda.jl to avoid an incompatibility in libstdc++ (documented in #176). ## Benefits and Risks **Benefits**: Resolves #176. `@szy21's` original PR resolves #174. **Risks**: Introduces maintenance requirement of having to remember we've pinned the versions of some dependencies going forward; since these are python dependencies this information isn't in Project.toml, so we might forget about this in the future when we want/need to update scikit-learn. This is a very minor risk, as the functionality from sk-learn that we currently use is mature. ## Linked Issues - Closes #174, #176 ## PR Checklist - [X] This PR has a corresponding issue OR is linked to an SDI. - [X] I have followed CliMA's codebase [contribution](https://clima.github.io/ClimateMachine.jl/latest/Contributing/) and [style](https://clima.github.io/ClimateMachine.jl/latest/DevDocs/CodeStyle/) guidelines OR N/A. - [X] I have followed CliMA's [documentation policy](https://github.com/CliMA/policies/wiki/Documentation-Policy). - [X] I have checked all issues and PRs and I certify that this PR does not duplicate an open PR. - [X] I linted my code on my local machine prior to submission: N/A. - [X] Unit tests: N/A. - [X] Code used in an integration test. - [X] All tests ran successfully on my local machine. - [X] All classes, modules, and function contain docstrings: N/A. - [X] Documentation has been added/updated: N/A. Co-authored-by: szy21 <[email protected]>
| deps = ["AbstractMCMC", "AdvancedMH", "Conda", "Distributions", "DocStringExtensions", "EnsembleKalmanProcesses", "GaussianProcesses", "LinearAlgebra", "MCMCChains", "Printf", "PyCall", "Random", "ScikitLearn", "Statistics", "StatsBase"] | ||
| path = "../../.." | ||
| deps = ["AbstractMCMC", "AdvancedMH", "Conda", "Distributions", "DocStringExtensions", "EnsembleKalmanProcesses", "GaussianProcesses", "LinearAlgebra", "MCMCChains", "Pkg", "Printf", "PyCall", "Random", "ScikitLearn", "Statistics", "StatsBase"] | ||
| git-tree-sha1 = "5a93353fdc751a2116529e907316cc51275b77b8" |
There was a problem hiding this comment.
We probably don’t want to add CES in this way, deving makes more sense
There was a problem hiding this comment.
Do you mean just reverting this change?
bors bot
added a commit
that referenced
this pull request
Aug 31, 2022
177: Resolve scikit-learn conflict r=tsj5 a=tsj5 # PULL REQUEST ## Purpose and Content This PR fixes the problems encountered by `@szy21` in #175. The purpose of that PR was to update the Manifest for the examples (Project/Manifest for CES itself is unchanged). This PR uses `@szy21` 's updates and in addition pins the versions of scipy and scikit-learn installed through Conda.jl to avoid an incompatibility in libstdc++ (documented in #176). ## Benefits and Risks **Benefits**: Resolves #176. `@szy21's` original PR resolves #174. **Risks**: Introduces maintenance requirement of having to remember we've pinned the versions of some dependencies going forward; since these are python dependencies this information isn't in Project.toml, so we might forget about this in the future when we want/need to update scikit-learn. This is a very minor risk, as the functionality from sk-learn that we currently use is mature. ## Linked Issues - Closes #174, #176 ## PR Checklist - [X] This PR has a corresponding issue OR is linked to an SDI. - [X] I have followed CliMA's codebase [contribution](https://clima.github.io/ClimateMachine.jl/latest/Contributing/) and [style](https://clima.github.io/ClimateMachine.jl/latest/DevDocs/CodeStyle/) guidelines OR N/A. - [X] I have followed CliMA's [documentation policy](https://github.com/CliMA/policies/wiki/Documentation-Policy). - [X] I have checked all issues and PRs and I certify that this PR does not duplicate an open PR. - [X] I linted my code on my local machine prior to submission: N/A. - [X] Unit tests: N/A. - [X] Code used in an integration test. - [X] All tests ran successfully on my local machine. - [X] All classes, modules, and function contain docstrings: N/A. - [X] Documentation has been added/updated: N/A. Co-authored-by: szy21 <[email protected]>
bors bot
added a commit
that referenced
this pull request
Sep 1, 2022
177: Resolve scikit-learn conflict r=odunbar a=tsj5 # PULL REQUEST ## Purpose and Content This PR fixes the problems encountered by `@szy21` in #175. The purpose of that PR was to update the Manifest for the examples (Project/Manifest for CES itself is unchanged). This PR uses `@szy21` 's updates and in addition pins the versions of scipy and scikit-learn installed through Conda.jl to avoid an incompatibility in libstdc++ (documented in #176). ## Benefits and Risks **Benefits**: Resolves #176. `@szy21's` original PR resolves #174. **Risks**: Introduces maintenance requirement of having to remember we've pinned the versions of some dependencies going forward; since these are python dependencies this information isn't in Project.toml, so we might forget about this in the future when we want/need to update scikit-learn. This is a very minor risk, as the functionality from sk-learn that we currently use is mature. ## Linked Issues - Closes #174, #176 ## PR Checklist - [X] This PR has a corresponding issue OR is linked to an SDI. - [X] I have followed CliMA's codebase [contribution](https://clima.github.io/ClimateMachine.jl/latest/Contributing/) and [style](https://clima.github.io/ClimateMachine.jl/latest/DevDocs/CodeStyle/) guidelines OR N/A. - [X] I have followed CliMA's [documentation policy](https://github.com/CliMA/policies/wiki/Documentation-Policy). - [X] I have checked all issues and PRs and I certify that this PR does not duplicate an open PR. - [X] I linted my code on my local machine prior to submission: N/A. - [X] Unit tests: N/A. - [X] Code used in an integration test. - [X] All tests ran successfully on my local machine. - [X] All classes, modules, and function contain docstrings: N/A. - [X] Documentation has been added/updated: N/A. Co-authored-by: szy21 <[email protected]>
bors bot
added a commit
that referenced
this pull request
Sep 2, 2022
177: Resolve scikit-learn conflict r=tsj5 a=tsj5 # PULL REQUEST ## Purpose and Content This PR fixes the problems encountered by `@szy21` in #175. The purpose of that PR was to update the Manifest for the examples (Project/Manifest for CES itself is unchanged). This PR uses `@szy21` 's updates and in addition pins the versions of scipy and scikit-learn installed through Conda.jl to avoid an incompatibility in libstdc++ (documented in #176). ## Benefits and Risks **Benefits**: Resolves #176. `@szy21's` original PR resolves #174. **Risks**: Introduces maintenance requirement of having to remember we've pinned the versions of some dependencies going forward; since these are python dependencies this information isn't in Project.toml, so we might forget about this in the future when we want/need to update scikit-learn. This is a very minor risk, as the functionality from sk-learn that we currently use is mature. ## Linked Issues - Closes #174, #176 ## PR Checklist - [X] This PR has a corresponding issue OR is linked to an SDI. - [X] I have followed CliMA's codebase [contribution](https://clima.github.io/ClimateMachine.jl/latest/Contributing/) and [style](https://clima.github.io/ClimateMachine.jl/latest/DevDocs/CodeStyle/) guidelines OR N/A. - [X] I have followed CliMA's [documentation policy](https://github.com/CliMA/policies/wiki/Documentation-Policy). - [X] I have checked all issues and PRs and I certify that this PR does not duplicate an open PR. - [X] I linted my code on my local machine prior to submission: N/A. - [X] Unit tests: N/A. - [X] Code used in an integration test. - [X] All tests ran successfully on my local machine. - [X] All classes, modules, and function contain docstrings: N/A. - [X] Documentation has been added/updated: N/A. Co-authored-by: szy21 <[email protected]>
|
@szy21 Hey! Could you resolve Charlie's comment, merge and try bors again - should be working now after PR 177 |
| path = "../.." | ||
| [[deps.CalibrateEmulateSample]] | ||
| deps = ["AbstractMCMC", "AdvancedMH", "Conda", "Distributions", "DocStringExtensions", "EnsembleKalmanProcesses", "GaussianProcesses", "LinearAlgebra", "MCMCChains", "Pkg", "Printf", "PyCall", "Random", "ScikitLearn", "Statistics", "StatsBase"] | ||
| git-tree-sha1 = "5a93353fdc751a2116529e907316cc51275b77b8" |
Yep, I just came back. Will do it today! |
|
Apologies if I'm on a different page here, but I think this PR isn't needed any more now that #177 was merged -- I wrote #177 by taking all of @szy21 's Manifest updates and pinning the sklearn version, so 177 should contain everything @szy21 has added. The mistake @charleskawczynski caught above (not referring to a local, |
|
Oh ok, I just came back and need to catch up. Thanks @tsj5! I will close it then. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Closes #174