From ce54ac0174a1041a68432beaafcf4c0b1ac49db9 Mon Sep 17 00:00:00 2001 From: Ray Speth Date: Sun, 20 Aug 2023 15:32:58 -0400 Subject: [PATCH] Temporarily disable using ExtensibleRate from Python 3.10 on macOS x64 See https://github.com/conda-forge/cantera-feedstock/pull/28 --- recipe/build_py.sh | 9 ++++++++- recipe/meta.yaml | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/recipe/build_py.sh b/recipe/build_py.sh index b173f77..76fba69 100644 --- a/recipe/build_py.sh +++ b/recipe/build_py.sh @@ -19,7 +19,14 @@ $PYTHON -m pip install --no-deps build/python # Plugin library for loading Cantera Python extensions from C++ mkdir -p $PREFIX/lib -cp $SRC_DIR/build/lib/libcantera_python* $PREFIX/lib/ + +PY_VERSION=`$PYTHON -c "from sys import version_info as vi; print(f'{vi.major}.{vi.minor}')"` + +if [[ "$target_platform" != osx-64 || "$PY_VERSION" != "3.10" ]]; then + # TEMPORARY WORKAROUND: Do not include the shim library for Python 3.10 on Intel Mac + # due to upstream issues; see https://github.com/conda-forge/cantera-feedstock/pull/28 + cp $SRC_DIR/build/lib/libcantera_python* $PREFIX/lib/ +fi if [[ "$target_platform" == osx-* ]]; then VERSION=$(echo $PKG_VERSION | cut -da -f1 | cut -db -f1 | cut -dr -f1) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 61fd4b1..e42308c 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -210,7 +210,7 @@ outputs: - ck2yaml --help - ctml2yaml --help - yaml2ck --help - - ./test-lib/test-extensiblerate.sh # [not win and build_platform == target_platform] + - ./test-lib/test-extensiblerate.sh # [not win and build_platform == target_platform and not (osx and x86_64 and py == 310)] - call test-lib\test-extensiblerate.bat # [win] about: