Skip to content

Commit abe24bf

Browse files
authored
Merge branch 'main' into feature/logger-interface
2 parents ddb62cc + 9d003f5 commit abe24bf

File tree

36 files changed

+264
-195
lines changed

36 files changed

+264
-195
lines changed

.clang-format

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,4 @@ IndentWidth: 4
1212
AlwaysBreakTemplateDeclarations: MultiLine
1313
PackConstructorInitializers: NextLine
1414
PointerAlignment: Left
15+
InsertNewlineAtEOF: true

.github/workflows/build-test-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ jobs:
212212
xcode-version: latest-stable
213213

214214
- name: Build wheels
215-
uses: pypa/[email protected].3
215+
uses: pypa/[email protected]
216216
# GitHub Actions specific build parameters
217217
env:
218218
# pass GitHub runner info into Linux container

code_generation/templates/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/attribute_classes.hpp.jinja

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,5 +42,6 @@ using Asym{{ attribute_class.name }} = {{ attribute_class.name }}<asymmetric_t>;
4242
{% endfor %}
4343

4444
} // namespace power_grid_model
45-
{% endautoescape %}
45+
4646
// clang-format on
47+
{% endautoescape %}

code_generation/templates/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/meta_gen/attribute_classes.hpp.jinja

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,5 +43,6 @@ struct get_attributes_list<{{ attribute_class.name }}> {
4343

4444

4545
} // namespace power_grid_model::meta_data
46-
{% endautoescape %}
46+
4747
// clang-format on
48+
{% endautoescape %}

code_generation/templates/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/static_asserts/attribute_classes.hpp.jinja

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,6 @@ static_assert(offsetof({{ specification }}, {{ attribute.names }}) == offsetof({
3232
{% endfor %}
3333

3434
} // namespace power_grid_model::test
35-
{% endautoescape %}
35+
3636
// clang-format on
37+
{% endautoescape %}

code_generation/templates/power_grid_model_c/power_grid_model_c/src/dataset_class_maps.cpp.jinja

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,5 @@ PGM_MetaAttribute const* const PGM_def_{{ dataset }}_{{ component }}_{{ attribut
2626
{% endfor -%}
2727

2828
//
29-
{% endautoescape %}
3029
// clang-format on
31-
30+
{% endautoescape %}

power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/input.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -539,4 +539,4 @@ using AsymCurrentSensorInput = CurrentSensorInput<asymmetric_t>;
539539

540540
} // namespace power_grid_model
541541

542-
// clang-format on
542+
// clang-format on

power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/meta_gen/input.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -475,4 +475,4 @@ struct get_attributes_list<CurrentSensorInput<sym_type>> {
475475

476476
} // namespace power_grid_model::meta_data
477477

478-
// clang-format on
478+
// clang-format on

power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/meta_gen/output.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -266,4 +266,4 @@ struct get_attributes_list<CurrentSensorOutput<sym_type>> {
266266

267267
} // namespace power_grid_model::meta_data
268268

269-
// clang-format on
269+
// clang-format on

power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/meta_gen/update.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,4 +217,4 @@ struct get_attributes_list<CurrentSensorUpdate<sym_type>> {
217217

218218
} // namespace power_grid_model::meta_data
219219

220-
// clang-format on
220+
// clang-format on

0 commit comments

Comments
 (0)