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

[scons] Bump python_max_p1_version to 3.13 #1648

Merged
merged 7 commits into from
Dec 12, 2023
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
14 changes: 7 additions & 7 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ jobs:
timeout-minutes: 60
strategy:
matrix:
python-version: ['3.8', '3.10', '3.11']
python-version: ['3.8', '3.10', '3.11', '3.12']
os: ['ubuntu-20.04', 'ubuntu-22.04']
fail-fast: false
env:
Expand Down Expand Up @@ -157,7 +157,7 @@ jobs:
timeout-minutes: 90
strategy:
matrix:
python-version: ['3.8', '3.10', '3.11']
python-version: ['3.8', '3.10', '3.11', '3.12']
fail-fast: false
env:
PYTHON_CMD: "python${{ matrix.python-version }}"
Expand Down Expand Up @@ -189,7 +189,7 @@ jobs:
brew link --force --overwrite python@${{ matrix.python-version }}
brew install --display-times scons
- name: Upgrade pip
run: $PYTHON_CMD -m pip install -U pip 'setuptools>=47.0.0,<48' wheel
run: $PYTHON_CMD -m pip install -U pip setuptools wheel
- name: Install Python dependencies
run: |
$PYTHON_CMD -m pip install ruamel.yaml numpy cython pandas pytest pytest-github-actions-annotate-failures pint
Expand Down Expand Up @@ -379,7 +379,7 @@ jobs:
strategy:
matrix:
os: ["ubuntu-20.04", "ubuntu-22.04"]
python-version: ['3.8', '3.10', '3.11']
python-version: ['3.8', '3.10', '3.11', '3.12']
fail-fast: false
env:
HDF5_LIBDIR: /usr/lib/x86_64-linux-gnu/hdf5/serial
Expand Down Expand Up @@ -423,7 +423,7 @@ jobs:
-exec sh -c 'for n; do echo "$n" | tee -a results.txt && python3 "$n" >> results.txt || exit 1; done' sh {} +
env:
# The ignore setting here is due to a new warning introduced in Matplotlib==3.6.0
PYTHONWARNINGS: "error,ignore:warn_name_set_on_empty_Forward::pyparsing"
PYTHONWARNINGS: "error,ignore:warn_name_set_on_empty_Forward::pyparsing,ignore:datetime.datetime.utcfromtimestamp:DeprecationWarning:"
MPLBACKEND: Agg
- name: Save the results file for inspection
uses: actions/upload-artifact@v3
Expand Down Expand Up @@ -517,7 +517,7 @@ jobs:
matrix:
os: ["windows-2022"]
vs-toolset: ["14.1", "14.3"]
python-version: ["3.8", "3.10", "3.11"]
python-version: ["3.8", "3.10", "3.11", "3.12"]
include:
- python-version: 3.8
fmt-ver: 10
Expand Down Expand Up @@ -595,7 +595,7 @@ jobs:
strategy:
matrix:
vs-toolset: ['14.2']
python-version: ["3.8", "3.10", "3.11"]
python-version: ["3.8", "3.10", "3.11", "3.12"]
fail-fast: false
steps:
- uses: actions/checkout@v3
Expand Down
2 changes: 1 addition & 1 deletion SConstruct
Original file line number Diff line number Diff line change
Expand Up @@ -1720,7 +1720,7 @@ env['python_cmd_esc'] = quoted(env['python_cmd'])
# Python Package Settings
python_min_version = parse_version("3.8")
# Newest Python version not supported/tested by Cantera
python_max_p1_version = parse_version("3.12")
python_max_p1_version = parse_version("3.13")
# The string is used to set python_requires in setup.cfg.in
env["py_requires_ver_str"] = f">={python_min_version}"
if env["python_sdist"] or env["package_build"]:
Expand Down
3 changes: 2 additions & 1 deletion interfaces/sourcegen/sourcegen/_orchestrate.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ def generate_source(lang: str, out_dir: str):
config = {}
if config_path.exists():
with config_path.open() as config_file:
config = ruamel.yaml.safe_load(config_file)
reader = ruamel.yaml.YAML(typ="safe")
config = reader.load(config_file)

ignore_files: List[str] = config.get("ignore_files", [])
ignore_funcs: Dict[str, List[str]] = config.get("ignore_funcs", {})
Expand Down
Loading