Skip to content

Cherry-pick multiple commits to make release/8.2 functional#2074

Merged
nrnhines merged 4 commits into
release/8.2from
magkanar/8.2_poolshrink
Nov 9, 2022
Merged

Cherry-pick multiple commits to make release/8.2 functional#2074
nrnhines merged 4 commits into
release/8.2from
magkanar/8.2_poolshrink

Conversation

@iomaganaris

@iomaganaris iomaganaris commented Nov 9, 2022 •
edited
Loading

Copy link
Copy Markdown
Member

Cherry-picked following commits from master to make the CI in release/8.2 functional + poolshrink commit:

nrnhines
nrnhines approved these changes Nov 9, 2022
View reviewed changes

@nrnhines nrnhines left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems ok to me. Seems to have same issues as my #2073. So need to cherry pick the master fixes of one or the other and then merge.

@azure-pipelines

azure-pipelines Bot commented Nov 9, 2022

Copy link
Copy Markdown

✔️ 5607bd5583ddad50bc468bf7f449020e9d3c5d5d -> Azure artifacts URL

@iomaganaris

iomaganaris commented Nov 9, 2022 •
edited
Loading

Copy link
Copy Markdown
Member Author

Seems ok to me. Seems to have same issues as my #2073. So need to cherry pick the master fixes of one or the other and then merge.

Do you know which commits are needed to fix the CI? If yes I can cherry-pick them and add them into this or another PR otherwise I can try which commits are needed myself

@alexsavulescu

alexsavulescu commented Nov 9, 2022

Copy link
Copy Markdown
Member

Seems ok to me. Seems to have same issues as my #2073. So need to cherry pick the master fixes of one or the other and then merge.

Do you know which commits are needed to fix the CI? If yes I can cherry-pick them and add them into this or another PR otherwise I can try which commits are needed myself

Haven't looked it, but the error looks familiar to me

@olupton

olupton commented Nov 9, 2022

Copy link
Copy Markdown
Collaborator

Seems ok to me. Seems to have same issues as my #2073. So need to cherry pick the master fixes of one or the other and then merge.

Do you know which commits are needed to fix the CI? If yes I can cherry-pick them and add them into this or another PR otherwise I can try which commits are needed myself

Haven't looked it, but the error looks familiar to me

I think the docs needs #2048 and the ASan job needs the return statement deletion from #2041

@iomaganaris iomaganaris force-pushed the magkanar/8.2_poolshrink branch from 5607bd5 to 7076eb7 Compare November 9, 2022 16:25
@iomaganaris

iomaganaris commented Nov 9, 2022 •
edited
Loading

Copy link
Copy Markdown
Member Author

I think the docs needs #2048 and the ASan job needs the return statement deletion from #2041

Okay, let's see. Thank you!

@alexsavulescu

alexsavulescu commented Nov 9, 2022

Copy link
Copy Markdown
Member

It's #2048

@iomaganaris iomaganaris force-pushed the magkanar/8.2_poolshrink branch 2 times, most recently from 418c23d to 587ce44 Compare November 9, 2022 17:04
alexsavulescu and others added 4 commits November 9, 2022 18:19
@alexsavulescu @iomaganaris
refactoring: drop java code (#1937)
d351aeb 
* refactoring: drop java code

* Update removed_features.rst
@olupton @iomaganaris
Fine tune clang-format and fix CI (#2041)
c861be6 
* declarePtrList / implementPtrList
* declareList / implementList
* Delete return statement to avoid ASan error.
@nrnhines @alexsavulescu @iomaganaris
CVode.poolshrink(1) deletes unused mechanism pools. (#2033)
2e52ffc 
* CVode.poolshrink(1) deletes unused mechanism pools.

Co-authored-by: Alexandru Săvulescu <alexandru.savulescu@epfl.ch>
@olupton @iomaganaris
Pin bokeh<3, don't pin matplotlib (#2048)
3a5e868 
* Add list(...) for new matplotlib.
@iomaganaris iomaganaris force-pushed the magkanar/8.2_poolshrink branch from 587ce44 to 3a5e868 Compare November 9, 2022 17:21
@iomaganaris iomaganaris changed the title Cherry-pick poolshrink commit to release/8.2 Cherry-pick multiple commits to make release/8.2 functional Nov 9, 2022
@azure-pipelines

azure-pipelines Bot commented Nov 9, 2022

Copy link
Copy Markdown

✔️ 3a5e868 -> Azure artifacts URL

@nrnhines nrnhines merged commit eb19ae0 into release/8.2 Nov 9, 2022
@nrnhines nrnhines deleted the magkanar/8.2_poolshrink branch November 9, 2022 18:28
alexsavulescu added a commit that referenced this pull request Dec 15, 2022
@iomaganaris @alexsavulescu
@olupton @nrnhines
Cherry-pick multiple commits to make release/8.2 functional (#2074)
a921c4e 
* refactoring: drop java code (#1937)

* Update removed_features.rst

* Fine tune clang-format and fix CI (#2041)

* Delete return statement to avoid ASan error.

* CVode.poolshrink(1) deletes unused mechanism pools. (#2033)

* Pin bokeh<3, don't pin matplotlib (#2048)

* Add list(...) for new matplotlib.

Co-authored-by: Alexandru Săvulescu <alexandru.savulescu@epfl.ch>
Co-authored-by: Olli Lupton <oliver.lupton@epfl.ch>
Co-authored-by: nrnhines <michael.hines@yale.edu>
@alexsavulescu alexsavulescu mentioned this pull request Dec 15, 2022
Closed
25 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@nrnhines nrnhines nrnhines approved these changes
@alexsavulescu alexsavulescu alexsavulescu approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@iomaganaris @alexsavulescu @olupton @nrnhines