Skip to content

Commit b88ee54

Browse files
kordejongkordejong
authored
Merge pull request #881 from kordejong/gh880
Re-run pre-commit hooks on all code
2 parents d044afd + f107710 commit b88ee54

File tree

47 files changed

+269
-267
lines changed

Some content is hidden

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

47 files changed

+269
-267
lines changed

‎.clang-format‎

Lines changed: 52 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
2-
Language: Cpp
2+
Language: Cpp
33
### AccessModifierOffset: -2
4-
AlignAfterOpenBracket: AlwaysBreak # Align
4+
AlignAfterOpenBracket: AlwaysBreak # Align
55
### AlignArrayOfStructures: None
66
### AlignConsecutiveMacros: None
77
### AlignConsecutiveAssignments: None
@@ -28,19 +28,19 @@ AlwaysBreakTemplateDeclarations: Yes
2828
BinPackArguments: false
2929
BinPackParameters: false
3030
BraceWrapping:
31-
AfterCaseLabel: true
32-
AfterClass: true
33-
AfterControlStatement: Always
34-
### AfterEnum: false
35-
AfterFunction: true
36-
### AfterNamespace: false
37-
### AfterObjCDeclaration: false
38-
AfterStruct: true
39-
### AfterUnion: false
40-
### AfterExternBlock: false
41-
BeforeCatch: true
42-
BeforeElse: true
43-
BeforeLambdaBody: true
31+
AfterCaseLabel: true
32+
AfterClass: true
33+
AfterControlStatement: Always
34+
### AfterEnum: false
35+
AfterFunction: true
36+
### AfterNamespace: false
37+
### AfterObjCDeclaration: false
38+
AfterStruct: true
39+
### AfterUnion: false
40+
### AfterExternBlock: false
41+
BeforeCatch: true
42+
BeforeElse: true
43+
BeforeLambdaBody: true
4444
### BeforeWhile: false
4545
### IndentBraces: false
4646
### SplitEmptyFunction: true
@@ -55,7 +55,7 @@ BreakInheritanceList: AfterColon
5555
### BreakConstructorInitializersBeforeComma: false
5656
BreakConstructorInitializers: AfterColon
5757
### BreakStringLiterals: true
58-
ColumnLimit: 110
58+
ColumnLimit: 110
5959
### CommentPragmas: '^ IWYU pragma:'
6060
### QualifierAlignment: Leave
6161
### CompactNamespaces: false
@@ -81,34 +81,38 @@ AllowAllConstructorInitializersOnNextLine: true
8181
# More general / 3rd party / std headers must have higher priorities
8282
# More specific / local / lue headers must have lower priorities
8383
IncludeCategories:
84-
- Regex: '^"lue/view/'
85-
Priority: 10
86-
- Regex: '^"lue/qa/'
87-
Priority: 20
88-
- Regex: '^"lue/framework/'
89-
Priority: 30
90-
- Regex: '^"lue/data_model/'
91-
Priority: 40
92-
- Regex: '^"lue/test/'
93-
Priority: 50
94-
- Regex: '^"lue/python/'
95-
Priority: 60
96-
- Regex: '^"lue/imgui/'
97-
Priority: 70
98-
- Regex: '^"lue/shared/'
99-
Priority: 80
100-
- Regex: '^"lue/'
101-
Priority: 90
102-
- Regex: '^<hpx/'
103-
Priority: 100
104-
- Regex: '^<vulkan/'
105-
Priority: 105
106-
- Regex: '^<(boost|fmt|numpy|pybind11)/'
107-
Priority: 110
108-
- Regex: '^<.*'
109-
Priority: 120
110-
- Regex: '^".*'
111-
Priority: 1
84+
- Regex: '^"lue/view/'
85+
Priority: 10
86+
- Regex: '^"lue/qa/'
87+
Priority: 20
88+
- Regex: '^"lue/framework/'
89+
Priority: 30
90+
- Regex: '^"lue/data_model/'
91+
Priority: 40
92+
- Regex: '^"lue/test/'
93+
Priority: 50
94+
- Regex: '^"lue/python/'
95+
Priority: 60
96+
- Regex: '^"lue/gdal/'
97+
Priority: 70
98+
- Regex: '^"lue/imgui/'
99+
Priority: 70
100+
- Regex: '^"lue/netcdf/'
101+
Priority: 70
102+
- Regex: '^"lue/shared/'
103+
Priority: 80
104+
- Regex: '^"lue/'
105+
Priority: 90
106+
- Regex: "^<hpx/"
107+
Priority: 100
108+
- Regex: "^<vulkan/"
109+
Priority: 105
110+
- Regex: "^<(boost|fmt|numpy|pybind11)/"
111+
Priority: 110
112+
- Regex: "^<.*"
113+
Priority: 120
114+
- Regex: '^".*'
115+
Priority: 1
112116
### - Regex: '^"(llvm|llvm-c|clang|clang-c)/'
113117
### Priority: 2
114118
### SortPriority: 0
@@ -130,7 +134,7 @@ IndentCaseLabels: true
130134
### IndentPPDirectives: None
131135
### IndentExternBlock: AfterExternBlock
132136
### IndentRequires: false
133-
IndentWidth: 4
137+
IndentWidth: 4
134138
### IndentWrappedFunctionNames: false
135139
### InsertTrailingCommas: None
136140
### JavaScriptQuotes: Leave
@@ -149,7 +153,7 @@ NamespaceIndentation: All
149153
### PenaltyBreakString: 1000
150154
### PenaltyBreakTemplateDeclaration: 10
151155
### PenaltyExcessCharacter: 1000000
152-
PenaltyReturnTypeOnItsOwnLine: 160 # Default: 60
156+
PenaltyReturnTypeOnItsOwnLine: 160 # Default: 60
153157
### PenaltyIndentedWhitespace: 0
154158
PointerAlignment: Left
155159
### PPIndentWidth: -1
@@ -159,7 +163,7 @@ PointerAlignment: Left
159163
### SeparateDefinitionBlocks: Leave
160164
### ShortNamespaceLines: 1
161165
### SortIncludes: CaseSensitive # TODO
162-
SortIncludes: true
166+
SortIncludes: true
163167
### SortJavaStaticImport: Before
164168
### SortUsingDeclarations: true
165169
### SpaceAfterCStyleCast: false
@@ -195,7 +199,7 @@ SpacesBeforeTrailingComments: 2
195199
### SpacesInSquareBrackets: false
196200
### SpaceBeforeSquareBrackets: false
197201
### BitFieldColonSpacing: Both
198-
Standard: c++20
202+
Standard: c++20
199203
### StatementAttributeLikeMacros:
200204
### - Q_EMIT
201205
### StatementMacros:
@@ -210,4 +214,3 @@ Standard: c++20
210214
### - BOOST_PP_STRINGIZE
211215
### - NS_SWIFT_NAME
212216
### - CF_SWIFT_NAME
213-
...

