Skip to content

Fix Conda packaging issues#1511

Merged
ischoegl merged 12 commits intoCantera:mainfrom
speth:cleanup-for-conda
Jun 27, 2023
Merged

Fix Conda packaging issues#1511
ischoegl merged 12 commits intoCantera:mainfrom
speth:cleanup-for-conda

Conversation

@speth
Copy link
Copy Markdown
Member

@speth speth commented Jun 22, 2023

Changes proposed in this pull request

This is a companion to Cantera/conda-recipes#44 for updates that need to be made in the main Cantera repository.

Note: I've also pushed this branch to the Cantera/cantera repository to allow me to run the Conda packaging CI against this branch. This will be deleted later.

  • Eliminate CT_HAS_PYTHON preprocessor variable to enable more efficient incremental builds
  • Install cantera_shared.dll to the Library\bin directory, where all the other conda package DLLs go
  • Fix propagation of compiler flags for MSVC in generated SConstruct / CMakeLists.txt files
  • Fix include/lib dirs in the generated build scripts (updates from Fix Ubuntu packaging issues #1509 were a bit too aggressive in trimming these)
  • Don't use SO-versioning for the shim library used to load the Python module from C++
  • Fix some compiler warnings on Windows related to integer sizes
  • Fix loading the Python "shim" library when installed as a Conda package

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
Copy Markdown

codecov bot commented Jun 22, 2023

Codecov Report

Merging #1511 (e0157a0) into main (d717e8b) will decrease coverage by 0.01%.
The diff coverage is 92.30%.

@@            Coverage Diff             @@
##             main    #1511      +/-   ##
==========================================
- Coverage   70.46%   70.46%   -0.01%     
==========================================
  Files         375      375              
  Lines       58405    58408       +3     
  Branches    20899    20901       +2     
==========================================
  Hits        41158    41158              
- Misses      14227    14228       +1     
- Partials     3020     3022       +2     
Impacted Files Coverage Δ
src/base/SolutionArray.cpp 78.78% <ø> (ø)
src/zeroD/MoleReactor.cpp 89.30% <50.00%> (-0.49%) ⬇️
include/cantera/base/SolutionArray.h 94.44% <100.00%> (ø)
src/clib/Cabinet.h 48.11% <100.00%> (-1.89%) ⬇️
src/zeroD/IdealGasConstPressureMoleReactor.cpp 75.32% <100.00%> (+0.16%) ⬆️
src/zeroD/IdealGasMoleReactor.cpp 90.57% <100.00%> (+0.06%) ⬆️

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

@speth speth force-pushed the cleanup-for-conda branch 3 times, most recently from 1066187 to fce66b1 Compare June 22, 2023 20:39
speth added 2 commits June 23, 2023 11:56
This speeds up some incremental builds when switching between configurations
with and without the Python module, as done during Conda packaging.
This library is always loaded using the unversioned name.
@speth speth force-pushed the cleanup-for-conda branch 3 times, most recently from 9e7907f to 700624c Compare June 27, 2023 00:41
@speth speth force-pushed the cleanup-for-conda branch from 700624c to e0157a0 Compare June 27, 2023 00:43
@speth speth marked this pull request as ready for review June 27, 2023 02:56
Copy link
Copy Markdown
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.

Thanks, @speth! Changes all look good to me.

@ischoegl ischoegl merged commit f7383e1 into Cantera:main Jun 27, 2023
@ischoegl ischoegl mentioned this pull request Jun 27, 2023
5 tasks
@speth speth deleted the cleanup-for-conda branch June 27, 2023 18:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

No open projects

Development

Successfully merging this pull request may close these issues.

2 participants