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.

Sign up for GitHub

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 #1525 #1569

Merged
merged 2 commits into from
Aug 6, 2023
Merged

Fix #1525 #1569

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1815405
[unittest] Handle case where pint is not installed
ischoegl Aug 4, 2023
5b9766c
[CI] Skip pint on some runners
ischoegl Aug 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -487,7 +487,7 @@ jobs:
run: |
conda install -q sundials=${{ matrix.sundials-ver }} scons numpy ruamel.yaml \
cython boost-cpp fmt=${{ matrix.fmt-ver }} eigen yaml-cpp h5py pandas \
libgomp openblas pytest highfive pint
libgomp openblas pytest highfive
- name: Build Cantera
run: |
scons build system_fmt=y system_eigen=y system_yamlcpp=y system_sundials=y \
Expand Down Expand Up @@ -621,7 +621,7 @@ jobs:
- name: Install Python dependencies
run: |
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 pint
python -m pip install '"scons<4.4.0"' pypiwin32 numpy ruamel.yaml cython pandas pytest pytest-github-actions-annotate-failures
- name: Restore Boost cache
uses: actions/cache@v3
id: cache-boost
Expand Down
2 changes: 1 addition & 1 deletion test/python/test_units.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import sys

import pytest
import cantera.with_units as ctu
ctu = pytest.importorskip("cantera.with_units")
import cantera as ct
try:
from pint.testing import assert_allclose
Expand Down