Skip to content

Commit 7b70172

Browse files
authored
Release 5.12.0
2 parents 28dd542 + 70809d7 commit 7b70172

File tree

2,225 files changed

+45283
-691155
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,225 files changed

+45283
-691155
lines changed

.clang-format

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ PointerAlignment: Left
3838

3939
# Align things as much as possible.
4040
AlignOperands: true
41-
AlignConsecutiveAssignments: AcrossEmptyLines
41+
AlignConsecutiveAssignments: Consecutive
4242
AlignEscapedNewlines: Left
4343
AlignTrailingComments: true
4444

@@ -65,7 +65,7 @@ IncludeBlocks: Regroup
6565
IncludeCategories:
6666
# By default, first include the 'main' header file related to source file
6767
# Then include every 'system' headers (i.e. in <>)
68-
- Regex: '<[^Q][[:alnum:]]+(\.h)?>'
68+
- Regex: '<[^Q][[:alnum:]_]+(\.h)?>'
6969
Priority: 10
7070
# Then include '3rd party' headers
7171
- Regex: '<[[:alnum:]/._]+>'

.github/ci-config.yml

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
cmake_options: -DBOOST_ROOT=${BOOST_ROOT_DIR} -DBOOST_INCLUDEDIR=${BOOST_INCLUDE_DIR} -DBOOST_LIBRARYDIR=${BOOST_LIB_DIR} -DOPENSSL_ROOT_DIR=${OPENSSL_ROOT_DIR} -DENABLE_STATIC_BOOST_LIBS=OFF
2+
dependencies: |
3+
ecmwf/ecbuild
4+
dependency_branch: develop
5+
parallelism_factor: 8

.github/ci-hpc-config.yml

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
build:
2+
modules:
3+
- boost
4+
- ninja
5+
- python3
6+
- qt
7+
dependencies:
8+
- ecmwf/ecbuild@develop
9+
parallel: 64

.github/codecov.yml

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
2+
# To validate this file:
3+
# curl -X POST --data-binary @.codecov.yml https://codecov.io/validate
4+
5+
# Ignored Paths
6+
# -------------
7+
ignore:
8+
- "3rdparty/cereal"
9+
- "3rdparty/cpp-httplib"
10+
- "3rdparty/json"

.github/workflows/ci.yml

+77
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
name: ci
2+
3+
on:
4+
# Trigger the workflow on push to master or develop, except tag creation
5+
push:
6+
branches:
7+
- 'master'
8+
- 'develop'
9+
tags-ignore:
10+
- '**'
11+
12+
# Trigger the workflow on pull request
13+
pull_request: ~
14+
15+
# Trigger the workflow manually
16+
workflow_dispatch: ~
17+
18+
# Trigger after public PR approved for CI
19+
pull_request_target:
20+
types: [labeled]
21+
22+
jobs:
23+
# Run CI including downstream packages on self-hosted runners
24+
downstream-ci:
25+
name: downstream-ci
26+
if: ${{ !github.event.pull_request.head.repo.fork && github.event.action != 'labeled' || github.event.label.name == 'approved-for-ci' }}
27+
uses: ecmwf-actions/downstream-ci/.github/workflows/downstream-ci.yml@main
28+
with:
29+
ecflow: ecmwf/ecflow@${{ github.event.pull_request.head.sha || github.sha }}
30+
codecov_upload: true
31+
secrets: inherit
32+
33+
# Run CI of private downstream packages on self-hosted runners
34+
private-downstream-ci:
35+
name: private-downstream-ci
36+
needs: [downstream-ci]
37+
if: (success() || failure()) && ${{ !github.event.pull_request.head.repo.fork && github.event.action != 'labeled' || github.event.label.name == 'approved-for-ci' }}
38+
runs-on: ubuntu-latest
39+
permissions:
40+
pull-requests: write
41+
steps:
42+
- name: Dispatch private downstream CI
43+
uses: ecmwf-actions/dispatch-private-downstream-ci@v1
44+
with:
45+
token: ${{ secrets.GH_REPO_READ_TOKEN }}
46+
owner: ecmwf-actions
47+
repository: private-downstream-ci
48+
event_type: downstream-ci
49+
payload: '{"ecflow": "ecmwf/ecflow@${{ github.event.pull_request.head.sha || github.sha }}"}'
50+
51+
# Build downstream packages on HPC
52+
downstream-ci-hpc:
53+
name: downstream-ci-hpc
54+
if: ${{ !github.event.pull_request.head.repo.fork && github.event.action != 'labeled' || github.event.label.name == 'approved-for-ci' }}
55+
uses: ecmwf-actions/downstream-ci/.github/workflows/downstream-ci-hpc.yml@main
56+
with:
57+
ecflow: ecmwf/ecflow@${{ github.event.pull_request.head.sha || github.sha }}
58+
skip_matrix_jobs: intel-2021.4.0
59+
secrets: inherit
60+
61+
# Run CI of private downstream packages on HPC
62+
private-downstream-ci-hpc:
63+
name: private-downstream-ci-hpc
64+
needs: [downstream-ci-hpc]
65+
if: (success() || failure()) && ${{ !github.event.pull_request.head.repo.fork && github.event.action != 'labeled' || github.event.label.name == 'approved-for-ci' }}
66+
runs-on: ubuntu-latest
67+
permissions:
68+
pull-requests: write
69+
steps:
70+
- name: Dispatch private downstream CI
71+
uses: ecmwf-actions/dispatch-private-downstream-ci@v1
72+
with:
73+
token: ${{ secrets.GH_REPO_READ_TOKEN }}
74+
owner: ecmwf-actions
75+
repository: private-downstream-ci
76+
event_type: downstream-ci-hpc
77+
payload: '{"ecflow": "ecmwf/ecflow@${{ github.event.pull_request.head.sha || github.sha }}"}'

