Skip to content

Commit e55f57d

Browse files
committed
Merge branch 'QPR-11075' into 'master'
Merge with quantlib 1.27 Closes QPR-11075 See merge request qs/quantlib!25
2 parents 17a39d5 + b8631ca commit e55f57d

849 files changed

Lines changed: 8669 additions & 7792 deletions

File tree

Some content is hidden

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

.appveyor.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
image:
2-
- Visual Studio 2013
2+
- Visual Studio 2015
33
- Visual Studio 2022
44

55
platform: x64
@@ -16,9 +16,9 @@ for:
1616
-
1717
matrix:
1818
only:
19-
- image: Visual Studio 2013
19+
- image: Visual Studio 2015
2020
before_build:
21-
- COPY .appveyor\VS2013.props .\Build.props
21+
- COPY .appveyor\VS2015.props .\Build.props
2222
test_script:
2323
- .\test-suite\bin\QuantLib-test-suite-x64-mt.exe --log_level=message --build_info=yes -- --faster
2424
-
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
<PropertyGroup Label="UserMacros" />
55
<ItemDefinitionGroup>
66
<ClCompile>
7-
<AdditionalIncludeDirectories>C:\Libraries\boost_1_58_0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
7+
<AdditionalIncludeDirectories>C:\Libraries\boost_1_69_0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
88
</ClCompile>
99
<Link>
10-
<AdditionalLibraryDirectories>C:\Libraries\boost_1_58_0\lib64-msvc-12.0;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
10+
<AdditionalLibraryDirectories>C:\Libraries\boost_1_69_0\lib64-msvc-14.0;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
1111
</Link>
1212
</ItemDefinitionGroup>
1313
<ItemGroup />

.clang-tidy

Lines changed: 53 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,59 @@
11
---
2-
Checks: '-*,readability-*,bugprone-*,misc-*,performance-*,modernize-*,-readability-else-after-return,-readability-named-parameter,-readability-braces-around-statements,-readability-inconsistent-declaration-parameter-name,-readability-isolate-declaration,-readability-magic-numbers,-readability-convert-member-functions-to-static,-bugprone-macro-parentheses,-bugprone-narrowing-conversions,-bugprone-branch-clone,-misc-non-private-member-variables-in-classes,-misc-unused-parameters,-modernize-avoid-c-arrays,-modernize-make-shared,,-modernize-use-trailing-return-type,-modernize-use-using'
3-
WarningsAsErrors: ''
2+
Checks: >
3+
-*,
4+
bugprone-*,
5+
-bugprone-branch-clone,
6+
-bugprone-macro-parentheses,
7+
-bugprone-narrowing-conversions,
8+
clang-analyzer-*,
9+
-clang-analyzer-core.UndefinedBinaryOperatorResult,
10+
-clang-analyzer-core.uninitialized.Assign,
11+
-clang-analyzer-optin.cplusplus.UninitializedObject,
12+
-clang-analyzer-optin.cplusplus.VirtualCall,
13+
-clang-analyzer-optin.performance.Padding,
14+
-clang-analyzer-security.FloatLoopCounter,
15+
cppcoreguidelines-*,
16+
-cppcoreguidelines-avoid-c-arrays,
17+
-cppcoreguidelines-avoid-goto,
18+
-cppcoreguidelines-avoid-magic-numbers,
19+
-cppcoreguidelines-avoid-non-const-global-variables,
20+
-cppcoreguidelines-init-variables,
21+
-cppcoreguidelines-macro-usage,
22+
-cppcoreguidelines-narrowing-conversions,
23+
-cppcoreguidelines-non-private-member-variables-in-classes,
24+
-cppcoreguidelines-owning-memory,
25+
-cppcoreguidelines-pro-bounds-array-to-pointer-decay,
26+
-cppcoreguidelines-pro-bounds-constant-array-index,
27+
-cppcoreguidelines-pro-bounds-pointer-arithmetic,
28+
-cppcoreguidelines-pro-type-const-cast,
29+
-cppcoreguidelines-pro-type-member-init,
30+
-cppcoreguidelines-pro-type-vararg,
31+
-cppcoreguidelines-special-member-functions,
32+
misc-*,
33+
-misc-no-recursion,
34+
-misc-non-private-member-variables-in-classes,
35+
-misc-unused-parameters,
36+
modernize-*,
37+
-modernize-avoid-c-arrays,
38+
-modernize-make-shared,
39+
-modernize-use-trailing-return-type,
40+
-modernize-use-using,
41+
performance-*,
42+
readability-*,
43+
-readability-braces-around-statements,
44+
-readability-convert-member-functions-to-static,
45+
-readability-else-after-return,
46+
-readability-function-cognitive-complexity,
47+
-readability-identifier-length,
48+
-readability-inconsistent-declaration-parameter-name,
49+
-readability-isolate-declaration,
50+
-readability-magic-numbers,
51+
-readability-named-parameter,
52+
-readability-simplify-boolean-expr,
53+
-readability-use-anyofallof,
454
HeaderFilterRegex: '.*'
5-
AnalyzeTemporaryDtors: false
6-
FormatStyle: file
55+
FormatStyle: file
756
CheckOptions:
857
- key: modernize-use-default-member-init.UseAssignment
958
value: 1
10-
- key: modernize-use-noexcept.ReplacementString
11-
value: QL_NOEXCEPT
1259
...

