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

Update Catch 2 to a v3 version #973

Merged
merged 25 commits into from
May 19, 2023
Merged

Update Catch 2 to a v3 version #973

merged 25 commits into from
May 19, 2023

Conversation

alkino
Copy link
Member

@alkino alkino commented Nov 23, 2022

A lot of changes are needed because they break how catch2 from v2 to v3.
First of all, this is no more header-only but as a static library now.
Headers are split for compilation speed.

@iomaganaris
Copy link
Contributor

Just something I quickly noticed. Should the function table changes be in separate PR?

@alkino alkino closed this May 16, 2023
@alkino alkino reopened this May 16, 2023
@BlueBrain BlueBrain deleted a comment from bbpbuildbot May 16, 2023
@BlueBrain BlueBrain deleted a comment from bbpbuildbot May 16, 2023
@BlueBrain BlueBrain deleted a comment from bbpbuildbot May 16, 2023
@BlueBrain BlueBrain deleted a comment from bbpbuildbot May 16, 2023
@BlueBrain BlueBrain deleted a comment from bbpbuildbot May 16, 2023
@bbpbuildbot

This comment has been minimized.

.github/workflows/nmodl-ci.yml Show resolved Hide resolved
CMakeLists.txt Show resolved Hide resolved
setup.py Show resolved Hide resolved
Copy link
Contributor

@olupton olupton left a comment

Choose a reason for hiding this comment

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

I didn't spot anything in the diff, but the failing CI needs to be understood...

.github/workflows/nmodl-ci.yml Show resolved Hide resolved
CMakeLists.txt Show resolved Hide resolved
setup.py Show resolved Hide resolved
test/unit/newton/newton.cpp Outdated Show resolved Hide resolved
@olupton
Copy link
Contributor

olupton commented May 17, 2023

I didn't spot anything in the diff, but the failing CI needs to be understood...

(Slack is down)
I believe the problem with the CI is that your Spack branch makes nmodl@develop depend on catch2@3, but this conflicts with libsonata requiring catch2@2, so nmodl@develop is not used (even though it is marked as preferred) and we do not get the changes from this PR.
cc: @iomaganaris @alkino

@alkino alkino closed this May 17, 2023
@alkino alkino reopened this May 17, 2023
@bbpbuildbot

This comment has been minimized.

@bbpbuildbot

This comment has been minimized.

@bbpbuildbot

This comment has been minimized.

@alkino alkino closed this May 17, 2023
@alkino alkino reopened this May 17, 2023
@bbpbuildbot

This comment has been minimized.

@codecov
Copy link

codecov bot commented May 17, 2023

Codecov Report

Merging #973 (7971732) into master (6825acd) will increase coverage by 0.02%.
The diff coverage is 100.00%.

@@            Coverage Diff             @@
##           master     #973      +/-   ##
==========================================
+ Coverage   69.93%   69.95%   +0.02%     
==========================================
  Files         188      188              
  Lines       25639    25639              
==========================================
+ Hits        17931    17937       +6     
+ Misses       7708     7702       -6     
Impacted Files Coverage Δ
...est/unit/codegen/codegen_compatibility_visitor.cpp 100.00% <ø> (ø)
test/unit/codegen/codegen_helper.cpp 100.00% <ø> (ø)
test/unit/codegen/codegen_utils.cpp 100.00% <ø> (ø)
test/unit/codegen/main.cpp 100.00% <ø> (ø)
test/unit/codegen/transform.cpp 100.00% <ø> (ø)
test/unit/crout/crout.cpp 88.88% <ø> (ø)
test/unit/lexer/tokens.cpp 100.00% <ø> (ø)
test/unit/modtoken/modtoken.cpp 100.00% <ø> (ø)
test/unit/printer/printer.cpp 100.00% <ø> (ø)
test/unit/units/lexer.cpp 100.00% <ø> (ø)
... and 32 more

@alkino
Copy link
Member Author

alkino commented May 17, 2023

Alléluïa
So what next?
Merging the spack changes?

@alkino alkino closed this May 19, 2023
@alkino alkino reopened this May 19, 2023
@bbpbuildbot
Copy link
Collaborator

Logfiles from GitLab pipeline #125202 (:white_check_mark:) have been uploaded here!

Status and direct links:

@alkino alkino merged commit 74d7dbe into master May 19, 2023
@alkino alkino deleted the cornu/update_catch2 branch May 19, 2023 13:25
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.

4 participants