Skip to content
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
2 changes: 1 addition & 1 deletion .github/workflows/compilation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ env:
NETCDF_FORTRAN_VERSION: 4.6
NVFORTRAN_VERSION: 25.7
OPENMPI_VERSION: 5.0
PYTHON_VERSION: 3.13
PYTHON_VERSION: 3.14
NUM_PARALLEL: 16

jobs:
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/extraction_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -122,9 +122,8 @@ jobs:
source /archive/psyclone-spack/psyclone-spack-Jun25/spack-repo/share/spack/setup-env.sh
spack load lfric-build-environment%gcc@14
source .runner_venv/bin/activate
export LFRIC_DIR=/archive/psyclone-tests/latest-run/extraction/lfric_apps_${LFRIC_APPS_REV}
export PSYCLONE_CONFIG_FILE=${PSYCLONE_LFRIC_DIR}/KGOs/lfric_psyclone.cfg
export PSYCLONE_LFRIC_DIR=${GITHUB_WORKSPACE}/examples/lfric/scripts
export PSYCLONE_CONFIG_FILE=${PSYCLONE_LFRIC_DIR}/KGOs/lfric_psyclone.cfg
export COMPILER_PROFILE=fast-debug
export NUM_PROCS=6
export MAX_PROC=$((NUM_PROCS-1))
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lfric_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ on:
env:
LFRIC_APPS_REV: 10798
LFRIC_CORE_REV: 52772
PYTHON_VERSION: 3.13
PYTHON_VERSION: 3.14
GCC_VERSION: 14
NVHPC_VERSION: 25.1
NUM_PARALLEL: 16
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/nemo_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ env:
NVFORTRAN_VERSION: 25.7
ONEAPI_VERSION: 2025.0
PERL_VERSION: 5.42
PYTHON_VERSION: 3.13
PYTHON_VERSION: 3.14
NUM_PARALLEL: 16
PREFIX: /archive/psyclone-tests/latest-run/

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/python-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: '3.13'
python-version: '3.14'
- run: sudo apt-get install -y graphviz doxygen
- run: python -m pip install --upgrade pip
- run: pip install .[doc]
Expand All @@ -77,7 +77,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: ['3.9', '3.13']
python-version: ['3.9', '3.14']
steps:
- uses: actions/checkout@v4
with:
Expand Down
3 changes: 3 additions & 0 deletions changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
8) PR #3190. Add python 3.14 in the CI and integration tests (except the
LFRic Extraction tests).

7) PR #3181 for #3173. Adds protections for CodeBlocks in the
DataSharingAttributeMixin.

Expand Down
4 changes: 2 additions & 2 deletions doc/developer_guide/working_practises.rst
Original file line number Diff line number Diff line change
Expand Up @@ -493,13 +493,13 @@ computational cost (so that we 'fail fast'):
3. All links within the Sphinx documentation (rst files) are checked (see
note below);

4. All of the examples are tested (for Python versions 3.10 and 3.13)
4. All of the examples are tested (for Python versions 3.9 and 3.14)
using the ``Makefile`` in the ``examples`` directory. No compilation is
performed; only the ``transform`` (performs the PSyclone transformations)
and ``notebook`` (runs the various Jupyter notebooks) targets are used.
The ``transform`` target is run 2-way parallel (``-j 2``).

5. The full test suite is run for Python versions 3.10 and 3.13 but
5. The full test suite is run for Python versions 3.9 and 3.14 but
without the compilation checks. ``pytest`` is passed the ``-n auto`` flag
so that it will run the tests in parallel on as many cores as are
available (currently 2 on GHA instances).
Expand Down
5 changes: 4 additions & 1 deletion src/psyclone/tests/generator_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -1408,7 +1408,10 @@ def test_main_unexpected_fatal_error(capsys, monkeypatch):
assert ("Error, unexpected exception, please report to the authors:"
in output)
assert "Traceback (most recent call last):" in output
assert "TypeError: argument of type 'int' is not iterable" in output
# Python >= 3.14 uses "is not a container or iterable",
# so we split the assertion for cross-version support
assert "TypeError: argument of type 'int' is not " in output
assert "iterable" in output


def test_main_fort_line_length_off(capsys):
Expand Down
3 changes: 2 additions & 1 deletion src/psyclone/tests/utils_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -357,4 +357,5 @@ def func(temp: bool, temp2: Union[bool, int]):
# For second parameter temp2
if "temp2" == k:
anno = stringify_annotation(v.annotation)
assert "typing.Union[bool, int]" == anno
# Python >= 3.14 uses the second format
assert "typing.Union[bool, int]" == anno or "bool | int" == anno
Loading