.github/workflows/cmake.yml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ jobs:
44
cmake-linux:
55
runs-on: ubuntu-latest
66
steps:
7-
- uses: actions/checkout@v2
7+
- uses: actions/checkout@v3
88
- name: Setup
99
run: |
1010
sudo apt update
11-
sudo apt install -y libboost-all-dev
11+
sudo apt install -y libboost-dev
1212
- name: Compile
1313
env:
1414
CXXFLAGS: -O2
@@ -24,7 +24,7 @@ jobs:
2424
cmake-linux-with-options:
2525
runs-on: ubuntu-latest
2626
steps:
27-
- uses: actions/checkout@v2
27+
- uses: actions/checkout@v3
2828
- name: Setup
2929
run: |
3030
sudo apt update
@@ -40,17 +40,17 @@ jobs:
4040
cd build
4141
./test-suite/quantlib-test-suite --log_level=message
4242
cmake-win:
43-
runs-on: windows-latest
43+
runs-on: windows-2022
4444
steps:
45-
- uses: actions/checkout@v2
45+
- uses: actions/checkout@v3
4646
- name: Setup
4747
run: |
48-
$Url = "https://boostorg.jfrog.io/artifactory/main/release/1.75.0/binaries/boost_1_75_0-msvc-14.2-64.exe"
48+
$Url = "https://boostorg.jfrog.io/artifactory/main/release/1.78.0/binaries/boost_1_78_0-msvc-14.3-64.exe"
4949
(New-Object System.Net.WebClient).DownloadFile($Url, "$env:TEMP\boost.exe")
50-
Start-Process -Wait -FilePath "$env:TEMP\boost.exe" "/SILENT","/SP-","/SUPPRESSMSGBOXES","/DIR=C:\local\boost-1.75.0"
50+
Start-Process -Wait -FilePath "$env:TEMP\boost.exe" "/SILENT","/SP-","/SUPPRESSMSGBOXES","/DIR=C:\local\boost-1.78.0"
5151
- name: Compile
5252
env:
53-
BOOST_ROOT: C:\local\boost-1.75.0
53+
BOOST_ROOT: C:\local\boost-1.78.0
5454
run: |
5555
mkdir build
5656
cd build
@@ -61,17 +61,17 @@ jobs:
6161
cd build
6262
.\test-suite\Release\quantlib-test-suite --log_level=message
6363
cmake-win-with-options:
64-
runs-on: windows-latest
64+
runs-on: windows-2022
6565
steps:
66-
- uses: actions/checkout@v2
66+
- uses: actions/checkout@v3
6767
- name: Setup
6868
run: |
69-
$Url = "https://boostorg.jfrog.io/artifactory/main/release/1.75.0/binaries/boost_1_75_0-msvc-14.2-64.exe"
69+
$Url = "https://boostorg.jfrog.io/artifactory/main/release/1.78.0/binaries/boost_1_78_0-msvc-14.3-64.exe"
7070
(New-Object System.Net.WebClient).DownloadFile($Url, "$env:TEMP\boost.exe")
71-
Start-Process -Wait -FilePath "$env:TEMP\boost.exe" "/SILENT","/SP-","/SUPPRESSMSGBOXES","/DIR=C:\local\boost-1.75.0"
71+
Start-Process -Wait -FilePath "$env:TEMP\boost.exe" "/SILENT","/SP-","/SUPPRESSMSGBOXES","/DIR=C:\local\boost-1.78.0"
7272
- name: Compile
7373
env:
74-
BOOST_ROOT: C:\local\boost-1.75.0
74+
BOOST_ROOT: C:\local\boost-1.78.0
7575
run: |
7676
cmake --preset windows-ci-build-with-nonstandard-options
7777
cmake --build --preset windows-ci-build-with-nonstandard-options
@@ -82,7 +82,7 @@ jobs:
8282
cmake-macos:
8383
runs-on: macos-latest
8484
steps:
85-
- uses: actions/checkout@v2
85+
- uses: actions/checkout@v3
8686
- name: Setup
8787
run: |
8888
brew install boost

.github/workflows/codeql-analysis.yml

Lines changed: 6 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -12,48 +12,26 @@ jobs:
1212
name: CodeQL analysis
1313
runs-on: ubuntu-latest
1414

