From 1862c3cf30cfe4fd5e76001aece8d81cc5f7e97d Mon Sep 17 00:00:00 2001 From: ewuerger Date: Tue, 2 Jan 2024 13:24:59 +0100 Subject: [PATCH] chore: Rename organisation name in license header and license files `DB Netz AG` > `DB InfraGo AG` --- .gitattributes | 2 +- .github/CODEOWNERS | 2 +- .github/workflows/build-test-publish.yml | 2 +- .github/workflows/docs.yml | 2 +- .github/workflows/lint.yml | 2 +- .gitignore | 2 +- .pre-commit-config.yaml | 2 +- CONTRIBUTING.md | 4 +- README.md | 4 +- capellambse_context_diagrams/__init__.py | 2 +- capellambse_context_diagrams/_elkjs.py | 2 +- .../collectors/__init__.py | 2 +- .../collectors/default.py | 2 +- .../collectors/exchanges.py | 2 +- .../collectors/generic.py | 2 +- .../collectors/makers.py | 2 +- .../collectors/portless.py | 2 +- .../collectors/realization_view.py | 188 ++++++++++++++++++ .../collectors/tree_view.py | 2 +- capellambse_context_diagrams/context.py | 2 +- capellambse_context_diagrams/elk.js | 2 +- capellambse_context_diagrams/filters.py | 2 +- capellambse_context_diagrams/serializers.py | 2 +- capellambse_context_diagrams/styling.py | 2 +- docs/assets/images/Context of Left.svg | 2 +- .../Interface Context of Left to right.svg | 2 +- docs/assets/images/favicon.ico.license | 2 +- docs/assets/images/favicon.png.license | 2 +- docs/credits.md | 2 +- docs/css/base.css | 2 +- docs/extras/filters.md | 2 +- docs/extras/styling.md | 2 +- docs/gen_images.py | 2 +- docs/gen_ref_pages.py | 2 +- docs/index.md | 2 +- docs/license.md | 2 +- docs/quickstart.md | 2 +- docs/tree_view.md | 2 +- license_header.txt | 2 +- mkdocs.yml | 6 +- overrides/.icons/custom/db.svg | 2 +- pyproject.toml | 4 +- setup.py | 2 +- tests/conftest.py | 2 +- tests/data/.project.license | 2 +- tests/data/ContextDiagram.afm.license | 2 +- tests/data/ContextDiagram.aird.license | 2 +- tests/data/ContextDiagram.capella.license | 2 +- tests/test_capability_diagrams.py | 2 +- tests/test_context_diagrams.py | 2 +- tests/test_filters.py | 2 +- tests/test_interface_diagrams.py | 2 +- tests/test_tree_views.py | 2 +- 53 files changed, 245 insertions(+), 57 deletions(-) create mode 100644 capellambse_context_diagrams/collectors/realization_view.py diff --git a/.gitattributes b/.gitattributes index 153aa61d..8347dd83 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2022 Copyright DB Netz AG and the capellambse-context-diagrams contributors +# SPDX-FileCopyrightText: 2022 Copyright DB InfraGO AG and the capellambse-context-diagrams contributors # SPDX-License-Identifier: CC0-1.0 # “.gitattributes Best Practices - Muhammad Rehan Saeed” {{{ diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 55473d55..2b054033 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2022 Copyright DB Netz AG and the capellambse-context-diagrams contributors +# SPDX-FileCopyrightText: 2022 Copyright DB InfraGO AG and the capellambse-context-diagrams contributors # SPDX-License-Identifier: CC0-1.0 * @ewuerger @vik378 diff --git a/.github/workflows/build-test-publish.yml b/.github/workflows/build-test-publish.yml index 1ecfbb27..5ab9d391 100644 --- a/.github/workflows/build-test-publish.yml +++ b/.github/workflows/build-test-publish.yml @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2022 Copyright DB Netz AG and the capellambse-context-diagrams contributors +# SPDX-FileCopyrightText: 2022 Copyright DB InfraGO AG and the capellambse-context-diagrams contributors # SPDX-License-Identifier: Apache-2.0 name: Build diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 1a7a1159..0098f24e 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2022 Copyright DB Netz AG and the capellambse-context-diagrams contributors +# SPDX-FileCopyrightText: 2022 Copyright DB InfraGO AG and the capellambse-context-diagrams contributors # SPDX-License-Identifier: Apache-2.0 name: Docs diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 206f6a6d..d0840338 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2022 Copyright DB Netz AG and the capellambse-context-diagrams contributors +# SPDX-FileCopyrightText: 2022 Copyright DB InfraGO AG and the capellambse-context-diagrams contributors # SPDX-License-Identifier: Apache-2.0 name: Lint diff --git a/.gitignore b/.gitignore index 67f7ae9a..701276a4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2022 Copyright DB Netz AG and the capellambse-context-diagrams contributors +# SPDX-FileCopyrightText: 2022 Copyright DB InfraGO AG and the capellambse-context-diagrams contributors # SPDX-License-Identifier: CC0-1.0 # Templates from diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 7ed76d1b..2fda50e5 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2022 Copyright DB Netz AG and the capellambse-context-diagrams contributors +# SPDX-FileCopyrightText: 2022 Copyright DB InfraGO AG and the capellambse-context-diagrams contributors # SPDX-License-Identifier: CC0-1.0 exclude: '^(versioneer\.py|.*/_version\.py)$' diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 1075dc65..34a39238 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,5 +1,5 @@ @@ -110,7 +110,7 @@ Example: > Integration test for capability context diagrams seen in `tests/test_capability_diagrams.py`: > > ```python -> # SPDX-FileCopyrightText: 2022 Copyright DB Netz AG and the capellambse-context-diagrams contributors +> # SPDX-FileCopyrightText: 2022 Copyright DB InfraGO AG and the capellambse-context-diagrams contributors > # SPDX-License-Identifier: Apache-2.0 > > import capellambse diff --git a/README.md b/README.md index afc98b6f..5f0d394a 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ @@ -35,7 +35,7 @@ Special thanks goes to the developers and maintainers of [Eclipse Layout Kernel Copyright and license information added and maintained via the reuse tool from [Reuse Software](https://reuse.software/). -***Copyright 2022 DB Netz AG, own contributions licensed under Apache 2.0 (see full text in [LICENSES/Apache-2.0](https://github.com/DSD-DBS/capellambse-context-diagrams/blob/master/LICENSES/Apache-2.0.txt))*** +***Copyright 2022 DB InfraGO AG, own contributions licensed under Apache 2.0 (see full text in [LICENSES/Apache-2.0](https://github.com/DSD-DBS/capellambse-context-diagrams/blob/master/LICENSES/Apache-2.0.txt))*** ***Copyright (c) 2021 Kiel University and others, ELK/Sprotty contributions ([elkgraph-json.js](https://github.com/DSD-DBS/capellambse-context-diagrams/blob/master/capellambse_context_diagrams/elkgraph-json.js) & [elkgraph-to-sprotty.js](https://github.com/DSD-DBS/capellambse-context-diagrams/blob/master/capellambse_context_diagrams/elkgraph-to-sprotty.js)) licensed under EPL-2.0*** diff --git a/capellambse_context_diagrams/__init__.py b/capellambse_context_diagrams/__init__.py index 130af425..376ba2d2 100644 --- a/capellambse_context_diagrams/__init__.py +++ b/capellambse_context_diagrams/__init__.py @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2022 Copyright DB Netz AG and the capellambse-context-diagrams contributors +# SPDX-FileCopyrightText: 2022 Copyright DB InfraGO AG and the capellambse-context-diagrams contributors # SPDX-License-Identifier: Apache-2.0 """The Context Diagrams model extension. diff --git a/capellambse_context_diagrams/_elkjs.py b/capellambse_context_diagrams/_elkjs.py index 7ebe3995..8ed87aad 100644 --- a/capellambse_context_diagrams/_elkjs.py +++ b/capellambse_context_diagrams/_elkjs.py @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2022 Copyright DB Netz AG and the capellambse-context-diagrams contributors +# SPDX-FileCopyrightText: 2022 Copyright DB InfraGO AG and the capellambse-context-diagrams contributors # SPDX-License-Identifier: Apache-2.0 """ diff --git a/capellambse_context_diagrams/collectors/__init__.py b/capellambse_context_diagrams/collectors/__init__.py index 756d10f3..6ef9da61 100644 --- a/capellambse_context_diagrams/collectors/__init__.py +++ b/capellambse_context_diagrams/collectors/__init__.py @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2022 Copyright DB Netz AG and the capellambse-context-diagrams contributors +# SPDX-FileCopyrightText: 2022 Copyright DB InfraGO AG and the capellambse-context-diagrams contributors # SPDX-License-Identifier: Apache-2.0 """ diff --git a/capellambse_context_diagrams/collectors/default.py b/capellambse_context_diagrams/collectors/default.py index c9785e4f..c48d2283 100644 --- a/capellambse_context_diagrams/collectors/default.py +++ b/capellambse_context_diagrams/collectors/default.py @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2022 Copyright DB Netz AG and the capellambse-context-diagrams contributors +# SPDX-FileCopyrightText: 2022 Copyright DB InfraGO AG and the capellambse-context-diagrams contributors # SPDX-License-Identifier: Apache-2.0 """ Collection of [`ELKInputData`][capellambse_context_diagrams._elkjs.ELKInputData] diff --git a/capellambse_context_diagrams/collectors/exchanges.py b/capellambse_context_diagrams/collectors/exchanges.py index c0ce776c..4835d601 100644 --- a/capellambse_context_diagrams/collectors/exchanges.py +++ b/capellambse_context_diagrams/collectors/exchanges.py @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2022 Copyright DB Netz AG and the capellambse-context-diagrams contributors +# SPDX-FileCopyrightText: 2022 Copyright DB InfraGO AG and the capellambse-context-diagrams contributors # SPDX-License-Identifier: Apache-2.0 from __future__ import annotations diff --git a/capellambse_context_diagrams/collectors/generic.py b/capellambse_context_diagrams/collectors/generic.py index 955f7656..e72182d7 100644 --- a/capellambse_context_diagrams/collectors/generic.py +++ b/capellambse_context_diagrams/collectors/generic.py @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2022 Copyright DB Netz AG and the capellambse-context-diagrams contributors +# SPDX-FileCopyrightText: 2022 Copyright DB InfraGO AG and the capellambse-context-diagrams contributors # SPDX-License-Identifier: Apache-2.0 """ Functionality for collection of model data from an instance of [`MelodyModel`][capellambse.model.MelodyModel] diff --git a/capellambse_context_diagrams/collectors/makers.py b/capellambse_context_diagrams/collectors/makers.py index 469ae5b5..605baa42 100644 --- a/capellambse_context_diagrams/collectors/makers.py +++ b/capellambse_context_diagrams/collectors/makers.py @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2022 Copyright DB Netz AG and the capellambse-context-diagrams contributors +# SPDX-FileCopyrightText: 2022 Copyright DB InfraGO AG and the capellambse-context-diagrams contributors # SPDX-License-Identifier: Apache-2.0 from __future__ import annotations diff --git a/capellambse_context_diagrams/collectors/portless.py b/capellambse_context_diagrams/collectors/portless.py index 8e2f1929..a887182f 100644 --- a/capellambse_context_diagrams/collectors/portless.py +++ b/capellambse_context_diagrams/collectors/portless.py @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2022 Copyright DB Netz AG and the capellambse-context-diagrams contributors +# SPDX-FileCopyrightText: 2022 Copyright DB InfraGO AG and the capellambse-context-diagrams contributors # SPDX-License-Identifier: Apache-2.0 """ diff --git a/capellambse_context_diagrams/collectors/realization_view.py b/capellambse_context_diagrams/collectors/realization_view.py new file mode 100644 index 00000000..bc13c31f --- /dev/null +++ b/capellambse_context_diagrams/collectors/realization_view.py @@ -0,0 +1,188 @@ +# SPDX-FileCopyrightText: 2022 Copyright DB InfraGO AG and the capellambse-context-diagrams contributors +# SPDX-License-Identifier: Apache-2.0 +"""This submodule defines the collector for the RealizationView diagram.""" +from __future__ import annotations + +import collections.abc as cabc +import copy +import re +import typing as t + +from capellambse.model import common, crosslayer +from capellambse.model.crosslayer import cs, fa + +from .. import _elkjs, context +from . import makers + +RE_LAYER_PTRN = re.compile(r"([A-Z]?[a-z]+)") + + +def collector( + diagram: context.ContextDiagram, params: dict[str, t.Any] +) -> tuple[_elkjs.ELKInputData, list[_elkjs.ELKInputEdge]]: + """Return the class tree data for ELK.""" + data = makers.make_diagram(diagram) + layout_options: _elkjs.LayoutOptions = copy.deepcopy( + _elkjs.RECT_PACKING_LAYOUT_OPTIONS # type:ignore[arg-type] + ) + layout_options["elk.contentAlignment"] = "V_CENTER H_CENTER" + del layout_options["widthApproximation.targetWidth"] + data["layoutOptions"] = layout_options + _collector = COLLECTORS[params.get("search_direction", "ALL")] + lay_to_els = _collector(diagram.target, params.get("depth", 1)) + layer_layout_options: _elkjs.LayoutOptions = layout_options | { # type: ignore[operator] + "nodeSize.constraints": "[NODE_LABELS,MINIMUM_SIZE]", + } # type: ignore[assignment] + edges: list[_elkjs.ELKInputEdge] = [] + for layer, elements in lay_to_els.items(): + labels = [makers.make_label(layer)] + width, height = makers.calculate_height_and_width(labels) + layer_box: _elkjs.ELKInputChild = { + "id": elements[0]["layer"].uuid, + "children": [], + "height": width, + "width": height, + "layoutOptions": layer_layout_options, + } + children: dict[str, _elkjs.ELKInputChild] = {} + for elt in elements: + if elt["origin"] is not None: + edges.append( + { + "id": f'{elt["origin"].uuid}_{elt["element"].uuid}', + "sources": [elt["origin"].uuid], + "targets": [elt["element"].uuid], + } + ) + + if not (element_box := children.get(elt["element"].uuid)): + element_box = makers.make_box(elt["element"], no_symbol=True) + children[elt["element"].uuid] = element_box + layer_box["children"].append(element_box) + index = len(layer_box["children"]) - 1 + + if params.get("show_owners"): + owner = elt["element"].owner + if not isinstance(owner, (fa.Function, cs.Component)): + continue + + if not (owner_box := children.get(owner.uuid)): + owner_box = makers.make_box(owner, no_symbol=True) + owner_box["height"] += element_box["height"] + children[owner.uuid] = owner_box + layer_box["children"].append(owner_box) + + del layer_box["children"][index] + owner_box.setdefault("children", []).append(element_box) + owner_box["width"] += element_box["width"] + if ( + elt["origin"] is not None + and elt["origin"].owner.uuid in children + and owner.uuid in children + ): + eid = f'{elt["origin"].owner.uuid}_{owner.uuid}' + edges.append( + { + "id": eid, + "sources": [elt["origin"].owner.uuid], + "targets": [owner.uuid], + } + ) + + data["children"].append(layer_box) + data["children"] = data["children"][::-1] + return data, edges + + +def collect_realized( + start: common.GenericElement, depth: int +) -> dict[LayerLiteral, list[dict[str, t.Any]]]: + """Collect all elements from ``realized_`` attributes up to depth.""" + return collect_elements(start, depth, "ABOVE", "realized") + + +def collect_realizing( + start: common.GenericElement, depth: int +) -> dict[LayerLiteral, list[dict[str, t.Any]]]: + """Collect all elements from ``realizing_`` attributes down to depth.""" + return collect_elements(start, depth, "BELOW", "realizing") + + +def collect_all( + start: common.GenericElement, depth: int +) -> dict[LayerLiteral, list[common.GenericElement]]: + """Collect all elements in both ABOVE and BELOW directions.""" + above = collect_realized(start, depth) + below = collect_realizing(start, depth) + return above | below + + +def collect_elements( + start: common.GenericElement, + depth: int, + direction: str, + attribute_prefix: str, + origin: common.GenericElement = None, +) -> dict[LayerLiteral, list[dict[str, t.Any]]]: + """Collect elements based on the specified direction and attribute name.""" + layer_obj, layer = find_layer(start) + collected_elements: dict[LayerLiteral, list[dict[str, t.Any]]] = { + layer: [{"element": start, "origin": origin, "layer": layer_obj}] + } + if ( + (direction == "ABOVE" and layer == "Operational") + or (direction == "BELOW" and layer == "Physical") + or depth == 0 + ): + return collected_elements + + if isinstance(start, fa.Function): + attribute_name = f"{attribute_prefix}_functions" + else: + assert isinstance(start, cs.Component) + attribute_name = f"{attribute_prefix}_components" + + for element in getattr(start, attribute_name, []): + sub_collected = collect_elements( + element, depth - 1, direction, attribute_prefix, origin=start + ) + for sub_layer, sub_elements in sub_collected.items(): + collected_elements.setdefault(sub_layer, []).extend(sub_elements) + return collected_elements + + +LayerLiteral = t.Union[ + t.Literal["Operational"], + t.Literal["System"], + t.Literal["Logical"], + t.Literal["Physical"], +] + + +def find_layer( + obj: common.GenericElement, +) -> tuple[crosslayer.BaseArchitectureLayer, LayerLiteral]: + """Return the layer object and its literal. + + Return either one of the following: + * ``Operational`` + * ``System`` + * ``Logical`` + * ``Physical`` + """ + parent = obj + while not isinstance(parent, crosslayer.BaseArchitectureLayer): + parent = parent.parent + if not (match := RE_LAYER_PTRN.match(type(parent).__name__)): + raise ValueError("No layer was found.") + return parent, match.group(1) # type:ignore[return-value] + + +Collector = cabc.Callable[ + [common.GenericElement, int], dict[LayerLiteral, list[dict[str, t.Any]]] +] +COLLECTORS: dict[str, Collector] = { + "ALL": collect_all, + "ABOVE": collect_realized, + "BELOW": collect_realizing, +} diff --git a/capellambse_context_diagrams/collectors/tree_view.py b/capellambse_context_diagrams/collectors/tree_view.py index 29470f05..bfe88472 100644 --- a/capellambse_context_diagrams/collectors/tree_view.py +++ b/capellambse_context_diagrams/collectors/tree_view.py @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2022 Copyright DB Netz AG and the capellambse-context-diagrams contributors +# SPDX-FileCopyrightText: 2022 Copyright DB InfraGO AG and the capellambse-context-diagrams contributors # SPDX-License-Identifier: Apache-2.0 """This submodule defines the collector for the Class-Tree diagram.""" from __future__ import annotations diff --git a/capellambse_context_diagrams/context.py b/capellambse_context_diagrams/context.py index 828c3668..b9970fe7 100644 --- a/capellambse_context_diagrams/context.py +++ b/capellambse_context_diagrams/context.py @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2022 Copyright DB Netz AG and the capellambse-context-diagrams contributors +# SPDX-FileCopyrightText: 2022 Copyright DB InfraGO AG and the capellambse-context-diagrams contributors # SPDX-License-Identifier: Apache-2.0 """ Definitions of Custom Accessor- and Diagram-Classtypes based on diff --git a/capellambse_context_diagrams/elk.js b/capellambse_context_diagrams/elk.js index 278a5532..85b69309 100644 --- a/capellambse_context_diagrams/elk.js +++ b/capellambse_context_diagrams/elk.js @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: 2022 Copyright DB Netz AG and the capellambse-context-diagrams contributors +// SPDX-FileCopyrightText: 2022 Copyright DB InfraGO AG and the capellambse-context-diagrams contributors // SPDX-License-Identifier: Apache-2.0 const elkgraphsprotty = require("./elkgraph-to-sprotty"); diff --git a/capellambse_context_diagrams/filters.py b/capellambse_context_diagrams/filters.py index b64c530b..ba3494b2 100644 --- a/capellambse_context_diagrams/filters.py +++ b/capellambse_context_diagrams/filters.py @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2022 Copyright DB Netz AG and the capellambse-context-diagrams contributors +# SPDX-FileCopyrightText: 2022 Copyright DB InfraGO AG and the capellambse-context-diagrams contributors # SPDX-License-Identifier: Apache-2.0 """Functions and registry for filter functionality.""" from __future__ import annotations diff --git a/capellambse_context_diagrams/serializers.py b/capellambse_context_diagrams/serializers.py index d9f14e34..cc6593a9 100644 --- a/capellambse_context_diagrams/serializers.py +++ b/capellambse_context_diagrams/serializers.py @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2022 Copyright DB Netz AG and the capellambse-context-diagrams contributors +# SPDX-FileCopyrightText: 2022 Copyright DB InfraGO AG and the capellambse-context-diagrams contributors # SPDX-License-Identifier: Apache-2.0 """This submodule provides a serializer that transforms data from an ELK- diff --git a/capellambse_context_diagrams/styling.py b/capellambse_context_diagrams/styling.py index 23b8206c..22442c56 100644 --- a/capellambse_context_diagrams/styling.py +++ b/capellambse_context_diagrams/styling.py @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2022 Copyright DB Netz AG and the capellambse-context-diagrams contributors +# SPDX-FileCopyrightText: 2022 Copyright DB InfraGO AG and the capellambse-context-diagrams contributors # SPDX-License-Identifier: Apache-2.0 """Functions for style overrides of diagram elements.""" from __future__ import annotations diff --git a/docs/assets/images/Context of Left.svg b/docs/assets/images/Context of Left.svg index 56aae0c6..ad286d03 100644 --- a/docs/assets/images/Context of Left.svg +++ b/docs/assets/images/Context of Left.svg @@ -1,5 +1,5 @@ diff --git a/docs/assets/images/Interface Context of Left to right.svg b/docs/assets/images/Interface Context of Left to right.svg index 366edde7..f39d3d27 100644 --- a/docs/assets/images/Interface Context of Left to right.svg +++ b/docs/assets/images/Interface Context of Left to right.svg @@ -1,5 +1,5 @@ diff --git a/docs/assets/images/favicon.ico.license b/docs/assets/images/favicon.ico.license index de4b43b4..680fb902 100644 --- a/docs/assets/images/favicon.ico.license +++ b/docs/assets/images/favicon.ico.license @@ -1,2 +1,2 @@ -SPDX-FileCopyrightText: 2022 Copyright DB Netz AG and the capellambse-context-diagrams contributors +SPDX-FileCopyrightText: 2022 Copyright DB InfraGO AG and the capellambse-context-diagrams contributors SPDX-License-Identifier: Apache-2.0 diff --git a/docs/assets/images/favicon.png.license b/docs/assets/images/favicon.png.license index de4b43b4..680fb902 100644 --- a/docs/assets/images/favicon.png.license +++ b/docs/assets/images/favicon.png.license @@ -1,2 +1,2 @@ -SPDX-FileCopyrightText: 2022 Copyright DB Netz AG and the capellambse-context-diagrams contributors +SPDX-FileCopyrightText: 2022 Copyright DB InfraGO AG and the capellambse-context-diagrams contributors SPDX-License-Identifier: Apache-2.0 diff --git a/docs/credits.md b/docs/credits.md index a6de69e5..0a4aa730 100644 --- a/docs/credits.md +++ b/docs/credits.md @@ -5,7 +5,7 @@ hide: --- diff --git a/docs/css/base.css b/docs/css/base.css index 9892ade1..1fd5514c 100644 --- a/docs/css/base.css +++ b/docs/css/base.css @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2022 Copyright DB Netz AG and the capellambse-context-diagrams contributors + * SPDX-FileCopyrightText: 2022 Copyright DB InfraGO AG and the capellambse-context-diagrams contributors * SPDX-License-Identifier: Apache-2.0 */ diff --git a/docs/extras/filters.md b/docs/extras/filters.md index f6f60e69..718fdd54 100644 --- a/docs/extras/filters.md +++ b/docs/extras/filters.md @@ -1,5 +1,5 @@ diff --git a/docs/extras/styling.md b/docs/extras/styling.md index 142f5c1a..ae2cadce 100644 --- a/docs/extras/styling.md +++ b/docs/extras/styling.md @@ -1,5 +1,5 @@ diff --git a/docs/gen_images.py b/docs/gen_images.py index 35370863..d7873d72 100644 --- a/docs/gen_images.py +++ b/docs/gen_images.py @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2022 Copyright DB Netz AG and the capellambse-context-diagrams contributors +# SPDX-FileCopyrightText: 2022 Copyright DB InfraGO AG and the capellambse-context-diagrams contributors # SPDX-License-Identifier: Apache-2.0 from __future__ import annotations diff --git a/docs/gen_ref_pages.py b/docs/gen_ref_pages.py index 91db103d..a1f553d8 100644 --- a/docs/gen_ref_pages.py +++ b/docs/gen_ref_pages.py @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2022 Copyright DB Netz AG and the capellambse-context-diagrams contributors +# SPDX-FileCopyrightText: 2022 Copyright DB InfraGO AG and the capellambse-context-diagrams contributors # SPDX-License-Identifier: Apache-2.0 """Generate the code reference pages.""" diff --git a/docs/index.md b/docs/index.md index 3a75e2ee..9344ada1 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,5 +1,5 @@ diff --git a/docs/license.md b/docs/license.md index d376b528..6e81c06e 100644 --- a/docs/license.md +++ b/docs/license.md @@ -1,5 +1,5 @@ diff --git a/docs/quickstart.md b/docs/quickstart.md index 9e87bd6d..0ba83259 100644 --- a/docs/quickstart.md +++ b/docs/quickstart.md @@ -1,5 +1,5 @@ diff --git a/docs/tree_view.md b/docs/tree_view.md index f3147ed7..ea47a84d 100644 --- a/docs/tree_view.md +++ b/docs/tree_view.md @@ -1,5 +1,5 @@ diff --git a/license_header.txt b/license_header.txt index de4b43b4..680fb902 100644 --- a/license_header.txt +++ b/license_header.txt @@ -1,2 +1,2 @@ -SPDX-FileCopyrightText: 2022 Copyright DB Netz AG and the capellambse-context-diagrams contributors +SPDX-FileCopyrightText: 2022 Copyright DB InfraGO AG and the capellambse-context-diagrams contributors SPDX-License-Identifier: Apache-2.0 diff --git a/mkdocs.yml b/mkdocs.yml index a0463c35..b0c0201e 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2022 Copyright DB Netz AG and the capellambse-context-diagrams contributors +# SPDX-FileCopyrightText: 2022 Copyright DB InfraGO AG and the capellambse-context-diagrams contributors # SPDX-License-Identifier: Apache-2.0 site_name: Context diagrams for py-capellambse @@ -102,7 +102,7 @@ extra: - icon: fontawesome/brands/github link: https://dsd-dbs.github.io/capellambse-context-diagrams/ - icon: custom/db - name: DB Netz AG - SET + name: DB InfraGO AG - SET link: https://github.com/DSD-DBS -copyright: Copyright © 2022 DB Netz AG +copyright: Copyright © 2022 DB InfraGO AG diff --git a/overrides/.icons/custom/db.svg b/overrides/.icons/custom/db.svg index 3bfb9353..a36fb239 100644 --- a/overrides/.icons/custom/db.svg +++ b/overrides/.icons/custom/db.svg @@ -1,6 +1,6 @@ diff --git a/pyproject.toml b/pyproject.toml index 65d204b9..2b5868f2 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2022 Copyright DB Netz AG and the capellambse-context-diagrams contributors +# SPDX-FileCopyrightText: 2022 Copyright DB InfraGO AG and the capellambse-context-diagrams contributors # SPDX-License-Identifier: Apache-2.0 [build-system] @@ -14,7 +14,7 @@ readme = "README.md" requires-python = ">=3.9" license = { file = "LICENSES/Apache-2.0.txt" } authors = [ - { name = "DB Netz AG" }, + { name = "DB InfraGO AG" }, ] keywords = ["capella", "mbse", "context", "diagram", "automatic diagrams"] classifiers = [ diff --git a/setup.py b/setup.py index 9b0e0470..67883402 100755 --- a/setup.py +++ b/setup.py @@ -1,6 +1,6 @@ #!/usr/bin/env python -# SPDX-FileCopyrightText: 2022 Copyright DB Netz AG and the capellambse-context-diagrams contributors +# SPDX-FileCopyrightText: 2022 Copyright DB InfraGO AG and the capellambse-context-diagrams contributors # SPDX-License-Identifier: Apache-2.0 import setuptools diff --git a/tests/conftest.py b/tests/conftest.py index 4fd14ab3..61d2c79c 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2022 Copyright DB Netz AG and the capellambse-context-diagrams contributors +# SPDX-FileCopyrightText: 2022 Copyright DB InfraGO AG and the capellambse-context-diagrams contributors # SPDX-License-Identifier: Apache-2.0 """Global fixtures for pytest""" diff --git a/tests/data/.project.license b/tests/data/.project.license index de4b43b4..680fb902 100644 --- a/tests/data/.project.license +++ b/tests/data/.project.license @@ -1,2 +1,2 @@ -SPDX-FileCopyrightText: 2022 Copyright DB Netz AG and the capellambse-context-diagrams contributors +SPDX-FileCopyrightText: 2022 Copyright DB InfraGO AG and the capellambse-context-diagrams contributors SPDX-License-Identifier: Apache-2.0 diff --git a/tests/data/ContextDiagram.afm.license b/tests/data/ContextDiagram.afm.license index de4b43b4..680fb902 100644 --- a/tests/data/ContextDiagram.afm.license +++ b/tests/data/ContextDiagram.afm.license @@ -1,2 +1,2 @@ -SPDX-FileCopyrightText: 2022 Copyright DB Netz AG and the capellambse-context-diagrams contributors +SPDX-FileCopyrightText: 2022 Copyright DB InfraGO AG and the capellambse-context-diagrams contributors SPDX-License-Identifier: Apache-2.0 diff --git a/tests/data/ContextDiagram.aird.license b/tests/data/ContextDiagram.aird.license index de4b43b4..680fb902 100644 --- a/tests/data/ContextDiagram.aird.license +++ b/tests/data/ContextDiagram.aird.license @@ -1,2 +1,2 @@ -SPDX-FileCopyrightText: 2022 Copyright DB Netz AG and the capellambse-context-diagrams contributors +SPDX-FileCopyrightText: 2022 Copyright DB InfraGO AG and the capellambse-context-diagrams contributors SPDX-License-Identifier: Apache-2.0 diff --git a/tests/data/ContextDiagram.capella.license b/tests/data/ContextDiagram.capella.license index de4b43b4..680fb902 100644 --- a/tests/data/ContextDiagram.capella.license +++ b/tests/data/ContextDiagram.capella.license @@ -1,2 +1,2 @@ -SPDX-FileCopyrightText: 2022 Copyright DB Netz AG and the capellambse-context-diagrams contributors +SPDX-FileCopyrightText: 2022 Copyright DB InfraGO AG and the capellambse-context-diagrams contributors SPDX-License-Identifier: Apache-2.0 diff --git a/tests/test_capability_diagrams.py b/tests/test_capability_diagrams.py index 1550d970..2449a0fd 100644 --- a/tests/test_capability_diagrams.py +++ b/tests/test_capability_diagrams.py @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2022 Copyright DB Netz AG and the capellambse-context-diagrams contributors +# SPDX-FileCopyrightText: 2022 Copyright DB InfraGO AG and the capellambse-context-diagrams contributors # SPDX-License-Identifier: Apache-2.0 import capellambse diff --git a/tests/test_context_diagrams.py b/tests/test_context_diagrams.py index b8e23177..8d38e462 100644 --- a/tests/test_context_diagrams.py +++ b/tests/test_context_diagrams.py @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2022 Copyright DB Netz AG and the capellambse-context-diagrams contributors +# SPDX-FileCopyrightText: 2022 Copyright DB InfraGO AG and the capellambse-context-diagrams contributors # SPDX-License-Identifier: Apache-2.0 import capellambse diff --git a/tests/test_filters.py b/tests/test_filters.py index a07a04e2..6dcb93f4 100644 --- a/tests/test_filters.py +++ b/tests/test_filters.py @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2022 Copyright DB Netz AG and the capellambse-context-diagrams contributors +# SPDX-FileCopyrightText: 2022 Copyright DB InfraGO AG and the capellambse-context-diagrams contributors # SPDX-License-Identifier: Apache-2.0 from __future__ import annotations diff --git a/tests/test_interface_diagrams.py b/tests/test_interface_diagrams.py index a9e15325..ed0918ac 100644 --- a/tests/test_interface_diagrams.py +++ b/tests/test_interface_diagrams.py @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2022 Copyright DB Netz AG and the capellambse-context-diagrams contributors +# SPDX-FileCopyrightText: 2022 Copyright DB InfraGO AG and the capellambse-context-diagrams contributors # SPDX-License-Identifier: Apache-2.0 import capellambse diff --git a/tests/test_tree_views.py b/tests/test_tree_views.py index 04526076..235a5d0e 100644 --- a/tests/test_tree_views.py +++ b/tests/test_tree_views.py @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2022 Copyright DB Netz AG and the capellambse-context-diagrams contributors +# SPDX-FileCopyrightText: 2022 Copyright DB InfraGO AG and the capellambse-context-diagrams contributors # SPDX-License-Identifier: Apache-2.0 import capellambse