From fafacf4113d0f6f4a21239914fb9da24d23ac6bc Mon Sep 17 00:00:00 2001 From: Laurynas Jagutis Date: Mon, 18 Nov 2024 14:10:58 +0100 Subject: [PATCH 1/2] first commit Signed-off-by: Laurynas Jagutis --- deps/power-grid-model | 2 +- .../_core/power_grid_model_io_core.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/deps/power-grid-model b/deps/power-grid-model index a05b88a..e284632 160000 --- a/deps/power-grid-model +++ b/deps/power-grid-model @@ -1 +1 @@ -Subproject commit a05b88a326583ecfad5bd72d5a2f99ae352d1907 +Subproject commit e284632006accd9d72ebdefca5c1cc77f1f3f1b5 diff --git a/src/power_grid_model_io_native/_core/power_grid_model_io_core.py b/src/power_grid_model_io_native/_core/power_grid_model_io_core.py index 1e2642b..56c74ed 100644 --- a/src/power_grid_model_io_native/_core/power_grid_model_io_core.py +++ b/src/power_grid_model_io_native/_core/power_grid_model_io_core.py @@ -11,7 +11,7 @@ from pathlib import Path from typing import Callable, Optional -from power_grid_model.core.power_grid_core import CharPtr, CStr, IdxC +from power_grid_model._core.power_grid_core import CharPtr, CStr, IdxC # functions with size_t return _FUNC_SIZE_T_RES = {"meta_class_size", "meta_class_alignment", "meta_attribute_offset"} From 6de6706e8390a574995710647b4ee7ca63dee59a Mon Sep 17 00:00:00 2001 From: Laurynas Jagutis Date: Mon, 18 Nov 2024 16:37:57 +0100 Subject: [PATCH 2/2] fix reuse Signed-off-by: Laurynas Jagutis --- .pre-commit-config.yaml | 2 +- .reuse/dep5 | 8 -------- REUSE.toml | 14 ++++++++++++++ 3 files changed, 15 insertions(+), 9 deletions(-) delete mode 100644 .reuse/dep5 create mode 100644 REUSE.toml diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 9b16f96..c956392 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -4,7 +4,7 @@ repos: - repo: https://github.com/fsfe/reuse-tool - rev: v3.0.2 + rev: v4.0.0 hooks: - id: reuse - repo: https://github.com/pycqa/isort diff --git a/.reuse/dep5 b/.reuse/dep5 deleted file mode 100644 index 6dbe0fa..0000000 --- a/.reuse/dep5 +++ /dev/null @@ -1,8 +0,0 @@ -Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Name: power-grid-model -Upstream-Contact: Power Grid Model project -Source: https://github.com/PowerGridModel/power-grid-model - -Files: ./* -Copyright: Contributors to the Power Grid Model project -License: MPL-2.0 diff --git a/REUSE.toml b/REUSE.toml new file mode 100644 index 0000000..1097f0d --- /dev/null +++ b/REUSE.toml @@ -0,0 +1,14 @@ +# SPDX-FileCopyrightText: Contributors to the Power Grid Model project +# +# SPDX-License-Identifier: MPL-2.0 + +version = 1 +SPDX-PackageName = "power-grid-model" +SPDX-PackageSupplier = "Power Grid Model project " +SPDX-PackageDownloadLocation = "https://github.com/PowerGridModel/power-grid-model" + +[[annotations]] +path = "./**" +precedence = "aggregate" +SPDX-FileCopyrightText = "Contributors to the Power Grid Model project " +SPDX-License-Identifier = "MPL-2.0"