.github/workflows/label-public-pr.yml

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# Manage labels of pull requests that originate from forks
2+
name: label-public-pr
3+
4+
on:
5+
pull_request_target:
6+
types: [opened, synchronize]
7+
8+
jobs:
9+
label:
10+
uses: ecmwf-actions/reusable-workflows/.github/workflows/label-pr.yml@v2

.pydevproject

-8
This file was deleted.

.readthedocs.yml

+7-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
version: 2
2+
23
formats: []
4+
5+
build:
6+
os: ubuntu-22.04
7+
tools:
8+
python: "3.11"
9+
310
python:
4-
version: 3.8
511
install:
612
- requirements: docs/requirements.txt
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

cereal/include/cereal/cereal.hpp 3rdparty/cereal/include/cereal/cereal.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ namespace cereal
238238
Example interface for versioning on a non-member serialize function:
239239
240240
@code{cpp}
241-
CEREAL_CLASS_VERSION( Mytype, 77 ); // register class version
241+
CEREAL_CLASS_VERSION( Mytype, 77 ) // register class version
242242
243243
template <class Archive>
244244
void serialize( Archive & ar, Mytype & t, const std::uint32_t version )
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,52 @@
1-
Use of this software is granted under one of the following two licenses,
2-
to be chosen freely by the user.
3-
4-
1. Boost Software License - Version 1.0 - August 17th, 2003
5-
===============================================================================
6-
7-
Copyright (c) 2006, 2007 Marcin Kalicinski
8-
9-
Permission is hereby granted, free of charge, to any person or organization
10-
obtaining a copy of the software and accompanying documentation covered by
11-
this license (the "Software") to use, reproduce, display, distribute,
12-
execute, and transmit the Software, and to prepare derivative works of the
13-
Software, and to permit third-parties to whom the Software is furnished to
14-
do so, all subject to the following:
15-
16-
The copyright notices in the Software and this entire statement, including
17-
the above license grant, this restriction and the following disclaimer,
18-
must be included in all copies of the Software, in whole or in part, and
19-
all derivative works of the Software, unless such copies or derivative
20-
works are solely in the form of machine-executable object code generated by
21-
a source language processor.
22-
23-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
24-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
25-
FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
26-
SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
27-
FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
28-
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
29-
DEALINGS IN THE SOFTWARE.
30-
31-
2. The MIT License
32-
===============================================================================
33-
34-
Copyright (c) 2006, 2007 Marcin Kalicinski
35-
36-
Permission is hereby granted, free of charge, to any person obtaining a copy
37-
of this software and associated documentation files (the "Software"), to deal
38-
in the Software without restriction, including without limitation the rights
39-
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
40-
of the Software, and to permit persons to whom the Software is furnished to do so,
41-
subject to the following conditions:
42-
43-
The above copyright notice and this permission notice shall be included in all
44-
copies or substantial portions of the Software.
45-
46-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
47-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
48-
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
49-
THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
50-
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
51-
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
52-
IN THE SOFTWARE.
1+
Use of this software is granted under one of the following two licenses,
2+
to be chosen freely by the user.
3+
4+
1. Boost Software License - Version 1.0 - August 17th, 2003
5+
===============================================================================
6+
7+
Copyright (c) 2006, 2007 Marcin Kalicinski
8+
9+
Permission is hereby granted, free of charge, to any person or organization
10+
obtaining a copy of the software and accompanying documentation covered by
11+
this license (the "Software") to use, reproduce, display, distribute,
12+
execute, and transmit the Software, and to prepare derivative works of the
13+
Software, and to permit third-parties to whom the Software is furnished to
14+
do so, all subject to the following:
15+
16+
The copyright notices in the Software and this entire statement, including
17+
the above license grant, this restriction and the following disclaimer,
18+
must be included in all copies of the Software, in whole or in part, and
19+
all derivative works of the Software, unless such copies or derivative
20+
works are solely in the form of machine-executable object code generated by
21+
a source language processor.
22+
23+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
24+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
25+
FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
26+
SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
27+
FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
28+
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
29+
DEALINGS IN THE SOFTWARE.
30+
31+
2. The MIT License
32+
===============================================================================
33+
34+
Copyright (c) 2006, 2007 Marcin Kalicinski
35+
36+
Permission is hereby granted, free of charge, to any person obtaining a copy
37+
of this software and associated documentation files (the "Software"), to deal
38+
in the Software without restriction, including without limitation the rights
39+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
40+
of the Software, and to permit persons to whom the Software is furnished to do so,
41+
subject to the following conditions:
42+
43+
The above copyright notice and this permission notice shall be included in all
44+
copies or substantial portions of the Software.
45+
46+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
47+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
48+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
49+
THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
50+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
51+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
52+
IN THE SOFTWARE.

0 commit comments

Comments
 (0)