15-
strategy:
16-
fail-fast: false
17-
matrix:
18-
# Override automatic language detection by changing the below list
19-
# Supported options are ['csharp', 'cpp', 'go', 'java', 'javascript', 'python']
20-
language: ['cpp']
21-
# Learn more...
22-
# https://docs.github.com/en/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#overriding-automatic-language-detection
23-
2415
steps:
2516
- name: Checkout repository
26-
uses: actions/checkout@v2
27-
with:
28-
# We must fetch at least the immediate parents so that if this is
29-
# a pull request then we can checkout the head.
30-
fetch-depth: 2
31-
32-
# If this run was triggered by a pull request event, then checkout
33-
# the head of the pull request instead of the merge commit.
34-
- run: git checkout HEAD^2
35-
if: ${{ github.event_name == 'pull_request' }}
17+
uses: actions/checkout@v3
3618

3719
# Initializes the CodeQL tools for scanning.
3820
- name: Initialize CodeQL
39-
uses: github/codeql-action/init@v1
21+
uses: github/codeql-action/init@v2
4022
with:
41-
languages: ${{ matrix.language }}
42-
# If you wish to specify custom queries, you can do so here or in a config file.
43-
# By default, queries listed here will override any specified in a config file.
44-
# Prefix the list here with "+" to use these queries and those in the config file.
45-
# queries: ./path/to/local/query, your-org/your-repo/queries@main
23+
languages: cpp
4624

4725
# Set up build environment
4826
- name: Setup
4927
run: |
5028
sudo apt update
51-
sudo apt install -y libboost-all-dev
29+
sudo apt install -y libboost-dev
5230
5331
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
5432
# If this step fails, then you should remove it and run the build manually (see below)
5533
- name: Autobuild
56-
uses: github/codeql-action/autobuild@v1
34+
uses: github/codeql-action/autobuild@v2
5735

5836
# ℹ️ Command-line programs to run using the OS shell.
5937
# 📚 https://git.io/JvXDl
@@ -67,4 +45,4 @@ jobs:
6745
# make release
6846

6947
- name: Perform CodeQL Analysis
70-
uses: github/codeql-action/analyze@v1
48+
uses: github/codeql-action/analyze@v2

.github/workflows/copyrights.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ jobs:
77
copyrights:
88
runs-on: ubuntu-latest
99
steps:
10-
- uses: actions/checkout@v2
10+
- uses: actions/checkout@v3
1111
- name: Check
1212
run: |
1313
./tools/check_copyrights.sh
14-
- uses: peter-evans/create-pull-request@v3
14+
- uses: peter-evans/create-pull-request@v4
1515
with:
1616
token: ${{ secrets.GITHUB_TOKEN }}
1717
branch: update-copyright-list-${{ github.ref }}

.github/workflows/coveralls.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ jobs:
44
coverage:
55
runs-on: ubuntu-latest
66
steps:
7-
- uses: actions/checkout@v2
7+
- uses: actions/checkout@v3
88
- name: Setup
99
run: |
1010
sudo apt update
11-
sudo apt install -y lcov libboost-all-dev
11+
sudo apt install -y lcov libboost-dev
1212
- name: Compile
1313
run: |
1414
./autogen.sh

.github/workflows/doxygen.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ jobs:
44
docs:
55
runs-on: macos-latest
66
steps:
7-
- uses: actions/checkout@v2
7+
- uses: actions/checkout@v3
88
- name: Setup
99
run: |
1010
rm -f /usr/local/bin/2to3

.github/workflows/filelists.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ jobs:
44
filelists:
55
runs-on: ubuntu-latest
66
steps:
7-
- uses: actions/checkout@v2
7+
- uses: actions/checkout@v3
88
- name: Setup
99
run: |
1010
sudo apt update
11-
sudo apt install -y libboost-all-dev
11+
sudo apt install -y libboost-dev
1212
- name: Configure
1313
run: |
1414
./autogen.sh
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
name: Update generated headers
2+
on:
3+
push:
4+
branches:
5+
- '**'
6+
jobs:
7+
filelists:
8+
runs-on: ubuntu-latest
9+
steps:
10+
- uses: actions/checkout@v3
11+
- name: Setup
12+
run: |
13+
sudo apt update
14+
sudo apt install -y libboost-dev
15+
- name: Configure
16+
run: |
17+
./autogen.sh
18+
./configure
19+
- name: Update headers
20+
run: |
21+
find ql -name *.am | xargs touch
22+
make dist
23+
rm QuantLib-*.tar.gz
24+
- uses: peter-evans/create-pull-request@v4
25+
with:
26+
token: ${{ secrets.GITHUB_TOKEN }}
27+
branch: update-generated-headers-${{ github.ref }}
28+
delete-branch: true
29+
commit-message: 'Update generated headers'
30+
title: 'Update generated headers'
31+
author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

0 commit comments

Comments
 (0)