GreenPolyProducts/cantera
5
0
Fork 0
mirror of https://github.com/Cantera/cantera.git synced 2025-02-25 18:55:29 -06:00
Code Issues Packages Projects Releases Wiki Activity

[Python] Defer import of h5py until time of use

Browse Source 
This avoids potential conflicts between the versions of libhdf5 linked
to the Cantera library and h5py, which could occur when a C++ main
application made use of the Python ExtensibleRate class.
This commit is contained in:
Ray Speth
2022-12-20 16:10:51 -05:00
committed by Ray Speth
parent 0aca5f7004
commit f550faa477
5 changed files with 38 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
.github/workflows/main.yml vendored
View File

@@ -53,7 +53,7 @@ jobs:
run: |
python3 -m pip install ruamel.yaml scons==3.1.2 numpy cython pandas pytest \
pytest-github-actions-annotate-failures
python3 -m pip install h5py || python3 -m pip install --no-binary=h5py h5py
python3 -m pip install h5py
- name: Build Cantera
run: |
python3 `which scons` build env_vars=all -j2 debug=n --debug=time \
@@ -94,8 +94,7 @@ jobs:
run: python3 -m pip install -U pip setuptools wheel
- name: Install Python dependencies
run: |
python3 -m pip install ruamel.yaml scons numpy cython pandas pytest pytest-github-actions-annotate-failures
python3 -m pip install --no-binary=h5py h5py
python3 -m pip install ruamel.yaml scons numpy cython pandas h5py pytest pytest-github-actions-annotate-failures
- name: Build Cantera
run: python3 `which scons` build env_vars=all
CXX=clang++-12 CC=clang-12 f90_interface=n extra_lib_dirs=/usr/lib/llvm/lib
@@ -194,9 +193,8 @@ jobs:
run: python3 -m pip install -U pip setuptools wheel
- name: Install Python dependencies
run: |
python3 -m pip install ruamel.yaml scons numpy cython pandas scipy pytest \
python3 -m pip install ruamel.yaml scons numpy cython pandas scipy pytest h5py \
pytest-github-actions-annotate-failures pytest-cov gcovr
python3 -m pip install --no-binary=h5py h5py
- name: Setup .NET Core SDK
uses: actions/setup-dotnet@v2
with:
@@ -366,8 +364,7 @@ jobs:
run: python3 -m pip install -U pip setuptools wheel
- name: Install Python dependencies
run: |
python3 -m pip install ruamel.yaml scons numpy cython pandas matplotlib scipy
python3 -m pip install --no-binary=h5py h5py
python3 -m pip install ruamel.yaml scons numpy cython pandas matplotlib scipy h5py
- name: Build Cantera
# compile with GCC 9.4.0 on ubuntu-20.04 as an alternative to the default
# (GCC 7.5.0 is both default and oldest supported version)
@@ -619,9 +616,8 @@ jobs:
run: python3 -m pip install -U pip setuptools wheel
- name: Install Python dependencies
run: |
python3 -m pip install ruamel.yaml scons numpy cython pandas pytest \
python3 -m pip install ruamel.yaml scons numpy cython pandas h5py pytest \
pytest-github-actions-annotate-failures
python3 -m pip install --no-binary=h5py h5py
- name: Setup Intel oneAPI environment
run: |
source /opt/intel/oneapi/setvars.sh