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

Fix various CI issues #1399

Merged
merged 3 commits into from Sep 29, 2022
Merged

Fix various CI issues #1399

merged 3 commits into from Sep 29, 2022

Conversation

speth
Copy link
Member

@speth speth commented Sep 28, 2022

Changes proposed in this pull request

  • Fix compatibility with setuptools >= 65.4.0
  • Fix compiler warnings on Windows and macOS
  • Add testing of the .NET interface on all OSes deferred for now

If applicable, fill in the issue number this pull request is fixing

Closes #1397

If applicable, provide an example illustrating new features this pull request is introducing

Checklist

  • The pull request includes a clear description of this code change
  • Commit messages have short titles and reference relevant issues
  • Build passes (scons build & scons test) and unit tests address code coverage
  • Style & formatting of contributed code follows contributing guidelines
  • The pull request is ready for review

@codecov
Copy link

codecov bot commented Sep 28, 2022

Codecov Report

Merging #1399 (054fabb) into main (7684653) will decrease coverage by 0.00%.
The diff coverage is 68.75%.

@@            Coverage Diff             @@
##             main    #1399      +/-   ##
==========================================
- Coverage   71.03%   71.03%   -0.01%     
==========================================
  Files         363      363              
  Lines       51898    51900       +2     
  Branches    17366    17369       +3     
==========================================
+ Hits        36868    36869       +1     
- Misses      12683    12684       +1     
  Partials     2347     2347              
Impacted Files Coverage Δ
src/equil/vcs_solve.cpp 66.14% <ø> (-0.04%) ⬇️
src/equil/vcs_solve_TP.cpp 61.65% <ø> (-0.05%) ⬇️
src/oneD/IonFlow.cpp 50.61% <ø> (-0.61%) ⬇️
src/transport/GasTransport.cpp 83.53% <42.85%> (ø)
src/numerics/AdaptivePreconditioner.cpp 69.84% <50.00%> (ø)
src/zeroD/IdealGasConstPressureMoleReactor.cpp 73.22% <66.66%> (-0.38%) ⬇️
src/zeroD/Reactor.cpp 86.50% <66.66%> (-0.23%) ⬇️
src/zeroD/IdealGasMoleReactor.cpp 92.30% <71.42%> (-0.55%) ⬇️
src/thermo/Elements.cpp 88.00% <100.00%> (ø)
src/zeroD/MoleReactor.cpp 90.66% <100.00%> (ø)
... and 1 more

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

@ischoegl
Copy link
Member

ischoegl commented Sep 28, 2022

@speth … thanks for addressing these! Regarding the remaining failing examples runners, I cherry-picked @bryanwweber’s fix to #1384 (which should be ready to merge).

@speth speth force-pushed the win-setuptools-65.4.0 branch 5 times, most recently from 0f8b616 to 3cd4e0b Compare September 29, 2022 00:54
For some reason, setuptools thinks it needs to be able to find the user's
home directory to build a wheel, but on Windows this relies on an environment
variable (USERPROFILE) that we weren't by default passing in through SCons.
@speth speth force-pushed the win-setuptools-65.4.0 branch 2 times, most recently from e794706 to 054fabb Compare September 29, 2022 17:44
@speth speth marked this pull request as ready for review September 29, 2022 18:02
Copy link
Member

@ischoegl ischoegl left a comment

Choose a reason for hiding this comment

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

LGTM, thanks!

@ischoegl ischoegl merged commit 332bb9b into Cantera:main Sep 29, 2022
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.

SCons fails on Windows
2 participants