Skip to content

Commit 58a368e

Browse files
Merge 'upstream/master' (1caf1d0)
- Updates CI - Some hand-crafted merge resolution
2 parents 8bc3aa1 + 2211d50 commit 58a368e

File tree

129 files changed

+2412
-1442
lines changed

Some content is hidden

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

129 files changed

+2412
-1442
lines changed

.appveyor.yml

Lines changed: 6 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,70 +1,37 @@
11
version: 1.0.{build}
22
image:
3-
- Visual Studio 2017
43
- Visual Studio 2015
54
test: off
65
skip_branch_with_pr: true
76
build:
87
parallel: true
98
platform:
10-
- x64
119
- x86
1210
environment:
1311
matrix:
1412
- PYTHON: 36
15-
CPP: 14
1613
CONFIG: Debug
1714
- PYTHON: 27
18-
CPP: 14
1915
CONFIG: Debug
20-
- CONDA: 36
21-
CPP: latest
22-
CONFIG: Release
23-
matrix:
24-
exclude:
25-
- image: Visual Studio 2015
26-
platform: x86
27-
- image: Visual Studio 2015
28-
CPP: latest
29-
- image: Visual Studio 2017
30-
CPP: latest
31-
platform: x86
3216
install:
3317
- ps: |
34-
if ($env:PLATFORM -eq "x64") { $env:CMAKE_ARCH = "x64" }
35-
if ($env:APPVEYOR_JOB_NAME -like "*Visual Studio 2017*") {
36-
$env:CMAKE_GENERATOR = "Visual Studio 15 2017"
37-
$env:CMAKE_INCLUDE_PATH = "C:\Libraries\boost_1_64_0"
38-
$env:CXXFLAGS = "-permissive-"
39-
} else {
40-
$env:CMAKE_GENERATOR = "Visual Studio 14 2015"
41-
}
42-
if ($env:PYTHON) {
43-
if ($env:PLATFORM -eq "x64") { $env:PYTHON = "$env:PYTHON-x64" }
44-
$env:PATH = "C:\Python$env:PYTHON\;C:\Python$env:PYTHON\Scripts\;$env:PATH"
45-
python -W ignore -m pip install --upgrade pip wheel
46-
python -W ignore -m pip install pytest numpy --no-warn-script-location
47-
} elseif ($env:CONDA) {
48-
if ($env:CONDA -eq "27") { $env:CONDA = "" }
49-
if ($env:PLATFORM -eq "x64") { $env:CONDA = "$env:CONDA-x64" }
50-
$env:PATH = "C:\Miniconda$env:CONDA\;C:\Miniconda$env:CONDA\Scripts\;$env:PATH"
51-
$env:PYTHONHOME = "C:\Miniconda$env:CONDA"
52-
conda --version
53-
conda install -y -q pytest numpy scipy
54-
}
18+
$env:CMAKE_GENERATOR = "Visual Studio 14 2015"
19+
if ($env:PLATFORM -eq "x64") { $env:PYTHON = "$env:PYTHON-x64" }
20+
$env:PATH = "C:\Python$env:PYTHON\;C:\Python$env:PYTHON\Scripts\;$env:PATH"
21+
python -W ignore -m pip install --upgrade pip wheel
22+
python -W ignore -m pip install pytest numpy --no-warn-script-location
5523
- ps: |
5624
Start-FileDownload 'http://bitbucket.org/eigen/eigen/get/3.3.3.zip'
5725
7z x 3.3.3.zip -y > $null
5826
$env:CMAKE_INCLUDE_PATH = "eigen-eigen-67e894c6cd8f;$env:CMAKE_INCLUDE_PATH"
5927
build_script:
6028
- cmake -G "%CMAKE_GENERATOR%" -A "%CMAKE_ARCH%"
61-
-DPYBIND11_CPP_STANDARD=/std:c++%CPP%
29+
-DCMAKE_CXX_STANDARD=14
6230
-DPYBIND11_WERROR=ON
6331
-DDOWNLOAD_CATCH=ON
6432
-DCMAKE_SUPPRESS_REGENERATION=1
6533
.
6634
- set MSBuildLogger="C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
6735
- cmake --build . --config %CONFIG% --target pytest -- /m /v:m /logger:%MSBuildLogger%
6836
- cmake --build . --config %CONFIG% --target cpptest -- /m /v:m /logger:%MSBuildLogger%
69-
- if "%CPP%"=="latest" (cmake --build . --config %CONFIG% --target test_cmake_build -- /m /v:m /logger:%MSBuildLogger%)
7037
on_failure: if exist "tests\test_cmake_build" type tests\test_cmake_build\*.log*

.cmake-format.yaml

Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
parse:
2+
additional_commands:
3+
pybind11_add_module:
4+
flags:
5+
- THIN_LTO
6+
- MODULE
7+
- SHARED
8+
- NO_EXTRAS
9+
- EXCLUDE_FROM_ALL
10+
- SYSTEM
11+
12+
format:
13+
line_width: 99
14+
tab_size: 2
15+
16+
# If an argument group contains more than this many sub-groups
17+
# (parg or kwarg groups) then force it to a vertical layout.
18+
max_subgroups_hwrap: 2
19+
20+
# If a positional argument group contains more than this many
21+
# arguments, then force it to a vertical layout.
22+
max_pargs_hwrap: 6
23+
24+
# If a cmdline positional group consumes more than this many
25+
# lines without nesting, then invalidate the layout (and nest)
26+
max_rows_cmdline: 2
27+
separate_ctrl_name_with_space: false
28+
separate_fn_name_with_space: false
29+
dangle_parens: false
30+
31+
# If the trailing parenthesis must be 'dangled' on its on
32+
# 'line, then align it to this reference: `prefix`: the start'
33+
# 'of the statement, `prefix-indent`: the start of the'
34+
# 'statement, plus one indentation level, `child`: align to'
35+
# the column of the arguments
36+
dangle_align: prefix
37+
# If the statement spelling length (including space and
38+
# parenthesis) is smaller than this amount, then force reject
39+
# nested layouts.
40+
min_prefix_chars: 4
41+
42+
# If the statement spelling length (including space and
43+
# parenthesis) is larger than the tab width by more than this
44+
# amount, then force reject un-nested layouts.
45+
max_prefix_chars: 10
46+
47+
# If a candidate layout is wrapped horizontally but it exceeds
48+
# this many lines, then reject the layout.
49+
max_lines_hwrap: 2
50+
51+
line_ending: unix
52+
53+
# Format command names consistently as 'lower' or 'upper' case
54+
command_case: canonical
55+
56+
# Format keywords consistently as 'lower' or 'upper' case
57+
# unchanged is valid too
58+
keyword_case: 'upper'
59+
60+
# A list of command names which should always be wrapped
61+
always_wrap: []
62+
63+
# If true, the argument lists which are known to be sortable
64+
# will be sorted lexicographically
65+
enable_sort: true
66+
67+
# If true, the parsers may infer whether or not an argument
68+
# list is sortable (without annotation).
69+
autosort: false
70+
71+
# Causes a few issues - can be solved later, possibly.
72+
markup:
73+
enable_markup: false

0 commit comments

Comments
 (0)