Skip to content

Commit 4806407

Browse files
authored
Merge pull request #2490 from stfc/2447_update_fparser
(Towards #2447) adopt fparser 0.1.4
2 parents 69365e5 + c34485a commit 4806407

File tree

7 files changed

+19
-9
lines changed

7 files changed

+19
-9
lines changed

.github/workflows/compilation.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# -----------------------------------------------------------------------------
22
# BSD 3-Clause License
33
#
4-
# Copyright (c) 2020-2023, Science and Technology Facilities Council.
4+
# Copyright (c) 2020-2024, Science and Technology Facilities Council.
55
# All rights reserved.
66
#
77
# Redistribution and use in source and binary forms, with or without
@@ -84,7 +84,9 @@ jobs:
8484
python -m venv .runner_venv
8585
. .runner_venv/bin/activate
8686
python -m pip install --upgrade pip
87-
pip install external/fparser
87+
# Uncomment the below to use the submodule version of fparser rather
88+
# than the latest release from pypi.
89+
# pip install external/fparser
8890
pip install .[test,psydata]
8991
- name: Unit tests with compilation - gfortran
9092
run: |

.github/workflows/lfric_test.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# -----------------------------------------------------------------------------
22
# BSD 3-Clause License
33
#
4-
# Copyright (c) 2023, Science and Technology Facilities Council.
4+
# Copyright (c) 2023-2024, Science and Technology Facilities Council.
55
# All rights reserved.
66
#
77
# Redistribution and use in source and binary forms, with or without
@@ -69,7 +69,9 @@ jobs:
6969
python -m venv .runner_venv
7070
. .runner_venv/bin/activate
7171
python -m pip install --upgrade pip
72-
pip install external/fparser
72+
# Uncomment the below to use the submodule version of fparser rather
73+
# than the latest release from pypi.
74+
# pip install external/fparser
7375
pip install .[test]
7476
pip install jinja2
7577

.github/workflows/nemo_tests.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# -----------------------------------------------------------------------------
22
# BSD 3-Clause License
33
#
4-
# Copyright (c) 2023, Science and Technology Facilities Council.
4+
# Copyright (c) 2024, Science and Technology Facilities Council.
55
# All rights reserved.
66
#
77
# Redistribution and use in source and binary forms, with or without
@@ -73,7 +73,9 @@ jobs:
7373
python -m venv .runner_venv
7474
. .runner_venv/bin/activate
7575
python -m pip install --upgrade pip
76-
pip install external/fparser
76+
# Uncomment the below to use the submodule version of fparser rather
77+
# than the latest release from pypi.
78+
# pip install external/fparser
7779
pip install .[test]
7880
# Compile nvidia profiling tools
7981
module load nvidia-hpcsdk/${NVFORTRAN_VERSION}

.github/workflows/python-package.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# -----------------------------------------------------------------------------
22
# BSD 3-Clause License
33
#
4-
# Copyright (c) 2020-2023, Science and Technology Facilities Council.
4+
# Copyright (c) 2020-2024, Science and Technology Facilities Council.
55
# All rights reserved.
66
#
77
# Redistribution and use in source and binary forms, with or without
@@ -130,7 +130,9 @@ jobs:
130130
# Some of the examples use Jupyter. We need to keep IPython to
131131
# below 8.0 as we still run the test suite with Python 3.7.
132132
pip install "ipython>=7.0,<8.0" jupyter
133-
pip install external/fparser
133+
# Uncomment the below to use the submodule version of fparser rather
134+
# than the latest release from pypi.
135+
# pip install external/fparser
134136
pip install .[test]
135137
- name: Lint with flake8
136138
run: |

changelog

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,8 @@
160160
58) PR #2423 for #2410. Split off and rename DynStencils to
161161
LFRicStencils in the LFRic API.
162162

163+
59) PR #2490 towards #2447. Update PSyclone to use fparser 0.1.4 release.
164+
163165
release 2.4.0 29th of September 2023
164166

165167
1) PR #1758 for #1741. Splits the PSyData read functionality into a

psyclone.pdf

0 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)