‎.pre-commit-config.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ repos:
2020
hooks:
2121
- id: black
2222
- repo: https://github.com/pre-commit/mirrors-mypy
23-
rev: v1.16.1
23+
rev: v1.17.1
2424
hooks:
2525
- id: mypy
2626
# args: [--verbose]

‎document/doc/Doxyfile.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -463,7 +463,7 @@ LOOKUP_CACHE_SIZE = 0
463463
# than 0 to get more control over the balance between CPU load and processing
464464
# speed. At this moment only the input processing can be done using multiple
465465
# threads. Since this is still an experimental feature the default is set to 1,
466-
# which efficively disables parallel processing. Please report any issues you
466+
# which effectively disables parallel processing. Please report any issues you
467467
# encounter. Generating dot graphs in parallel is controlled by the
468468
# DOT_NUM_THREADS setting.
469469
# Minimum value: 0, maximum value: 32, default value: 1.

‎source/data_model/cxx/include/lue/core/enum_string_bimap.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,5 +97,5 @@ namespace lue {
9797
}
9898

9999
} // namespace detail
100-
} // namespace data_model
100+
} // namespace data_model
101101
} // namespace lue

‎source/data_model/cxx/include/lue/core/time/clock.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,5 +86,5 @@ namespace lue {
8686
}
8787

8888
} // namespace time
89-
} // namespace data_model
89+
} // namespace data_model
9090
} // namespace lue

‎source/data_model/cxx/include/lue/core/time/duration.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,5 +84,5 @@ namespace lue {
8484
}
8585

8686
} // namespace time
87-
} // namespace data_model
87+
} // namespace data_model
8888
} // namespace lue

‎source/data_model/cxx/include/lue/core/time/tick_period.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,5 +83,5 @@ namespace lue {
8383
}
8484

8585
} // namespace time
86-
} // namespace data_model
86+
} // namespace data_model
8787
} // namespace lue

‎source/data_model/cxx/include/lue/core/time/time_point.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,5 +99,5 @@ namespace lue {
9999
}
100100

101101
} // namespace time
102-
} // namespace data_model
102+
} // namespace data_model
103103
} // namespace lue

‎source/data_model/cxx/include/lue/core/time/unit.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,5 +54,5 @@ namespace lue {
5454
};
5555

5656
} // namespace time
57-
} // namespace data_model
57+
} // namespace data_model
5858
} // namespace lue

‎source/data_model/cxx/include/lue/core/time/unit_traits.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,5 +40,5 @@ namespace lue {
4040
#undef UNIT_TRAITS
4141

4242
} // namespace time
43-
} // namespace data_model
43+
} // namespace data_model
4444
} // namespace lue

0 commit comments

Comments
 (0)