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.

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

Add standard CI cases using Python 3.13 #1808

Merged
merged 2 commits into from
Nov 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
19 changes: 12 additions & 7 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ jobs:
timeout-minutes: 60
strategy:
matrix:
python-version: ['3.8', '3.10', '3.11', '3.12']
python-version: ['3.8', '3.10', '3.11', '3.12', '3.13']
os: ['ubuntu-20.04', 'ubuntu-22.04']
numpy: ['']
cython: ['']
Expand Down Expand Up @@ -179,14 +179,16 @@ jobs:
timeout-minutes: 90
strategy:
matrix:
macos-version: ['macos-12', 'macos-14']
python-version: ['3.11', '3.12']
macos-version: ['macos-13', 'macos-14', 'macos-15']
python-version: ['3.12', '3.13']
include:
- macos-version: 'macos-12'
- macos-version: 'macos-13'
python-version: '3.8'
- macos-version: 'macos-14'
python-version: '3.10'
extra-build-args: cxx_flags='-std=c++20'
- macos-version: 'macos-15'
python-version: '3.11'
fail-fast: false
steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -218,7 +220,7 @@ jobs:
# Pin to 4.3.4 to resolve errors around only uploading symlinks.
# See https://github.com/actions/upload-artifact/issues/589
uses: actions/[email protected]
if: matrix.python-version == '3.11' && matrix.macos-version == 'macos-12'
if: matrix.python-version == '3.12' && matrix.macos-version == 'macos-13'
with:
path: build/lib/libcantera_shared.dylib
name: libcantera_shared.dylib
Expand Down Expand Up @@ -439,6 +441,9 @@ jobs:
- os: "ubuntu-20.04"
python-version: "3.12"
numpy: ""
- os: "ubuntu-22.04"
python-version: "3.13"
numpy: ""
fail-fast: false
steps:
# We're not building Cantera here, we only need the checkout for the samples
Expand Down Expand Up @@ -591,7 +596,7 @@ jobs:
fmt-ver: '9.1'
- python-version: '3.12'
fmt-ver: '7.1'
- python-version: '3.12'
- python-version: '3.13'
fmt-ver: '11.0'
extra-build-args: cxx_flags='/EHsc /std:c++20 /utf-8'
fail-fast: false
Expand Down Expand Up @@ -669,7 +674,7 @@ jobs:
strategy:
matrix:
vs-toolset: ['14.2']
python-version: ["3.8", "3.10", "3.11", "3.12"]
python-version: ["3.8", "3.10", "3.11", "3.12", "3.13"]
fail-fast: false
steps:
- uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion SConstruct
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ else:
# Python Package Settings
python_min_version = parse_version("3.8")
# Newest Python version not supported/tested by Cantera
python_max_version = parse_version("3.13")
python_max_version = parse_version("3.14")
# The string is used to set python_requires in setup.cfg.in
py_requires_ver_str = f">={python_min_version},<{python_max_version}"

Expand Down
3 changes: 2 additions & 1 deletion src/base/application.h
Original file line number Diff line number Diff line change
Expand Up @@ -434,7 +434,8 @@ class Application
vector<string> inputDirs;

//! Versions of Python to consider when attempting to load user extensions
vector<string> m_pythonSearchVersions = {"3.13", "3.12", "3.11", "3.10", "3.9", "3.8"};
vector<string> m_pythonSearchVersions = {"3.14", "3.13", "3.12", "3.11", "3.10",
"3.9", "3.8"};

//! Set of deprecation warnings that have been emitted (to suppress duplicates)
set<string> warnings;
Expand Down
Loading