From 27d890f53eca065d60678ea8f7f2ea5a66daef89 Mon Sep 17 00:00:00 2001 From: "Bryan W. Weber" Date: Mon, 23 Nov 2020 20:33:25 -0500 Subject: [PATCH 1/2] [CI] Update CI workflow --- .github/workflows/main.yml | 43 +++++++++++++++++++++++--------------- 1 file changed, 26 insertions(+), 17 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c2688fe90f..663b7b69d9 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -16,11 +16,12 @@ on: jobs: ubuntu-multiple-pythons: - name: Ubuntu 18.04 with Python ${{ matrix.python-version }} - runs-on: ubuntu-latest + name: Ubuntu with Python ${{ matrix.python-version }} + runs-on: ${{ matrix.os }} strategy: matrix: - python-version: [ '3.5', '3.6', '3.7', '3.8' ] + python-version: [ '3.5', '3.6', '3.7', '3.8', '3.9' ] + os: ['ubuntu-18.04', 'ubuntu-20.04'] fail-fast: false steps: - uses: actions/checkout@v2 @@ -28,7 +29,7 @@ jobs: with: submodules: recursive - name: Setup Python - uses: actions/setup-python@v1 + uses: actions/setup-python@v2 with: python-version: ${{ matrix.python-version }} architecture: x64 @@ -45,10 +46,11 @@ jobs: macos-multiple-pythons: name: macOS with Python ${{ matrix.python-version }} - runs-on: macos-latest + runs-on: ${{ matrix.os }} strategy: matrix: python-version: [ '3.5', '3.6', '3.7', '3.8' ] + os: ['macos-10.15', 'macos-11.0'] fail-fast: false steps: - uses: actions/checkout@v2 @@ -56,7 +58,7 @@ jobs: with: submodules: recursive - name: Setup Python - uses: actions/setup-python@v1 + uses: actions/setup-python@v2 with: python-version: ${{ matrix.python-version }} architecture: x64 @@ -85,7 +87,7 @@ jobs: with: submodules: recursive - name: Setup python - uses: actions/setup-python@v1 + uses: actions/setup-python@v2 with: python-version: '3.8' architecture: x64 @@ -116,7 +118,7 @@ jobs: with: submodules: recursive - name: Setup Python - uses: actions/setup-python@v1 + uses: actions/setup-python@v2 with: python-version: '3.8' architecture: x64 @@ -174,15 +176,19 @@ jobs: run-examples: name: Run the Python examples using bash runs-on: ubuntu-18.04 + strategy: + matrix: + python-version: ['3.5', '3.6', '3.7', '3.8', '3.9'] + fail-fast: false steps: - uses: actions/checkout@v2 name: Checkout the repository with: submodules: recursive - name: Setup Python - uses: actions/setup-python@v1 + uses: actions/setup-python@v2 with: - python-version: '3.8' + python-version: ${{ matrix.python-version }} architecture: x64 - name: Install Apt dependencies run: sudo apt-get install libboost-dev gfortran graphviz liblapack-dev libblas-dev @@ -221,7 +227,7 @@ jobs: name: Checkout the repository with: submodules: recursive - - uses: goanpeca/setup-miniconda@v1 + - uses: conda-incubator/setup-miniconda@v2 with: auto-update-conda: true python-version: 3.8 @@ -231,7 +237,7 @@ jobs: - name: Install conda dependencies shell: bash -l {0} run: | - conda install -q sundials=${{ matrix.sundials-ver}} scons numpy ruamel_yaml \ + conda install -q sundials=${{ matrix.sundials-ver }} scons numpy ruamel_yaml \ cython libboost fmt eigen yaml-cpp h5py pandas - name: Build Cantera run: | @@ -252,7 +258,7 @@ jobs: with: submodules: recursive - name: Setup python - uses: actions/setup-python@v1 + uses: actions/setup-python@v2 with: python-version: '3.8' architecture: x64 @@ -276,7 +282,7 @@ jobs: matrix: os: ['windows-2019'] vs-toolset: ['14.0', '14.2'] - python-version: [ '3.5', '3.6', '3.7', '3.8' ] + python-version: [ '3.5', '3.6', '3.7', '3.8', '3.9' ] # Must use windows-2016 image because it installs VS2017 (MSVC 14.1) # Scons cannot find MSVC 14.1 when VS2019 is installed include: @@ -292,6 +298,9 @@ jobs: - os: 'windows-2016' vs-toolset: '14.1' python-version: '3.8' + - os: 'windows-2016' + vs-toolset: '14.1' + python-version: '3.9' fail-fast: false steps: - uses: actions/checkout@v2 @@ -299,17 +308,17 @@ jobs: with: submodules: recursive - name: Set Up Python - uses: actions/setup-python@v1 + uses: actions/setup-python@v2 with: python-version: ${{ matrix.python-version }} - architecture: 'x64' + architecture: x64 - name: Install Python dependencies run: | python -m pip install -U pip 'setuptools>=47.0.0,<48' python -m pip install scons pypiwin32 numpy ruamel.yaml cython h5py pandas - name: Build Cantera run: | - scons build -j2 boost_inc_dir=%BOOST_ROOT_1_69_0% debug=n VERBOSE=y python_package=full ^ + scons build -j2 boost_inc_dir=%BOOST_ROOT_1_72_0% debug=n VERBOSE=y python_package=full ^ msvc_version=${{ matrix.vs-toolset }} f90_interface=n shell: cmd - name: Test Cantera From 19afc8c38650093015a2a3764bfe53601e588cbe Mon Sep 17 00:00:00 2001 From: Ray Speth Date: Sat, 5 Dec 2020 12:26:43 -0500 Subject: [PATCH 2/2] [Kinetics] Make output of Pdep error messages consistent Fixes #944. --- src/kinetics/RxnRates.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/kinetics/RxnRates.cpp b/src/kinetics/RxnRates.cpp index eb4f7f6699..269378b772 100644 --- a/src/kinetics/RxnRates.cpp +++ b/src/kinetics/RxnRates.cpp @@ -103,7 +103,7 @@ void Plog::validate(const std::string& equation) if (k < 0) { format_to(err_reactions, "\nInvalid rate coefficient for reaction '{}'\n" - "at P = {:.5g}, T = {}\n", + "at P = {:.5g}, T = {:.1f}\n", equation, std::exp(iter->first), T[i]); } }