add optional graphviz dependency to build pipelines

This commit is contained in:
Niclas Garan 2023-10-06 04:13:36 +02:00 committed by Ray Speth
parent 92609d8475
commit 9a7af06221
4 changed files with 17 additions and 14 deletions

View File

@ -92,7 +92,7 @@ jobs:
- name: Install Python dependencies - name: Install Python dependencies
run: | run: |
python3 -m pip install ruamel.yaml scons==3.1.2 numpy cython pandas pytest \ python3 -m pip install ruamel.yaml scons==3.1.2 numpy cython pandas pytest \
pytest-github-actions-annotate-failures pint pytest-github-actions-annotate-failures pint graphviz
- name: Build Cantera - name: Build Cantera
run: | run: |
python3 `which scons` build env_vars=all -j2 debug=n --debug=time \ python3 `which scons` build env_vars=all -j2 debug=n --debug=time \
@ -141,7 +141,7 @@ jobs:
run: python3 -m pip install -U pip setuptools wheel run: python3 -m pip install -U pip setuptools wheel
- name: Install Python dependencies - name: Install Python dependencies
run: | run: |
python3 -m pip install ruamel.yaml scons numpy cython pandas pytest pytest-github-actions-annotate-failures pint python3 -m pip install ruamel.yaml scons numpy cython pandas pytest pytest-github-actions-annotate-failures pint graphviz
- name: Build Cantera - name: Build Cantera
run: python3 `which scons` build env_vars=all run: python3 `which scons` build env_vars=all
CXX=clang++-14 CC=clang-14 f90_interface=n extra_lib_dirs=/usr/lib/llvm/lib CXX=clang++-14 CC=clang-14 f90_interface=n extra_lib_dirs=/usr/lib/llvm/lib
@ -192,7 +192,7 @@ jobs:
run: $PYTHON_CMD -m pip install -U pip setuptools wheel run: $PYTHON_CMD -m pip install -U pip setuptools wheel
- name: Install Python dependencies - name: Install Python dependencies
run: | run: |
$PYTHON_CMD -m pip install ruamel.yaml numpy cython pandas pytest pytest-github-actions-annotate-failures pint $PYTHON_CMD -m pip install ruamel.yaml numpy cython pandas pytest pytest-github-actions-annotate-failures pint graphviz
- name: Install Python dependencies for GH Python - name: Install Python dependencies for GH Python
if: matrix.python-version == '3.11' if: matrix.python-version == '3.11'
run: run:
@ -241,7 +241,7 @@ jobs:
- name: Install Python dependencies - name: Install Python dependencies
run: | 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 \
pytest-github-actions-annotate-failures pytest-cov gcovr pint pytest-github-actions-annotate-failures pytest-cov gcovr pint graphviz
- name: Setup .NET Core SDK - name: Setup .NET Core SDK
uses: actions/setup-dotnet@v2 uses: actions/setup-dotnet@v2
with: with:
@ -412,7 +412,7 @@ jobs:
run: python3 -m pip install -U pip setuptools wheel run: python3 -m pip install -U pip setuptools wheel
- name: Install Python dependencies - name: Install Python dependencies
run: | run: |
python3 -m pip install numpy ruamel.yaml pandas matplotlib scipy pint python3 -m pip install numpy ruamel.yaml pandas matplotlib scipy pint graphviz
python3 -m pip install --pre --no-index --find-links dist cantera python3 -m pip install --pre --no-index --find-links dist cantera
- name: Run the examples - name: Run the examples
# See https://unix.stackexchange.com/a/392973 for an explanation of the -exec part # See https://unix.stackexchange.com/a/392973 for an explanation of the -exec part
@ -476,7 +476,7 @@ jobs:
run: | run: |
conda install -q sundials=${{ matrix.sundials-ver }} scons numpy ruamel.yaml \ conda install -q sundials=${{ matrix.sundials-ver }} scons numpy ruamel.yaml \
cython boost-cpp fmt=${{ matrix.fmt-ver }} eigen yaml-cpp pandas \ cython boost-cpp fmt=${{ matrix.fmt-ver }} eigen yaml-cpp pandas \
libgomp openblas pytest highfive libgomp openblas pytest highfive python-graphviz
- name: Build Cantera - name: Build Cantera
run: | run: |
scons build system_fmt=y system_eigen=y system_yamlcpp=y system_sundials=y \ scons build system_fmt=y system_eigen=y system_yamlcpp=y system_sundials=y \
@ -545,7 +545,7 @@ jobs:
# use boost-cpp rather than boost from conda-forge # use boost-cpp rather than boost from conda-forge
# Install SCons >=4.4.0 to make sure that MSVC_TOOLSET_VERSION variable is present # Install SCons >=4.4.0 to make sure that MSVC_TOOLSET_VERSION variable is present
run: | run: |
mamba install -q '"scons>=4.4.0"' numpy cython ruamel.yaml boost-cpp eigen yaml-cpp pandas pytest highfive pint fmt=${{ matrix.fmt-ver }} mamba install -q '"scons>=4.4.0"' numpy cython ruamel.yaml boost-cpp eigen yaml-cpp pandas pytest highfive pint python-graphviz fmt=${{ matrix.fmt-ver }}
shell: pwsh shell: pwsh
- name: Build Cantera - name: Build Cantera
run: scons build system_eigen=y system_yamlcpp=y system_highfive=y logging=debug run: scons build system_eigen=y system_yamlcpp=y system_highfive=y logging=debug
@ -610,7 +610,7 @@ jobs:
- name: Install Python dependencies - name: Install Python dependencies
run: | run: |
python -m pip install -U pip setuptools wheel python -m pip install -U pip setuptools wheel
python -m pip install '"scons<4.4.0"' pypiwin32 numpy ruamel.yaml cython pandas pytest pytest-github-actions-annotate-failures python -m pip install '"scons<4.4.0"' pypiwin32 numpy ruamel.yaml cython pandas graphviz pytest pytest-github-actions-annotate-failures
- name: Restore Boost cache - name: Restore Boost cache
uses: actions/cache@v3 uses: actions/cache@v3
id: cache-boost id: cache-boost
@ -674,7 +674,7 @@ jobs:
- name: Install Python dependencies - name: Install Python dependencies
run: | run: |
python3 -m pip install ruamel.yaml scons numpy cython pandas pytest \ python3 -m pip install ruamel.yaml scons numpy cython pandas pytest \
pytest-github-actions-annotate-failures pint pytest-github-actions-annotate-failures pint graphviz
- name: Setup Intel oneAPI environment - name: Setup Intel oneAPI environment
run: | run: |
source /opt/intel/oneapi/setvars.sh source /opt/intel/oneapi/setvars.sh
@ -707,7 +707,7 @@ jobs:
- name: Install Python dependencies - name: Install Python dependencies
run: | run: |
python -m pip install -U pip setuptools wheel python -m pip install -U pip setuptools wheel
python -m pip install scons pypiwin32 numpy ruamel.yaml cython h5py pandas pytest pytest-github-actions-annotate-failures pint python -m pip install scons pypiwin32 numpy ruamel.yaml cython h5py pandas pytest pytest-github-actions-annotate-failures pint graphviz
- name: Restore Boost cache - name: Restore Boost cache
uses: actions/cache@v3 uses: actions/cache@v3
id: cache-boost id: cache-boost

View File

@ -38,7 +38,7 @@ jobs:
- name: Install Python dependencies - name: Install Python dependencies
run: | run: |
python3 -m pip install ruamel.yaml scons numpy pandas pytest pint \ python3 -m pip install ruamel.yaml scons numpy pandas pytest pint \
pytest-github-actions-annotate-failures pytest-github-actions-annotate-failures graphviz
python3 -m pip install --pre cython python3 -m pip install --pre cython
- name: Build Cantera - name: Build Cantera
run: python3 `which scons` build env_vars=all run: python3 `which scons` build env_vars=all
@ -80,7 +80,7 @@ jobs:
libboost-dev gfortran libopenmpi-dev libpython3-dev \ libboost-dev gfortran libopenmpi-dev libpython3-dev \
libblas-dev liblapack-dev libhdf5-dev libfmt-dev libyaml-cpp-dev \ libblas-dev liblapack-dev libhdf5-dev libfmt-dev libyaml-cpp-dev \
libgtest-dev libgmock-dev libeigen3-dev libsundials-dev \ libgtest-dev libgmock-dev libeigen3-dev libsundials-dev \
cython3 python3-numpy python3-pandas python3-pint \ cython3 python3-numpy python3-pandas python3-pint python3-graphviz \
python3-ruamel.yaml python3-setuptools python3-wheel python3-pytest python3-ruamel.yaml python3-setuptools python3-wheel python3-pytest
gcc --version gcc --version
- name: Install Python dependencies - name: Install Python dependencies
@ -122,7 +122,8 @@ jobs:
gcc-fortran gmock-devel gtest-devel python3 python3-cython \ gcc-fortran gmock-devel gtest-devel python3 python3-cython \
python3-devel python3-numpy python3-pandas python3-pint python3-pip \ python3-devel python3-numpy python3-pandas python3-pint python3-pip \
python3-pytest python3-ruamel-yaml python3-scipy python3-scons \ python3-pytest python3-ruamel-yaml python3-scipy python3-scons \
python3-wheel sundials-devel yaml-cpp-devel hdf5-devel highfive-devel python3-wheel sundials-devel yaml-cpp-devel hdf5-devel highfive-devel \
python3-graphviz
- name: Build Cantera - name: Build Cantera
run: | run: |
scons build -j2 debug=n --debug=time python_package=full f90_interface=y \ scons build -j2 debug=n --debug=time python_package=full f90_interface=y \
@ -169,7 +170,7 @@ jobs:
- name: Install Python dependencies - name: Install Python dependencies
run: | run: |
python3 -m pip install ruamel.yaml scons numpy cython pandas pytest \ python3 -m pip install ruamel.yaml scons numpy cython pandas pytest \
pytest-github-actions-annotate-failures pint pytest-github-actions-annotate-failures pint graphviz
- name: Build Cantera - name: Build Cantera
run: | run: |
python3 `which scons` build env_vars=all -j2 debug=n --debug=time \ python3 `which scons` build env_vars=all -j2 debug=n --debug=time \

View File

@ -63,6 +63,7 @@ cantera.examples = *.txt
[options.extras_require] [options.extras_require]
pandas = pandas pandas = pandas
units = pint units = pint
graphviz = python-graphviz
[options.entry_points] [options.entry_points]
console_scripts = console_scripts =

View File

@ -68,6 +68,7 @@ cantera = *.cpp, *.h, *.pyx
[options.extras_require] [options.extras_require]
pandas = pandas pandas = pandas
units = pint units = pint
graphviz = python-graphviz
[options.entry_points] [options.entry_points]
console_scripts = console_scripts =